diff options
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | data/etc/platform.xml | 6 | ||||
| -rw-r--r-- | test-legacy/Android.bp | 2 | ||||
| -rw-r--r-- | test-mock/Android.bp | 16 |
4 files changed, 20 insertions, 5 deletions
diff --git a/Android.bp b/Android.bp index ab2bd9d98a6b..720b0453ac9d 100644 --- a/Android.bp +++ b/Android.bp @@ -1256,7 +1256,6 @@ stubs_defaults { "ext", "framework", "voip-common", - "android.test.mock.impl", ], local_sourcepaths: frameworks_base_subdirs, installable: false, diff --git a/data/etc/platform.xml b/data/etc/platform.xml index 73c10d238a60..afe791344f7b 100644 --- a/data/etc/platform.xml +++ b/data/etc/platform.xml @@ -182,11 +182,11 @@ code to link against. --> <library name="android.test.base" - file="/system/framework/android.test.base.impl.jar" /> + file="/system/framework/android.test.base.jar" /> <library name="android.test.mock" - file="/system/framework/android.test.mock.impl.jar" /> + file="/system/framework/android.test.mock.jar" /> <library name="android.test.runner" - file="/system/framework/android.test.runner.impl.jar" /> + file="/system/framework/android.test.runner.jar" /> <!-- In BOOT_JARS historically, and now added to legacy applications. --> <library name="android.hidl.base-V1.0-java" diff --git a/test-legacy/Android.bp b/test-legacy/Android.bp index 833c714f07b0..a69f422b3bdb 100644 --- a/test-legacy/Android.bp +++ b/test-legacy/Android.bp @@ -25,7 +25,7 @@ java_library_static { static_libs: [ "android.test.base-minus-junit", "android.test.runner-minus-junit", - "android.test.mock.impl", + "android.test.mock_static", ], no_framework_libs: true, diff --git a/test-mock/Android.bp b/test-mock/Android.bp index e1d6e01d6d06..43b765d8b783 100644 --- a/test-mock/Android.bp +++ b/test-mock/Android.bp @@ -30,3 +30,19 @@ java_sdk_library { srcs_lib_whitelist_pkgs: ["android"], compile_dex: true, } + +// Build the android.test.mock_static library +// ========================================== +// This is only intended for inclusion in the legacy-android-test. +// Must not be used elewhere. +java_library_static { + name: "android.test.mock_static", + + java_version: "1.8", + srcs: ["src/**/*.java"], + + no_framework_libs: true, + libs: [ + "framework", + ], +} |