diff options
author | Kevin <kevhan@google.com> | 2019-01-04 17:54:51 -0800 |
---|---|---|
committer | Kevin <kevhan@google.com> | 2019-01-07 14:37:02 -0800 |
commit | 2857871b7f5cd68657020b8c1f39d6ab4b509b06 (patch) | |
tree | e5fffc1e7429ee83655425e7c9c2967a059c38ca /Android.mk | |
parent | 61ad3016be24e672fe215e355a2638fbcb1c6f63 (diff) | |
download | android_packages_apps_Trebuchet-2857871b7f5cd68657020b8c1f39d6ab4b509b06.tar.gz android_packages_apps_Trebuchet-2857871b7f5cd68657020b8c1f39d6ab4b509b06.tar.bz2 android_packages_apps_Trebuchet-2857871b7f5cd68657020b8c1f39d6ab4b509b06.zip |
Add build variant for go-specific recents.
This CL sets up the source directories to build a Go version of
quickstep recents/icon recents. This is accomplished by splitting the
quickstep resources/sources into two groups: the base source and
sources that should be overridden (recents_ui_overrides). The new Go
recents variant then takes the base and combines it with the sources
in go/quickstep which should replace the ones in recents_ui_overrides.
As of now, no classes have been moved yet, so there
are only placeholder files.
In addition, this modifies the make and gradle files to reflect the new
sources.
Bug: 114136250
Test: build all targets via tapas, build all APKs from IDE
Change-Id: I6d0a4d93ab1c38d4ffc28fd21823caadd96d23f7
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 56 |
1 files changed, 54 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk index 28f0bc23b..cccf4e415 100644 --- a/Android.mk +++ b/Android.mk @@ -187,10 +187,13 @@ LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib LOCAL_SRC_FILES := \ $(call all-java-files-under, src) \ $(call all-java-files-under, quickstep/src) \ + $(call all-java-files-under, quickstep/recents_ui_overrides/src) \ $(call all-java-files-under, src_flags) \ $(call all-java-files-under, src_shortcuts_overrides) -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res +LOCAL_RESOURCE_DIR := \ + $(LOCAL_PATH)/quickstep/res \ + $(LOCAL_PATH)/quickstep/recents_ui_overrides/res LOCAL_PROGUARD_ENABLED := disabled @@ -217,7 +220,9 @@ LOCAL_PACKAGE_NAME := Launcher3QuickStep LOCAL_PRIVILEGED_MODULE := true LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 -LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/quickstep/res +LOCAL_RESOURCE_DIR := \ + $(LOCAL_PATH)/quickstep/res \ + $(LOCAL_PATH)/quickstep/recents_ui_overrides/res LOCAL_FULL_LIBS_MANIFEST_FILES := \ $(LOCAL_PATH)/AndroidManifest.xml \ @@ -249,10 +254,12 @@ LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib LOCAL_SRC_FILES := \ $(call all-java-files-under, src) \ $(call all-java-files-under, quickstep/src) \ + $(call all-java-files-under, quickstep/recents_ui_overrides/src) \ $(call all-java-files-under, go/src) LOCAL_RESOURCE_DIR := \ $(LOCAL_PATH)/quickstep/res \ + $(LOCAL_PATH)/quickstep/recents_ui_overrides/res \ $(LOCAL_PATH)/go/res LOCAL_PROGUARD_FLAG_FILES := proguard.flags @@ -271,6 +278,51 @@ LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.* include $(BUILD_PACKAGE) +# +# Build rule for Launcher3 Go app with quickstep and Go-specific +# version of recents for Android Go devices. +# +include $(CLEAR_VARS) +LOCAL_USE_AAPT2 := true +LOCAL_MODULE_TAGS := optional + +ifneq (,$(wildcard frameworks/base)) + LOCAL_STATIC_JAVA_LIBRARIES := SystemUISharedLib launcherprotosnano + LOCAL_PRIVATE_PLATFORM_APIS := true +else + LOCAL_STATIC_JAVA_LIBRARIES := libSharedSystemUI libLauncherProtos + LOCAL_SDK_VERSION := system_current + LOCAL_MIN_SDK_VERSION := 26 +endif +LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib + +LOCAL_SRC_FILES := \ + $(call all-java-files-under, src) \ + $(call all-java-files-under, quickstep/src) \ + $(call all-java-files-under, go/src) \ + $(call all-java-files-under, go/quickstep/src) + +LOCAL_RESOURCE_DIR := \ + $(LOCAL_PATH)/quickstep/res \ + $(LOCAL_PATH)/go/res \ + $(LOCAL_PATH)/go/quickstep/res + +LOCAL_PROGUARD_FLAG_FILES := proguard.flags +LOCAL_PROGUARD_ENABLED := full + +LOCAL_PACKAGE_NAME := Launcher3QuickStepGoIconRecents +LOCAL_PRIVILEGED_MODULE := true +LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3 Launcher3QuickStep + +LOCAL_FULL_LIBS_MANIFEST_FILES := \ + $(LOCAL_PATH)/go/AndroidManifest.xml \ + $(LOCAL_PATH)/AndroidManifest.xml \ + $(LOCAL_PATH)/AndroidManifest-common.xml + +LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml +LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.* +include $(BUILD_PACKAGE) + # ================================================== include $(call all-makefiles-under,$(LOCAL_PATH)) |