From 896a715a1c06019e1ba4916dd5b7739f1e818070 Mon Sep 17 00:00:00 2001
From: Hyunyoung Song <hyunyoungs@google.com>
Date: Thu, 21 Mar 2019 14:06:02 -0700
Subject: Reconcile difference btw master and ub-launcher3-master

Change-Id: I33dcd6a062b754edbe2da9c7fcf2a8ccfb41b661
---
 tests/Android.mk | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'tests/Android.mk')

diff --git a/tests/Android.mk b/tests/Android.mk
index a78753754..bf5cb2933 100644
--- a/tests/Android.mk
+++ b/tests/Android.mk
@@ -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 \
-- 
cgit v1.2.3