summaryrefslogtreecommitdiff
authorjie.yuan <jie.yuan@amlogic.com>2017-09-12 02:36:03 (GMT)
committer jie.yuan <jie.yuan@amlogic.com>2017-09-12 02:36:03 (GMT)
commit6892f4b149a1970ebbc8924b46eb8a4c82c22985 (patch)
tree86eafe3979577bc0df88b8e26fcf64320832f9f7
parentd404d79d44f8150b0a2e2ae216a9826733241a63 (diff)
downloadamlogic-o-6892f4b149a1970ebbc8924b46eb8a4c82c22985.zip
amlogic-o-6892f4b149a1970ebbc8924b46eb8a4c82c22985.tar.gz
amlogic-o-6892f4b149a1970ebbc8924b46eb8a4c82c22985.tar.bz2
CTS : delete android.software.device_admin.xml for CtsAdminTestCases [1/1]
PD# NONE the device_admin feature will not support when TARGET_BUILD_GOOGLE_ATV Change-Id: I6fbd1006a8e1bed409de745dfa8bf0ca86543f85 Signed-off-by: jie.yuan <jie.yuan@amlogic.com>
Diffstat
-rw-r--r--common/products/mbox/product_mbox.mk1
-rw-r--r--common/products/tablet/product_tablet.mk4
-rw-r--r--common/products/tv/product_tv.mk1
3 files changed, 0 insertions, 6 deletions
diff --git a/common/products/mbox/product_mbox.mk b/common/products/mbox/product_mbox.mk
index f16addd..de66ae3 100644
--- a/common/products/mbox/product_mbox.mk
+++ b/common/products/mbox/product_mbox.mk
@@ -55,7 +55,6 @@ PRODUCT_PACKAGES += \
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.app_widgets.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.app_widgets.xml \
frameworks/native/data/etc/android.software.backup.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.backup.xml \
- frameworks/native/data/etc/android.software.device_admin.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_admin.xml \
frameworks/native/data/etc/android.hardware.audio.output.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.output.xml \
frameworks/native/data/etc/android.hardware.location.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.xml \
frameworks/native/data/etc/android.hardware.hdmi.cec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.hdmi.cec.xml \
diff --git a/common/products/tablet/product_tablet.mk b/common/products/tablet/product_tablet.mk
index ebd3fb9..0e9146a 100644
--- a/common/products/tablet/product_tablet.mk
+++ b/common/products/tablet/product_tablet.mk
@@ -39,10 +39,6 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.print.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.print.xml
-# Device Admin
-PRODUCT_COPY_FILES += \
- frameworks/native/data/etc/android.software.device_admin.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_admin.xml
-
#copy lowmemorykiller.txt
ifeq ($(BUILD_WITH_LOWMEM_COMMON_CONFIG),true)
PRODUCT_COPY_FILES += \
diff --git a/common/products/tv/product_tv.mk b/common/products/tv/product_tv.mk
index 6c055e2..88b15e7 100644
--- a/common/products/tv/product_tv.mk
+++ b/common/products/tv/product_tv.mk
@@ -81,7 +81,6 @@ PRODUCT_COPY_FILES += \
frameworks/native/data/etc/android.software.live_tv.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.live_tv.xml \
frameworks/native/data/etc/android.software.app_widgets.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.app_widgets.xml \
frameworks/native/data/etc/android.software.backup.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.backup.xml \
- frameworks/native/data/etc/android.software.device_admin.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.device_admin.xml \
frameworks/native/data/etc/android.hardware.hdmi.cec.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.hdmi.cec.xml \
frameworks/native/data/etc/android.hardware.audio.output.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.audio.output.xml \
frameworks/native/data/etc/android.hardware.location.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.location.xml \