diff options
| author | Hyunyoung Song <hyunyoungs@google.com> | 2019-03-21 14:06:02 -0700 |
|---|---|---|
| committer | Hyunyoung Song <hyunyoungs@google.com> | 2019-03-21 14:06:02 -0700 |
| commit | 896a715a1c06019e1ba4916dd5b7739f1e818070 (patch) | |
| tree | c8a14d39a1f5bbee8b54cce5f6f1eefefe575d24 /tests/Android.mk | |
| parent | 0825e414f05c525e46a58c32d534989b20da6a41 (diff) | |
| download | android_packages_apps_Trebuchet-896a715a1c06019e1ba4916dd5b7739f1e818070.tar.gz android_packages_apps_Trebuchet-896a715a1c06019e1ba4916dd5b7739f1e818070.tar.bz2 android_packages_apps_Trebuchet-896a715a1c06019e1ba4916dd5b7739f1e818070.zip | |
Reconcile difference btw master and ub-launcher3-master
Change-Id: I33dcd6a062b754edbe2da9c7fcf2a8ccfb41b661
Diffstat (limited to 'tests/Android.mk')
| -rw-r--r-- | tests/Android.mk | 8 |
1 files changed, 6 insertions, 2 deletions
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 \ |