diff options
| author | Jiyong Park <jiyong@google.com> | 2018-03-13 16:06:03 +0900 |
|---|---|---|
| committer | Jiyong Park <jiyong@google.com> | 2018-03-30 14:57:11 +0900 |
| commit | 6964add112adadfac4c59dddce1b21beeb570cfe (patch) | |
| tree | f3639e891f96aa2e79caf851687e71fee77c621c /test-runner | |
| parent | 293eb1206981518eeaeced321708ede1ccf2cec9 (diff) | |
Make android.test.mock.stubs in Android.bp
Stubs libraries android.test.mock.stubs and
android.test.mock.stubs-system are now built in Android.bp.
(Note that API check and update are still done in Android.mk)
As a good side effect, this allows android.test.runner[-minus-junit]
libraries (that are defined in Android.bp) to be built with the
android.test.mock.stubs instead of the runtime library
android.test.mock. This in turn allows us to prevent java:sdk ->
java:platform dependency also in Soong, because the runner libraries
were the only violators.
Bug: 73829976
Test: m -j android.test.mock.stubs android.test.mock.stubs-system
Test: m -j checkapi
Test: m -j update-api
Merged-In: I830a8eb13aa43b9aa4c8394f3c2fd91ee18b1f85
Change-Id: I830a8eb13aa43b9aa4c8394f3c2fd91ee18b1f85
(cherry picked from commit e649b8066c3385ba0b667a79d378402b15ef3127)
Diffstat (limited to 'test-runner')
| -rw-r--r-- | test-runner/Android.bp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test-runner/Android.bp b/test-runner/Android.bp index 1cce2c3cc32c..91929b1b3106 100644 --- a/test-runner/Android.bp +++ b/test-runner/Android.bp @@ -30,7 +30,7 @@ java_library { sdk_version: "current", libs: [ "android.test.base", - "android.test.mock", + "android.test.mock.stubs", ], } @@ -46,7 +46,7 @@ java_library { sdk_version: "current", libs: [ "android.test.base", - "android.test.mock", + "android.test.mock.stubs", "junit", ], } |