Skip to content

Commit ad91de5

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 Exempt-From-Owner-Approval: cherry-pick from internal Change-Id: Ida940a2e1bb832cf5c3d147297e7ed65fa6921d5 Merged-In: Ida940a2e1bb832cf5c3d147297e7ed65fa6921d5
1 parent 361d6da commit ad91de5

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

Android.mk

+5-5
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ LOCAL_SDK_VERSION := current
100100
LOCAL_MIN_SDK_VERSION := 21
101101
LOCAL_PACKAGE_NAME := Launcher3
102102
LOCAL_PRIVILEGED_MODULE := true
103-
LOCAL_PRODUCT_MODULE := true
103+
LOCAL_SYSTEM_EXT_MODULE := true
104104
LOCAL_OVERRIDES_PACKAGES := Home Launcher2
105105
LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
106106

@@ -131,7 +131,7 @@ LOCAL_SDK_VERSION := current
131131
LOCAL_MIN_SDK_VERSION := 21
132132
LOCAL_PACKAGE_NAME := Launcher3Go
133133
LOCAL_PRIVILEGED_MODULE := true
134-
LOCAL_PRODUCT_MODULE := true
134+
LOCAL_SYSTEM_EXT_MODULE := true
135135
LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep
136136
LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
137137

@@ -199,7 +199,7 @@ else
199199
endif
200200
LOCAL_PACKAGE_NAME := Launcher3QuickStep
201201
LOCAL_PRIVILEGED_MODULE := true
202-
LOCAL_PRODUCT_MODULE := true
202+
LOCAL_SYSTEM_EXT_MODULE := true
203203
LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3
204204
LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
205205

@@ -250,7 +250,7 @@ LOCAL_PROGUARD_ENABLED := full
250250

251251
LOCAL_PACKAGE_NAME := Launcher3QuickStepGo
252252
LOCAL_PRIVILEGED_MODULE := true
253-
LOCAL_PRODUCT_MODULE := true
253+
LOCAL_SYSTEM_EXT_MODULE := true
254254
LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep Launcher3GoIconRecents
255255
LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
256256

@@ -297,7 +297,7 @@ LOCAL_PROGUARD_ENABLED := full
297297

298298
LOCAL_PACKAGE_NAME := Launcher3GoIconRecents
299299
LOCAL_PRIVILEGED_MODULE := true
300-
LOCAL_PRODUCT_MODULE := true
300+
LOCAL_SYSTEM_EXT_MODULE := true
301301
LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3Go Launcher3QuickStep
302302
LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
303303

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)