Reconcile difference btw master and ub-launcher3-master
Change-Id: I33dcd6a062b754edbe2da9c7fcf2a8ccfb41b661
diff --git a/Android.mk b/Android.mk
index 2feb141..25593e6 100644
--- a/Android.mk
+++ b/Android.mk
@@ -24,7 +24,10 @@
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_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 \
diff --git a/tests/Android.mk b/tests/Android.mk
index a787537..bf5cb29 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -23,8 +23,12 @@
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 \