From 98afd8ab2a6a942c84da360534fe9a8e1ca1ecc7 Mon Sep 17 00:00:00 2001 From: Prathmesh Prabhu Date: Fri, 26 Feb 2016 11:17:20 -0800 Subject: [PATCH] [Emulator] Add comment about including AOSP messaging on AOSP images. We've gone back and forth on this a few times. Just state clearly why we're including the AOSP messaging APP here. BUG:22097835 Change-Id: I26864ba033f0a211d038fa3526241c869d677217 --- target/product/sdk_phone_arm64.mk | 3 +++ target/product/sdk_phone_armv7.mk | 3 +++ target/product/sdk_phone_mips.mk | 3 +++ target/product/sdk_phone_mips64.mk | 3 +++ target/product/sdk_phone_x86.mk | 3 +++ target/product/sdk_phone_x86_64.mk | 3 +++ 6 files changed, 18 insertions(+) diff --git a/target/product/sdk_phone_arm64.mk b/target/product/sdk_phone_arm64.mk index c77066300..a689475b3 100644 --- a/target/product/sdk_phone_arm64.mk +++ b/target/product/sdk_phone_arm64.mk @@ -23,6 +23,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) $(call inherit-product, $(SRC_TARGET_DIR)/board/generic_arm64/device.mk) +# AOSP emulator images build the AOSP messaging app. +# Google API images override with the Google API app. +# See vendor/google/products/sdk_google_phone_*.mk PRODUCT_PACKAGES += \ messaging diff --git a/target/product/sdk_phone_armv7.mk b/target/product/sdk_phone_armv7.mk index 0851318ce..ebdd0e7f4 100644 --- a/target/product/sdk_phone_armv7.mk +++ b/target/product/sdk_phone_armv7.mk @@ -16,6 +16,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) +# AOSP emulator images build the AOSP messaging app. +# Google API images override with the Google API app. +# See vendor/google/products/sdk_google_phone_*.mk PRODUCT_PACKAGES += \ messaging diff --git a/target/product/sdk_phone_mips.mk b/target/product/sdk_phone_mips.mk index 2f577d380..1cc2fe4b5 100644 --- a/target/product/sdk_phone_mips.mk +++ b/target/product/sdk_phone_mips.mk @@ -21,6 +21,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) +# AOSP emulator images build the AOSP messaging app. +# Google API images override with the Google API app. +# See vendor/google/products/sdk_google_phone_*.mk PRODUCT_PACKAGES += \ messaging diff --git a/target/product/sdk_phone_mips64.mk b/target/product/sdk_phone_mips64.mk index 2c05f3141..e45d71bd8 100644 --- a/target/product/sdk_phone_mips64.mk +++ b/target/product/sdk_phone_mips64.mk @@ -22,6 +22,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) +# AOSP emulator images build the AOSP messaging app. +# Google API images override with the Google API app. +# See vendor/google/products/sdk_google_phone_*.mk PRODUCT_PACKAGES += \ messaging diff --git a/target/product/sdk_phone_x86.mk b/target/product/sdk_phone_x86.mk index 2feb6cc7a..01c2e8339 100644 --- a/target/product/sdk_phone_x86.mk +++ b/target/product/sdk_phone_x86.mk @@ -21,6 +21,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) +# AOSP emulator images build the AOSP messaging app. +# Google API images override with the Google API app. +# See vendor/google/products/sdk_google_phone_*.mk PRODUCT_PACKAGES += \ messaging diff --git a/target/product/sdk_phone_x86_64.mk b/target/product/sdk_phone_x86_64.mk index f3573a207..c3bc5e958 100644 --- a/target/product/sdk_phone_x86_64.mk +++ b/target/product/sdk_phone_x86_64.mk @@ -22,6 +22,9 @@ $(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) $(call inherit-product, $(SRC_TARGET_DIR)/product/sdk_base.mk) +# AOSP emulator images build the AOSP messaging app. +# Google API images override with the Google API app. +# See vendor/google/products/sdk_google_phone_*.mk PRODUCT_PACKAGES += \ messaging -- 2.11.0