marlin: fix AOSP makefiles

Change-Id: Icd82371606c77abb492ca2104e7fcb1447986335 Signed-off-by: Patrick Tjin <[email protected]>
nychitman1 · Feb 5, 2016 · 419ed57 · 419ed57
1 parent eb0c8d1
commit 419ed57
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/aosp_marlin.mk b/aosp_marlin.mk
@@ -22,13 +22,14 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
 
 PRODUCT_NAME := aosp_marlin
-#PRODUCT_BRAND := Android
+PRODUCT_DEVICE := marlin
+PRODUCT_BRAND := Android
 PRODUCT_MODEL := AOSP on msm8996
 PRODUCT_MANUFACTURER := google
 PRODUCT_RESTRICT_VENDOR_FILES := true
 
 $(call inherit-product, device/google/marlin/device-marlin.mk)
-$(call inherit-product-if-exists, vendor/google_devices/marlin/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/google_devices/marlin/device-vendor-marlin.mk)
 
 PRODUCT_PACKAGES += \
     Launcher3

diff --git a/aosp_sailfish.mk b/aosp_sailfish.mk
@@ -22,13 +22,14 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/aosp_base_telephony.mk)
 
 PRODUCT_NAME := aosp_sailfish
-#PRODUCT_BRAND := Android
+PRODUCT_DEVICE := sailfish
+PRODUCT_BRAND := Android
 PRODUCT_MODEL := AOSP on msm8996
 PRODUCT_MANUFACTURER := google
 PRODUCT_RESTRICT_VENDOR_FILES := true
 
 $(call inherit-product, device/google/marlin/device-sailfish.mk)
-$(call inherit-product-if-exists, vendor/google_devices/marlin/device-vendor.mk)
+$(call inherit-product-if-exists, vendor/google_devices/marlin/device-vendor-sailfish.mk)
 
 PRODUCT_PACKAGES += \
     Launcher3