From 3fb224521ade14584c0d44ccaa4b9e9053fae7cb Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Tue, 13 Mar 2018 16:06:03 +0900 Subject: 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) --- test-runner/Android.bp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'test-runner') diff --git a/test-runner/Android.bp b/test-runner/Android.bp index a2edb047d9de..9e95369ceca4 100644 --- a/test-runner/Android.bp +++ b/test-runner/Android.bp @@ -31,7 +31,7 @@ java_library { libs: [ "framework", "android.test.base", - "android.test.mock", + "android.test.mock.stubs", ], } @@ -48,7 +48,7 @@ java_library { libs: [ "framework", "android.test.base", - "android.test.mock", + "android.test.mock.stubs", "junit", ], } -- cgit v1.2.3