summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXavier Ducrohet <xav@google.com>2014-06-20 01:10:50 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-06-20 01:10:50 +0000
commit36236f7ed35dbeac391bc5593d9ee3a2b171eabd (patch)
treea88eb3fdc6e68b9eadc46eb931b9050ddfd05404
parent993017232cbac2c8bfedea801eb5fff8b7103602 (diff)
parent188e759cf74999f9eb39b1f634975aeaf6f54c9f (diff)
downloaddevice_google_atv-36236f7ed35dbeac391bc5593d9ee3a2b171eabd.tar.gz
device_google_atv-36236f7ed35dbeac391bc5593d9ee3a2b171eabd.tar.bz2
device_google_atv-36236f7ed35dbeac391bc5593d9ee3a2b171eabd.zip
am 188e759c: Merge "Package custom hardware.ini with armeabi-v7a images." into lmp-preview-dev
* commit '188e759cf74999f9eb39b1f634975aeaf6f54c9f': Package custom hardware.ini with armeabi-v7a images.
-rw-r--r--sdk/atv_sdk.atree1
-rw-r--r--sdk/images_armeabi-v7a_hardware.ini1
-rw-r--r--sdk/images_x86_hardware.ini0
3 files changed, 2 insertions, 0 deletions
diff --git a/sdk/atv_sdk.atree b/sdk/atv_sdk.atree
index 457eefe..331388d 100644
--- a/sdk/atv_sdk.atree
+++ b/sdk/atv_sdk.atree
@@ -16,6 +16,7 @@
# Override source.properties in development/build/sdk-android-${TARGET_CPU_ABI}.atree
${HOST_OUT}/device/google/atv/sdk/images_${TARGET_CPU_ABI}_source.properties system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/source.properties
+device/google/atv/sdk/images_${TARGET_CPU_ABI}_hardware.ini system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/hardware.ini
# devices.xml file with custom device definitions
device/google/atv/sdk/devices.xml system-images/${PLATFORM_NAME}/${TARGET_CPU_ABI}/devices.xml
diff --git a/sdk/images_armeabi-v7a_hardware.ini b/sdk/images_armeabi-v7a_hardware.ini
new file mode 100644
index 0000000..fe594c6
--- /dev/null
+++ b/sdk/images_armeabi-v7a_hardware.ini
@@ -0,0 +1 @@
+hw.cpu.model=cortex-a8
diff --git a/sdk/images_x86_hardware.ini b/sdk/images_x86_hardware.ini
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/sdk/images_x86_hardware.ini