Commit 6aabe679 authored Jun 14, 2019 by Greg Kaiser

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

parent 873759a3

Android.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -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 := \