Move SdkSetup.apk to vendor partition

Otherwise, it causes the CTS-on-GSI failure on non-emulator devices: CtsPermission2TestCases android.permission2.cts.PrivappPermissionsTest#testPrivappPermissionsEnforcement Because non-emulator devices lack the permission file in their /vendor. /system/priv-app/SdkSetup/SdkSetup.apk /vendor/etc/permissions/privapp-permissions-goldfish.xml Bug: 110517983 Test: boot a GSI and checks that SdkSetup.apk is moved to /vendor Change-Id: I3086f99c477eeca38f42041e1809a5aa3b8bfa7a
aosp-mirror · Jul 17, 2018 · 3bf3140 · 3bf3140
1 parent 532d1aa
commit 3bf3140
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/CleanSpec.mk b/CleanSpec.mk
@@ -46,6 +46,8 @@
 
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/CorpApp_intermediates)
 
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/SdkSetup)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************
diff --git a/apps/SdkSetup/Android.mk b/apps/SdkSetup/Android.mk
@@ -3,6 +3,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE_TAGS := optional
 LOCAL_PRIVILEGED_MODULE := true
+LOCAL_VENDOR_MODULE := true
 LOCAL_SRC_FILES := $(call all-subdir-java-files)
 
 LOCAL_PACKAGE_NAME := SdkSetup