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

Commit 896a715a authored by Hyunyoung Song's avatar Hyunyoung Song
Browse files

Reconcile difference btw master and ub-launcher3-master 

Change-Id: I33dcd6a062b754edbe2da9c7fcf2a8ccfb41b661
parent 0825e414

Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -24,7 +24,10 @@ LOCAL_USE_AAPT2 := true 
LOCAL_AAPT2_ONLY := true

LOCAL_MODULE_TAGS := optional



ifneq (,$(wildcard frameworks/base))

else

    LOCAL_STATIC_JAVA_LIBRARIES:= libPluginCore

endif



LOCAL_SRC_FILES := \

    $(call all-java-files-under, src_plugins)
@@ -197,6 +200,7 @@ LOCAL_PACKAGE_NAME := Launcher3QuickStep 
LOCAL_PRIVILEGED_MODULE := true

LOCAL_PRODUCT_MODULE := true

LOCAL_OVERRIDES_PACKAGES := Home Launcher2 Launcher3

LOCAL_REQUIRED_MODULES := privapp_whitelist_com.android.launcher3



LOCAL_RESOURCE_DIR := \

    $(LOCAL_PATH)/quickstep/res \

tests/Android.mk

+6 −2
Original line number Diff line number Diff line
@@ -23,8 +23,12 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
	androidx.annotation_annotation \

	androidx.test.runner \

	androidx.test.rules \

	androidx.test.uiautomator_uiautomator \

	libSharedSystemUI

	androidx.test.uiautomator_uiautomator



ifneq (,$(wildcard frameworks/base))

else

    LOCAL_STATIC_JAVA_LIBRARIES += libSharedSystemUI

endif



LOCAL_SRC_FILES := $(call all-java-files-under, tapl) \

  ../quickstep/src/com/android/quickstep/SwipeUpSetting.java \