From 6aabe679c5ae11845dfe3d6698dabaf357bb17fd Mon Sep 17 00:00:00 2001 From: Greg Kaiser Date: Fri, 14 Jun 2019 14:22:30 -0700 Subject: [PATCH] Android.mk: Strictly order QuickStepGo and GoIconRecents We had Launcher3QuickStepGo adding Launcher3GoIconRecents to LOCAL_OVERRIDES_PACKAGES, and also had Launcher3GoIconRecents adding Launcher3QuickStepGo to LOCAL_OVERRIDES_PACKAGES. As a result, if both of these got added to PROJECT_PACKAGES, we would end up with neither launcher, since they both overrode each other. To fix this, we declare a strict hierarchy. Since Launcher3GoIconRecents is the default, we put Launcher3QuickStepGo to be higher in the hierarchy. While that might seem a counter-intuitive choice, it makes it much easier for folks to override the default, without needing to modify the file containing the default. Test: Various clean builds which revealed this root issue, and this fix. Bug: 135161289 Change-Id: If718a7030aa6ee4b6b952406006abda77b1eb8e5 --- Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Android.mk b/Android.mk index 7956d2810a..9d113d9547 100644 --- a/Android.mk +++ b/Android.mk @@ -298,7 +298,7 @@ LOCAL_PROGUARD_ENABLED := full LOCAL_PACKAGE_NAME := Launcher3GoIconRecents LOCAL_PRIVILEGED_MODULE := true LOCAL_PRODUCT_MODULE := true -LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3Go Launcher3QuickStep Launcher3QuickStepGo +LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3Go Launcher3QuickStep LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3 LOCAL_FULL_LIBS_MANIFEST_FILES := \