summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJi-Hwan Lee <jihwan@google.com>2014-06-02 16:47:37 +0900
committerJi-Hwan Lee <jihwan@google.com>2014-06-02 16:47:37 +0900
commitfe3992faf2b89648c2a53c348573cf836b842e54 (patch)
treee30e9a68dfbe3975188003e7a9efe06acb289a92
parenta57401366bf9a7073641135446ebfafe8d39ad73 (diff)
downloadandroid_device_google_atv-fe3992faf2b89648c2a53c348573cf836b842e54.tar.gz
android_device_google_atv-fe3992faf2b89648c2a53c348573cf836b842e54.tar.bz2
android_device_google_atv-fe3992faf2b89648c2a53c348573cf836b842e54.zip
DO NOT MERGE: Add missing images_x86_source.prop_template
This is a combined change for: a440249 Fix build for atv_google_sdk_x86 fd2dd46 Add missing images_x86_source.prop_template Change-Id: I439f1d8c2e2a7eacb1efd3af29919941c4298b23
-rw-r--r--sdk/Android.mk2
-rw-r--r--sdk/images_x86_source.prop_template9
2 files changed, 10 insertions, 1 deletions
diff --git a/sdk/Android.mk b/sdk/Android.mk
index 4ad544e..d734e10 100644
--- a/sdk/Android.mk
+++ b/sdk/Android.mk
@@ -1,4 +1,4 @@
-ifneq ($(filter atv_sdk atv_google_sdk,$(TARGET_PRODUCT)),)
+ifneq ($(filter atv_sdk atv_google_sdk atv_google_sdk_x86,$(TARGET_PRODUCT)),)
# Refer to development/build/Android.mk
source_properties_file := \
$(HOST_OUT)/device/google/atv/sdk/images_$(TARGET_CPU_ABI)_source.properties
diff --git a/sdk/images_x86_source.prop_template b/sdk/images_x86_source.prop_template
new file mode 100644
index 0000000..c3bc0ea
--- /dev/null
+++ b/sdk/images_x86_source.prop_template
@@ -0,0 +1,9 @@
+Pkg.Desc=Android SDK Platform ${PLATFORM_VERSION}
+Pkg.UserSrc=false
+Pkg.Revision=1
+AndroidVersion.ApiLevel=${PLATFORM_SDK_VERSION}
+AndroidVersion.CodeName=${PLATFORM_VERSION_CODENAME}
+SystemImage.Abi=x86
+SystemImage.GpuSupport=true
+SystemImage.TagId=android-tv
+SystemImage.TagDisplay=Android TV