diff options
| author | Yongqin Liu <yongqin.liu@linaro.org> | 2015-06-19 16:39:40 +0800 |
|---|---|---|
| committer | Yongqin Liu of Linaro <yongqin.liu@linaro.org> | 2015-06-25 15:45:22 +0000 |
| commit | 4e07303ebcd4c0a21035d9f3db201df3f02eb949 (patch) | |
| tree | e15c74ada5352ba024d5e4069e99f81917b1b583 | |
| parent | 007152a34b8bae1398bdf4cd30f265f881000321 (diff) | |
| download | common-4e07303ebcd4c0a21035d9f3db201df3f02eb949.tar.gz | |
common-device.mk: change on including tests and make adbd started with root permission
use INCLUDE_TESTS to specify if tests will be integrated.
only when INCLUDE_TESTS is set to 1, tests will be integrated.
and INCLUDE_TESTS is default to 1.
set service.adb.root to 1 to make adb boot with root permission
Change-Id: I7062d79cdebca1f9bd86dd048b6659633ef548a5
Signed-off-by: Yongqin Liu <yongqin.liu@linaro.org>
| -rw-r--r-- | common-device.mk | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/common-device.mk b/common-device.mk index 012f4c7..e436ef5 100644 --- a/common-device.mk +++ b/common-device.mk @@ -1,15 +1,22 @@ # common place to define features for all linaro supported boards +INCLUDE_TESTS ?= 1 + #enable user mock location so that we can have 100 pass rate for cts android.webkit package # should use PRODUCT_DEFAULT_PROPERTY_OVERRIDES, but since there is a bug in build/core/Makefile, # so we use ADDITIONAL_DEFAULT_PROPERTIES here ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=1 +# enable adbd started with root permission +PRODUCT_PROPERTY_OVERRIDES += service.adb.root=1 + PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ device/linaro/build/disablesuspend.sh:system/bin/disablesuspend.sh) PRODUCT_COPY_FILES += $(call add-to-product-copy-files-if-exists,\ device/linaro/build/android_dhcpcd.conf:system/etc/dhcpcd/dhcpcd.conf) +ifeq ($(INCLUDE_TESTS), 1) # integrate tests that will not be integrated by default $(call inherit-product-if-exists, device/linaro/build/extra-and-tests.mk) +endif |