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
This commit is contained in:
parent
61ad3016be
commit
2857871b7f
56
Android.mk
56
Android.mk
|
@ -187,10 +187,13 @@ LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib
|
||||||
LOCAL_SRC_FILES := \
|
LOCAL_SRC_FILES := \
|
||||||
$(call all-java-files-under, src) \
|
$(call all-java-files-under, src) \
|
||||||
$(call all-java-files-under, quickstep/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_flags) \
|
||||||
$(call all-java-files-under, src_shortcuts_overrides)
|
$(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
|
LOCAL_PROGUARD_ENABLED := disabled
|
||||||
|
|
||||||
|
|
||||||
|
@ -217,7 +220,9 @@ LOCAL_PACKAGE_NAME := Launcher3QuickStep
|
||||||
LOCAL_PRIVILEGED_MODULE := true
|
LOCAL_PRIVILEGED_MODULE := true
|
||||||
LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3
|
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_FULL_LIBS_MANIFEST_FILES := \
|
||||||
$(LOCAL_PATH)/AndroidManifest.xml \
|
$(LOCAL_PATH)/AndroidManifest.xml \
|
||||||
|
@ -249,10 +254,12 @@ LOCAL_STATIC_ANDROID_LIBRARIES := Launcher3CommonDepsLib
|
||||||
LOCAL_SRC_FILES := \
|
LOCAL_SRC_FILES := \
|
||||||
$(call all-java-files-under, src) \
|
$(call all-java-files-under, src) \
|
||||||
$(call all-java-files-under, quickstep/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)
|
$(call all-java-files-under, go/src)
|
||||||
|
|
||||||
LOCAL_RESOURCE_DIR := \
|
LOCAL_RESOURCE_DIR := \
|
||||||
$(LOCAL_PATH)/quickstep/res \
|
$(LOCAL_PATH)/quickstep/res \
|
||||||
|
$(LOCAL_PATH)/quickstep/recents_ui_overrides/res \
|
||||||
$(LOCAL_PATH)/go/res
|
$(LOCAL_PATH)/go/res
|
||||||
|
|
||||||
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
|
LOCAL_PROGUARD_FLAG_FILES := proguard.flags
|
||||||
|
@ -271,6 +278,51 @@ LOCAL_MANIFEST_FILE := quickstep/AndroidManifest.xml
|
||||||
LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*
|
LOCAL_JACK_COVERAGE_INCLUDE_FILTER := com.android.launcher3.*
|
||||||
include $(BUILD_PACKAGE)
|
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))
|
include $(call all-makefiles-under,$(LOCAL_PATH))
|
||||||
|
|
26
build.gradle
26
build.gradle
|
@ -59,6 +59,12 @@ android {
|
||||||
minSdkVersion 28
|
minSdkVersion 28
|
||||||
}
|
}
|
||||||
|
|
||||||
|
withQuickstepIconRecents {
|
||||||
|
dimension "recents"
|
||||||
|
|
||||||
|
minSdkVersion 28
|
||||||
|
}
|
||||||
|
|
||||||
withoutQuickstep {
|
withoutQuickstep {
|
||||||
dimension "recents"
|
dimension "recents"
|
||||||
}
|
}
|
||||||
|
@ -67,7 +73,12 @@ android {
|
||||||
// Disable release builds for now
|
// Disable release builds for now
|
||||||
android.variantFilter { variant ->
|
android.variantFilter { variant ->
|
||||||
if (variant.buildType.name.endsWith('release')) {
|
if (variant.buildType.name.endsWith('release')) {
|
||||||
variant.setIgnore(true);
|
variant.setIgnore(true)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Icon recents is Go only
|
||||||
|
if (name.contains("WithQuickstepIconRecents") && !name.contains("l3go")) {
|
||||||
|
variant.setIgnore(true)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -112,8 +123,14 @@ android {
|
||||||
}
|
}
|
||||||
|
|
||||||
withQuickstep {
|
withQuickstep {
|
||||||
res.srcDirs = ['quickstep/res']
|
res.srcDirs = ['quickstep/res', 'quickstep/recents_ui_overrides/res']
|
||||||
java.srcDirs = ['quickstep/src']
|
java.srcDirs = ['quickstep/src', 'quickstep/recents_ui_overrides/src']
|
||||||
|
manifest.srcFile "quickstep/AndroidManifest.xml"
|
||||||
|
}
|
||||||
|
|
||||||
|
withQuickstepIconRecents {
|
||||||
|
res.srcDirs = ['quickstep/res', 'go/quickstep/res']
|
||||||
|
java.srcDirs = ['quickstep/src', 'go/quickstep/src']
|
||||||
manifest.srcFile "quickstep/AndroidManifest.xml"
|
manifest.srcFile "quickstep/AndroidManifest.xml"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -136,6 +153,9 @@ dependencies {
|
||||||
// Recents lib dependency
|
// Recents lib dependency
|
||||||
withQuickstepImplementation fileTree(dir: "quickstep/libs", include: 'sysui_shared.jar')
|
withQuickstepImplementation fileTree(dir: "quickstep/libs", include: 'sysui_shared.jar')
|
||||||
|
|
||||||
|
// Recents lib dependency for Go
|
||||||
|
withQuickstepIconRecentsImplementation fileTree(dir: "quickstep/libs", include: 'sysui_shared.jar')
|
||||||
|
|
||||||
// Required for AOSP to compile. This is already included in the sysui_shared.jar
|
// Required for AOSP to compile. This is already included in the sysui_shared.jar
|
||||||
withoutQuickstepImplementation fileTree(dir: "libs", include: 'plugin_core.jar')
|
withoutQuickstepImplementation fileTree(dir: "libs", include: 'plugin_core.jar')
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue