From b7aa057aa1b44bdc92b5460a50470e5524a31149 Mon Sep 17 00:00:00 2001
From: Jeongik Cha <jeongik@google.com>
Date: Wed, 18 Dec 2019 21:06:25 +0900
Subject: [PATCH] Move the app to /system_ext

As mentioned in go/partitions-in-r, we plan to forbid hidden API in
product partition.
So this app should be moved to /system_ext because it uses hidden API.
It is not permanent, so they can be moved back to /product due to
needs if there isn't hidden usage anymore.

Bug: 137908189
Test: m
Test: check whether device boots successfully
Change-Id: Id1e897eadea814b780f199fa7f3d683924eb4ab3
---
 apps/SdkSetup/Android.bp               | 11 +++++-
 apps/SdkSetup/CleanSpec.mk             | 52 ++++++++++++++++++++++++++
 apps/SdkSetup/com.android.sdksetup.xml | 31 +++++++++++++++
 3 files changed, 93 insertions(+), 1 deletion(-)
 create mode 100644 apps/SdkSetup/CleanSpec.mk
 create mode 100644 apps/SdkSetup/com.android.sdksetup.xml

diff --git a/apps/SdkSetup/Android.bp b/apps/SdkSetup/Android.bp
index 6677773e8..ac45411e3 100644
--- a/apps/SdkSetup/Android.bp
+++ b/apps/SdkSetup/Android.bp
@@ -7,5 +7,14 @@ android_app {
     optimize: {
         enabled: false,
     },
-    product_specific: true,
+    system_ext_specific: true,
+    required: ["privapp_whitelist_com.android.sdksetup"],
 }
+
+prebuilt_etc {
+    name: "privapp_whitelist_com.android.sdksetup",
+    system_ext_specific: true,
+    sub_dir: "permissions",
+    src: "com.android.sdksetup.xml",
+    filename_from_src: true,
+}
\ No newline at end of file
diff --git a/apps/SdkSetup/CleanSpec.mk b/apps/SdkSetup/CleanSpec.mk
new file mode 100644
index 000000000..37da2eba4
--- /dev/null
+++ b/apps/SdkSetup/CleanSpec.mk
@@ -0,0 +1,52 @@
+# Copyright (C) 2019 The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+# If you don't need to do a full clean build but would like to touch
+# a file or delete some intermediate files, add a clean step to the end
+# of the list.  These steps will only be run once, if they haven't been
+# run before.
+#
+# E.g.:
+#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
+#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
+#
+# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
+# files that are missing or have been moved.
+#
+# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
+# Use $(OUT_DIR) to refer to the "out" directory.
+#
+# If you need to re-do something that's already mentioned, just copy
+# the command and add it to the bottom of the list.  E.g., if a change
+# that you made last week required touching a file and a change you
+# made today requires touching the same file, just copy the old
+# touch step and add it to the end of the list.
+#
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
+
+# For example:
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
+#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
+#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
+#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
+
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/priv-app/SdkSetup)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/priv-app/SdkSetup)
+
+# ************************************************
+# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
+# ************************************************
\ No newline at end of file
diff --git a/apps/SdkSetup/com.android.sdksetup.xml b/apps/SdkSetup/com.android.sdksetup.xml
new file mode 100644
index 000000000..0d81b9d50
--- /dev/null
+++ b/apps/SdkSetup/com.android.sdksetup.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!--
+  ~ Copyright (C) 2017 The Android Open Source Project
+  ~
+  ~ Licensed under the Apache License, Version 2.0 (the "License");
+  ~ you may not use this file except in compliance with the License.
+  ~ You may obtain a copy of the License at
+  ~
+  ~      http://www.apache.org/licenses/LICENSE-2.0
+  ~
+  ~ Unless required by applicable law or agreed to in writing, software
+  ~ distributed under the License is distributed on an "AS IS" BASIS,
+  ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  ~ See the License for the specific language governing permissions and
+  ~ limitations under the License
+  -->
+
+<!--
+This XML file declares which signature|privileged permissions should be granted to privileged
+applications on GMS or Google-branded devices.
+It allows additional grants on top of privapp-permissions-platform.xml
+-->
+
+<permissions>
+    <privapp-permissions package="com.android.sdksetup">
+        <permission name="android.permission.BACKUP"/>
+        <permission name="android.permission.MANAGE_USERS"/>
+        <permission name="android.permission.WRITE_SECURE_SETTINGS"/>
+        <permission name="android.permission.INTERACT_ACROSS_USERS"/>
+    </privapp-permissions>
+</permissions>