Skip to content

Commit 61d47cc

Browse files
committed
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: Ida940a2e1bb832cf5c3d147297e7ed65fa6921d5
1 parent 535cd59 commit 61d47cc

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

Diff for: Android.mk

+5-5
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ LOCAL_SDK_VERSION := current
9494
LOCAL_MIN_SDK_VERSION := 21
9595
LOCAL_PACKAGE_NAME := Launcher3
9696
LOCAL_PRIVILEGED_MODULE := true
97-
LOCAL_PRODUCT_MODULE := true
97+
LOCAL_SYSTEM_EXT_MODULE := true
9898
LOCAL_OVERRIDES_PACKAGES := Home Launcher2
9999
LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
100100

@@ -125,7 +125,7 @@ LOCAL_SDK_VERSION := current
125125
LOCAL_MIN_SDK_VERSION := 21
126126
LOCAL_PACKAGE_NAME := Launcher3Go
127127
LOCAL_PRIVILEGED_MODULE := true
128-
LOCAL_PRODUCT_MODULE := true
128+
LOCAL_SYSTEM_EXT_MODULE := true
129129
LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep
130130
LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
131131

@@ -191,7 +191,7 @@ else
191191
endif
192192
LOCAL_PACKAGE_NAME := Launcher3QuickStep
193193
LOCAL_PRIVILEGED_MODULE := true
194-
LOCAL_PRODUCT_MODULE := true
194+
LOCAL_SYSTEM_EXT_MODULE := true
195195
LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3
196196
LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
197197

@@ -241,7 +241,7 @@ LOCAL_PROGUARD_ENABLED := full
241241

242242
LOCAL_PACKAGE_NAME := Launcher3QuickStepGo
243243
LOCAL_PRIVILEGED_MODULE := true
244-
LOCAL_PRODUCT_MODULE := true
244+
LOCAL_SYSTEM_EXT_MODULE := true
245245
LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep Launcher3GoIconRecents
246246
LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
247247

@@ -287,7 +287,7 @@ LOCAL_PROGUARD_ENABLED := full
287287

288288
LOCAL_PACKAGE_NAME := Launcher3GoIconRecents
289289
LOCAL_PRIVILEGED_MODULE := true
290-
LOCAL_PRODUCT_MODULE := true
290+
LOCAL_SYSTEM_EXT_MODULE := true
291291
LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3Go Launcher3QuickStep
292292
LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
293293

Diff for: CleanSpec.mk

+10
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,16 @@ $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_interm
5454
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)
5555
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Launcher3QuickStep)
5656

57+
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/priv-app/Launcher3)
58+
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/priv-app/Launcher3Go)
59+
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/priv-app/Launcher3QuickStep)
60+
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/priv-app/Launcher3QuickStepGo)
61+
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/priv-app/Launcher3GoIconRecents)
62+
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/priv-app/Launcher3)
63+
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/priv-app/Launcher3Go)
64+
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/priv-app/Launcher3QuickStep)
65+
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/priv-app/Launcher3QuickStepGo)
66+
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/priv-app/Launcher3GoIconRecents)
5767
# ************************************************
5868
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
5969
# ************************************************

0 commit comments

Comments
 (0)