From 419ed57f5da7e9753fe65dc6b73a1f5f348891f6 Mon Sep 17 00:00:00 2001 From: Patrick Tjin Date: Thu, 4 Feb 2016 21:36:34 -0800 Subject: [PATCH] marlin: fix AOSP makefiles Change-Id: Icd82371606c77abb492ca2104e7fcb1447986335 Signed-off-by: Patrick Tjin --- aosp_marlin.mk | 5 +++-- aosp_sailfish.mk | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/aosp_marlin.mk b/aosp_marlin.mk index c01dd8ce..f71d4aad 100644 --- 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 index 18b33bdf..5dea9db0 100644 --- 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