summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeongik Cha <jeongik@google.com>2019-12-18 20:43:43 +0900
committerJeongik Cha <jeongik@google.com>2020-01-17 09:16:14 +0000
commit2f4deb666e935c95a1800964c95fe819f66428c7 (patch)
treea199449faee3b700d6c7446f8cdf00c0c98cbd94
parente88936689e349494adb50e3d7232cd089e14f467 (diff)
Move the app to /system_ext
We plan to forbid hidden API in product partition. So these apps have to 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: I0662674a66bc54ee4713e5c7ed6ad0db4d342338 Merged-In: I0662674a66bc54ee4713e5c7ed6ad0db4d342338
-rw-r--r--packages/WAPPushManager/Android.bp2
-rw-r--r--packages/WAPPushManager/CleanSpec.mk2
-rw-r--r--packages/WallpaperCropper/Android.bp2
-rw-r--r--packages/WallpaperCropper/CleanSpec.mk1
4 files changed, 5 insertions, 2 deletions
diff --git a/packages/WAPPushManager/Android.bp b/packages/WAPPushManager/Android.bp
index c3913698022d..083dac944936 100644
--- a/packages/WAPPushManager/Android.bp
+++ b/packages/WAPPushManager/Android.bp
@@ -10,5 +10,5 @@ android_app {
proguard_flags_files: ["proguard.flags"],
},
- product_specific: true,
+ system_ext_specific: true,
}
diff --git a/packages/WAPPushManager/CleanSpec.mk b/packages/WAPPushManager/CleanSpec.mk
index 2dcbb1034622..f4e316c56bbf 100644
--- a/packages/WAPPushManager/CleanSpec.mk
+++ b/packages/WAPPushManager/CleanSpec.mk
@@ -49,3 +49,5 @@
# ************************************************
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/WAPPushManager)
+$(call add-clean-step, rm -rf $(TARGET_OUT_PRODUCT)/app/WAPPushManager)
+
diff --git a/packages/WallpaperCropper/Android.bp b/packages/WallpaperCropper/Android.bp
index 40c423520081..ac38b271395c 100644
--- a/packages/WallpaperCropper/Android.bp
+++ b/packages/WallpaperCropper/Android.bp
@@ -3,7 +3,7 @@ android_app {
srcs: ["src/**/*.java"],
platform_apis: true,
certificate: "platform",
- product_specific: true,
+ system_ext_specific: true,
privileged: true,
optimize: {
proguard_flags_files: ["proguard.flags"],
diff --git a/packages/WallpaperCropper/CleanSpec.mk b/packages/WallpaperCropper/CleanSpec.mk
index e6d8d5a774f1..f08c3430756a 100644
--- a/packages/WallpaperCropper/CleanSpec.mk
+++ b/packages/WallpaperCropper/CleanSpec.mk
@@ -44,6 +44,7 @@
#$(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/priv-app/WallpaperCropper)
+$(call add-clean-step, rm -rf $(TARGET_OUT_PRODUCT)/priv-app/WallpaperCropper)
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST