Change the impl lib name of java_sdk_library

The impl lib name of java_sdk_library is changed to {module_name}.jar
instead of {module_name}.impl.jar
android.test.mock.impl is removed from stubs_defaults.
RepetitiveTest class is added to public API in android.test.base

Bug: 110404779
Test: m -j
Change-Id: I5dd7f3a28bc22136b4e921de3eb5a3e77e5fc75f
Merged-In: I5dd7f3a28bc22136b4e921de3eb5a3e77e5fc75f
(cherry picked from commit b7540bf1a3)
This commit is contained in:
Sundong Ahn
2018-11-08 19:06:45 +09:00
parent be8881da3b
commit f8732bb2db
4 changed files with 20 additions and 5 deletions

View File

@@ -1256,7 +1256,6 @@ stubs_defaults {
"ext",
"framework",
"voip-common",
"android.test.mock.impl",
],
local_sourcepaths: frameworks_base_subdirs,
installable: false,

View File

@@ -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"

View File

@@ -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,

View File

@@ -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",
],
}