diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2014-11-26 12:14:47 +0000 |
|---|---|---|
| committer | Linaro Android Code Review <android-review@review.linaro.org> | 2014-11-26 12:14:47 +0000 |
| commit | c5f62a29279aa6ef14f62122041a0e6e4e17a906 (patch) | |
| tree | 2c64ba1c2f471c4de9ffe3132c6a1ed71478ac4a | |
| parent | 5d0f5437ab2f962a7214a2cb6e79fa7498ff6d60 (diff) | |
| parent | 59c7efd47d9b8fca9e2ba46576fcebaa2fa4ef0a (diff) | |
| download | fvp-armv8-c5f62a29279aa6ef14f62122041a0e6e4e17a906.tar.gz | |
Merge "monkey: add changes for monkey test" into linaro-fvp-lollipop
| -rw-r--r-- | device.mk | 9 | ||||
| -rw-r--r-- | monkey_black_list | 6 |
2 files changed, 13 insertions, 2 deletions
@@ -65,13 +65,18 @@ ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-filter="" PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ device/linaro/build/android.hardware.screen.xml:system/etc/permissions/android.hardware.screen.xml \ frameworks/native/data/etc/android.hardware.bluetooth.xml:system/etc/permissions/android.hardware.bluetooth.xml \ + frameworks/native/data/etc/android.software.backup.xml:system/etc/permissions/android.software.backup.xml \ frameworks/native/data/etc/android.hardware.usb.accessory.xml:system/etc/permissions/android.hardware.usb.accessory.xml) PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ - device/linaro/build/eth0_dns.sh:system/bin/eth0_dns.sh) + frameworks/native/data/etc/android.software.app_widgets.xml:system/etc/permissions/android.software.app_widgets.xml) PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ - frameworks/native/data/etc/android.software.app_widgets.xml:system/etc/permissions/android.software.app_widgets.xml) + device/linaro/build/eth0_dns.sh:system/bin/eth0_dns.sh) + +PRODUCT_COPY_FILES += device/linaro/build/disablesuspend.sh:system/bin/disablesuspend.sh \ + $(LOCAL_PATH)/monkey_black_list:data/monkey_black_list + # Copy media codecs config file PRODUCT_COPY_FILES += device/linaro/build/media_codecs.xml:system/etc/media_codecs.xml diff --git a/monkey_black_list b/monkey_black_list new file mode 100644 index 0000000..4e70fe0 --- /dev/null +++ b/monkey_black_list @@ -0,0 +1,6 @@ +com.android.development +com.android.quicksearchbox +com.android.speechrecorder +com.android.connectivitymanagertest +org.linaro.glmark2 +com.android.gallery3d |