diff options
| author | Paul Duffin <paulduffin@google.com> | 2017-03-03 10:06:33 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-03-03 10:06:33 +0000 |
| commit | 061c702dae79fe777dab9406d63f56fe72a85d4c (patch) | |
| tree | 7ad6c860b7b3627ea85c93a81fe86907a0af23c1 /samples/ApiDemos | |
| parent | 80c87a1fed376e702c9511ed93c9d491cc88770b (diff) | |
| parent | 18c0851a12e0317bf8a54b65707a9c075cfd7a29 (diff) | |
| download | android_development-061c702dae79fe777dab9406d63f56fe72a85d4c.tar.gz android_development-061c702dae79fe777dab9406d63f56fe72a85d4c.tar.bz2 android_development-061c702dae79fe777dab9406d63f56fe72a85d4c.zip | |
Merge "Prepare for removal of junit and android.test classes from Android API (step 1)" am: f2d90cc8d8 am: b017d07b78
am: 18c0851a12
Change-Id: I2dead96af0552919fb06c5298a28034121afa2f0
Diffstat (limited to 'samples/ApiDemos')
| -rw-r--r-- | samples/ApiDemos/tests/Android.mk | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/samples/ApiDemos/tests/Android.mk b/samples/ApiDemos/tests/Android.mk index f975662dc..ed661a002 100644 --- a/samples/ApiDemos/tests/Android.mk +++ b/samples/ApiDemos/tests/Android.mk @@ -6,6 +6,8 @@ LOCAL_MODULE_TAGS := tests LOCAL_JAVA_LIBRARIES := android.test.runner +LOCAL_STATIC_JAVA_LIBRARIES := legacy-android-test junit + # Include all test java files. LOCAL_SRC_FILES := $(call all-java-files-under, src) |