diff options
| author | Jon Miranda <jonmiranda@google.com> | 2017-08-28 18:39:24 -0400 |
|---|---|---|
| committer | Jon Miranda <jonmiranda@google.com> | 2017-08-29 20:10:22 -0400 |
| commit | fe8a39d8b0750a332787abbe1a210fb55e444223 (patch) | |
| tree | a9d1545741c85b136de6d336ae708d000a935597 /tests | |
| parent | dff92fe1aa90dfad1cce228ee140a70ab7a365b2 (diff) | |
| download | android_packages_apps_Trebuchet-fe8a39d8b0750a332787abbe1a210fb55e444223.tar.gz android_packages_apps_Trebuchet-fe8a39d8b0750a332787abbe1a210fb55e444223.tar.bz2 android_packages_apps_Trebuchet-fe8a39d8b0750a332787abbe1a210fb55e444223.zip | |
Ensure no diffs b/w oc-mr1-dev and ub-launcher3-dorval-polish2.
This should ensure that all future code drops will be able to
merge cleanly.
Bug: 64937210
Test: Manual test
Change-Id: I4f7952d0e979402e120b29dc501ac7fff3de2879
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Android.mk | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 6e6453ca1..e8797a75c 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -17,11 +17,7 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := \ - android-support-test \ - ub-uiautomator \ - legacy-android-test \ - mockito-target-minus-junit4 +LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator mockito-target-minus-junit4 LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_FULL_LIBS_MANIFEST_FILES := $(LOCAL_PATH)/AndroidManifest-common.xml |