Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbe947a2 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Move the app to /system_ext" into ub-launcher3-master

parents 70f99847 6af66b01

Android.mk

+5 −5
Original line number Diff line number Diff line
@@ -94,7 +94,7 @@ LOCAL_SDK_VERSION := current 
LOCAL_MIN_SDK_VERSION := 21

LOCAL_PACKAGE_NAME := Launcher3

LOCAL_PRIVILEGED_MODULE := true

LOCAL_PRODUCT_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
@@ -125,7 +125,7 @@ LOCAL_SDK_VERSION := current 
LOCAL_MIN_SDK_VERSION := 21

LOCAL_PACKAGE_NAME := Launcher3Go

LOCAL_PRIVILEGED_MODULE := true

LOCAL_PRODUCT_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
@@ -191,7 +191,7 @@ else 
endif

LOCAL_PACKAGE_NAME := Launcher3QuickStep

LOCAL_PRIVILEGED_MODULE := true

LOCAL_PRODUCT_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
@@ -241,7 +241,7 @@ LOCAL_PROGUARD_ENABLED := full 


LOCAL_PACKAGE_NAME := Launcher3QuickStepGo

LOCAL_PRIVILEGED_MODULE := true

LOCAL_PRODUCT_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep Launcher3GoIconRecents

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3
@@ -287,7 +287,7 @@ LOCAL_PROGUARD_ENABLED := full 


LOCAL_PACKAGE_NAME := Launcher3GoIconRecents

LOCAL_PRIVILEGED_MODULE := true

LOCAL_PRODUCT_MODULE := true

LOCAL_SYSTEM_EXT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3Go Launcher3QuickStep

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3

CleanSpec.mk

+10 −0
Original line number Diff line number Diff line
@@ -53,6 +53,16 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk) 
$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Launcher2_intermediates)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/Launcher2.apk)



$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/priv-app/Launcher3)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/priv-app/Launcher3Go)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/priv-app/Launcher3QuickStep)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/priv-app/Launcher3QuickStepGo)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/product/priv-app/Launcher3GoIconRecents)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/priv-app/Launcher3)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/priv-app/Launcher3Go)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/priv-app/Launcher3QuickStep)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/priv-app/Launcher3QuickStepGo)

$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/product/priv-app/Launcher3GoIconRecents)

# ************************************************

# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

# ************************************************