diff options
| author | Xin Li <delphij@google.com> | 2018-08-06 16:51:30 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2018-08-06 16:51:30 -0700 |
| commit | c107a08365d81cd62bfcc6410c5c8beded72910b (patch) | |
| tree | fce2ac9b59edfa1145a05e9786c139d80de449bb | |
| parent | 08f71f5bb4dff48cdb94296c56c889f21568ad7b (diff) | |
| parent | 0cb6188e96aa5a3968585a710d35621e48b3fe46 (diff) | |
| download | CallLogProvider-c107a08365d81cd62bfcc6410c5c8beded72910b.tar.gz | |
Merge Android Pie into masterandroid-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release
Bug: 112104996
Change-Id: I9894e8ea2aca7b32769e86fab52b7ee914fbb310
| -rw-r--r-- | tests/Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/Android.mk b/tests/Android.mk index 58b4cb0..8741795 100644 --- a/tests/Android.mk +++ b/tests/Android.mk @@ -4,9 +4,9 @@ include $(CLEAR_VARS) # We only want this apk build for tests. LOCAL_MODULE_TAGS := tests -LOCAL_STATIC_JAVA_LIBRARIES := mockito-target legacy-android-test +LOCAL_STATIC_JAVA_LIBRARIES := mockito-target -LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base # Only compile source java files in this apk. LOCAL_SRC_FILES := $(call all-java-files-under, src) |