From 3bf31401fe89b1941132d2c9159e290dfab3b2df Mon Sep 17 00:00:00 2001
From: Bowgo Tsai <bowgotsai@google.com>
Date: Tue, 17 Jul 2018 18:06:17 +0800
Subject: [PATCH] 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
---
 CleanSpec.mk             | 2 ++
 apps/SdkSetup/Android.mk | 1 +
 2 files changed, 3 insertions(+)

diff --git a/CleanSpec.mk b/CleanSpec.mk
index a113c7152d2..31f9afbddb9 100644
--- 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
index 833de03aab7..f2f40bb0f00 100644
--- 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