openkylin
/
platform_packages_apps_Launcher3
mirror of https://gitee.com/openkylin/platform_packages_apps_launcher3.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Reconcile difference btw master and ub-launcher3-master 

Change-Id: I33dcd6a062b754edbe2da9c7fcf2a8ccfb41b661
This commit is contained in:
Hyunyoung Song 2019-03-21 14:06:02 -07:00
parent 0825e414f0
commit 896a715a1c
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Android.mk
View File

@ -24,7 +24,10 @@ LOCAL_USE_AAPT2 := true
LOCAL_AAPT2_ONLY := true
LOCAL_MODULE_TAGS := optional
LOCAL_STATIC_JAVA_LIBRARIES := libPluginCore
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 \

8
tests/Android.mk
View File

@ -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 \