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

tests/Android.mk

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 \