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

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

Merge "Add build variant for go-specific recents." into ub-launcher3-master

parents 24ed5723 2857871b

Android.mk

+54 −2
Original line number Diff line number Diff line
@@ -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))

build.gradle

+23 −3
Original line number Diff line number Diff line
@@ -59,6 +59,12 @@ android { 
            minSdkVersion 28

        }



        withQuickstepIconRecents {

            dimension "recents"



            minSdkVersion 28

        }



        withoutQuickstep {

            dimension "recents"

        }
@@ -67,7 +73,12 @@ android { 
    // Disable release builds for now

    android.variantFilter { variant ->

        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 {

            res.srcDirs = ['quickstep/res']

            java.srcDirs = ['quickstep/src']

            res.srcDirs = ['quickstep/res', 'quickstep/recents_ui_overrides/res']

            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"

        }

    }
@@ -136,6 +153,9 @@ dependencies { 
    // Recents lib dependency

    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

    withoutQuickstepImplementation fileTree(dir: "libs", include: 'plugin_core.jar')

go/quickstep/res/.keep

0 → 100644
+0 −0

Empty file added.

go/quickstep/src/.keep

0 → 100644
+0 −0

Empty file added.

quickstep/recents_ui_overrides/res/.keep

0 → 100644
+0 −0

Empty file added.