diff options
| author | Ying Wang <wangying@google.com> | 2014-07-19 10:26:18 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2014-07-19 13:20:38 -0700 |
| commit | 6c30f0e83ece4b876d2fe75637b5a892fc4f6257 (patch) | |
| tree | 30680a62e5ade48ad46d5e1e7f390a6e538f6124 | |
| parent | aac83f021ea59a3eb589a758d0f39b839127b167 (diff) | |
| download | android_device_google_atv-6c30f0e83ece4b876d2fe75637b5a892fc4f6257.tar.gz android_device_google_atv-6c30f0e83ece4b876d2fe75637b5a892fc4f6257.tar.bz2 android_device_google_atv-6c30f0e83ece4b876d2fe75637b5a892fc4f6257.zip | |
Normalize atv sdk product names to sdk_atv_<arch>
Also use PRODUCT_IS_ATV_SDK to indicate current is an atv SDK build.
Bug: 16216170
Change-Id: Iabc1f60bc7f7e6cfe13c52759e1ddabf0eab9908
| -rw-r--r-- | products/sdk_atv_armv7.mk (renamed from products/atv_sdk.mk) | 4 | ||||
| -rw-r--r-- | products/sdk_atv_x86.mk (renamed from products/atv_sdk_x86.mk) | 5 | ||||
| -rw-r--r-- | sdk/Android.mk | 2 |
3 files changed, 7 insertions, 4 deletions
diff --git a/products/atv_sdk.mk b/products/sdk_atv_armv7.mk index 40cf5f4..ba91ccf 100644 --- a/products/atv_sdk.mk +++ b/products/sdk_atv_armv7.mk @@ -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 diff --git a/products/atv_sdk_x86.mk b/products/sdk_atv_x86.mk index 0feaac0..aa4fb7e 100644 --- a/products/atv_sdk_x86.mk +++ b/products/sdk_atv_x86.mk @@ -14,9 +14,10 @@ # 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 diff --git a/sdk/Android.mk b/sdk/Android.mk index 0e5ed0b..b9c762e 100644 --- a/sdk/Android.mk +++ b/sdk/Android.mk @@ -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 |