Normalize atv sdk product names to sdk_atv_<arch>
Ying Wang [Sat, 19 Jul 2014 17:26:18 +0000 (10:26 -0700)]
Also use PRODUCT_IS_ATV_SDK to indicate current is an atv SDK build.

Bug: 16216170
Change-Id: Iabc1f60bc7f7e6cfe13c52759e1ddabf0eab9908

products/sdk_atv_armv7.mk [moved from products/atv_sdk.mk with 97% similarity]
products/sdk_atv_x86.mk [moved from products/atv_sdk_x86.mk with 80% similarity]
sdk/Android.mk

similarity index 97%
rename from products/atv_sdk.mk
rename to products/sdk_atv_armv7.mk
index 40cf5f4..ba91ccf 100644 (file)
@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+PRODUCT_IS_ATV_SDK := true
+
 PRODUCT_PACKAGES := \
     EmulatorSmokeTests \
     TelephonyProvider \
@@ -60,6 +62,6 @@ $(call inherit-product, device/google/atv/products/atv_base.mk)
 -include external/svox/pico/lang/PicoLangItItInSystem.mk
 
 # Overrides
-PRODUCT_NAME := atv_sdk
+PRODUCT_NAME := sdk_atv_armv7
 PRODUCT_DEVICE := generic
 PRODUCT_BRAND := generic
similarity index 80%
rename from products/atv_sdk_x86.mk
rename to products/sdk_atv_x86.mk
index 0feaac0..aa4fb7e 100644 (file)
 # limitations under the License.
 #
 
-$(call inherit-product, device/google/atv/products/atv_sdk.mk)
+# TODO: separate out a common base for arm/x86 atv SDK build.
+$(call inherit-product, device/google/atv/products/sdk_atv_armv7.mk)
 
 # Overrides
-PRODUCT_NAME := atv_sdk_x86
+PRODUCT_NAME := sdk_atv_x86
 PRODUCT_DEVICE := generic_x86
 PRODUCT_BRAND := generic_x86
index 0e5ed0b..b9c762e 100644 (file)
@@ -1,4 +1,4 @@
-ifneq ($(filter atv_sdk% atv_google_sdk%,$(TARGET_PRODUCT)),)
+ifeq ($(PRODUCT_IS_ATV_SDK),true)
 # Refer to development/build/Android.mk
 source_properties_file := \
     $(HOST_OUT)/device/google/atv/sdk/images_$(TARGET_CPU_ABI)_source.properties