commit 896a715a1c06019e1ba4916dd5b7739f1e818070
author Hyunyoung Song <hyunyoungs@google.com> Thu Mar 21 14:06:02 2019 -0700
committer Hyunyoung Song <hyunyoungs@google.com> Thu Mar 21 14:06:02 2019 -0700
tree c8a14d39a1f5bbee8b54cce5f6f1eefefe575d24
parent 0825e414f05c525e46a58c32d534989b20da6a41

Reconcile difference btw master and ub-launcher3-master

Change-Id: I33dcd6a062b754edbe2da9c7fcf2a8ccfb41b661

Android.mk

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 \