summaryrefslogtreecommitdiffstats
path: root/samples/ApiDemos
diff options
context:
space:
mode:
authorPaul Duffin <paulduffin@google.com>2017-12-15 07:22:37 +0000
committerPaul Duffin <paulduffin@google.com>2017-12-15 07:22:37 +0000
commit4fe452b0e73b7a08eb34a466c006bc495cc03179 (patch)
tree57f4b3fdd7b5575be62f4910d62c83391adce0a0 /samples/ApiDemos
parent8c2e1f981350edc6726cc080f54b90d815a36b25 (diff)
downloadandroid_development-4fe452b0e73b7a08eb34a466c006bc495cc03179.tar.gz
android_development-4fe452b0e73b7a08eb34a466c006bc495cc03179.tar.bz2
android_development-4fe452b0e73b7a08eb34a466c006bc495cc03179.zip
Add android.test.base/stubs dependency
In preparation for the removal of the non-junit classes in the android.test.base library from the android.jar this adds a dependency on android.test.base/stubs to ensure this code will continue to compile. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * samples/ApiDemos/tests/Android.mk Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because ApiDemosTests's will need them in order to compile once its classes are removed from the current SDK on which it currently depends. * samples/BrokenKeyDerivation/tests/Android.mk Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because BrokenKeyDerivationTests's will need them in order to compile once its classes are removed from the current SDK on which it currently depends. * samples/HelloActivity/tests/Android.mk Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because HelloActivityTests's will need them in order to compile once its classes are removed from the current SDK on which it currently depends. * samples/LunarLander/tests/Android.mk Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because LunarLanderTests's will need them in order to compile once its classes are removed from the current SDK on which it currently depends. * samples/SkeletonApp/tests/Android.mk Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because SkeletonAppTests's will need them in order to compile once its classes are removed from the current SDK on which it currently depends. * samples/Snake/tests/Android.mk Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because SnakeTests's will need them in order to compile once its classes are removed from the current SDK on which it currently depends. * samples/Vault/Android.mk Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because Vault's will need them in order to compile once its classes are removed from the current SDK on which it currently depends. Bug: 30188076 Test: make dist Change-Id: Id7fb558504706668a85bf840529f6cd075499d6a
Diffstat (limited to 'samples/ApiDemos')
-rw-r--r--samples/ApiDemos/tests/Android.mk2
1 files changed, 1 insertions, 1 deletions
diff --git a/samples/ApiDemos/tests/Android.mk b/samples/ApiDemos/tests/Android.mk
index 1e513686d..44d686946 100644
--- a/samples/ApiDemos/tests/Android.mk
+++ b/samples/ApiDemos/tests/Android.mk
@@ -4,7 +4,7 @@ include $(CLEAR_VARS)
# We only want this apk build for tests.
LOCAL_MODULE_TAGS := tests
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base.stubs
LOCAL_STATIC_JAVA_LIBRARIES := junit