Use core_current instead of current and remove no_framework_libs:true
The modules do not use any frameworks classes so can be switched to use
core_current instead. Also removes no_framework_libs:true as that is
superfluous.
Bug: 134566750
Test: m droid
Change-Id: Ib1b9373d1f4af2d11849ca95b68c5d157b934123
diff --git a/Android.bp b/Android.bp
index 07ba414..ee63560 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,7 +40,7 @@
// Build dispatcher for Dexmaker's inline MockMaker
java_library_static {
name: "dexmaker-inline-mockmaker-dispatcher",
- sdk_version: "current",
+ sdk_version: "core_current",
srcs: ["dexmaker-mockito-inline-dispatcher/src/main/java/**/*.java"],
}
@@ -145,7 +145,6 @@
// methods.
java_library_static {
name: "mockito-target",
- no_framework_libs: true,
static_libs: [
"mockito-target-minus-junit4",
"junit",
@@ -156,7 +155,6 @@
// Same as mockito-target but does not bundle junit
java_library_static {
name: "mockito-target-minus-junit4",
- no_framework_libs: true,
static_libs: [
"mockito",
"dexmaker",
@@ -174,7 +172,6 @@
// Project depending on this also need to depend on the static JNI library libdexmakerjvmtiagent
java_library_static {
name: "mockito-target-inline",
- no_framework_libs: true,
static_libs: [
"mockito-target-inline-minus-junit4",
"junit",
@@ -185,7 +182,6 @@
// Same as mockito-target-inline but does not bundle junit
java_library_static {
name: "mockito-target-inline-minus-junit4",
- no_framework_libs: true,
static_libs: [
"mockito",
"dexmaker",
@@ -204,7 +200,6 @@
// libdexmakerjvmtiagent
java_library_static {
name: "mockito-target-extended",
- no_framework_libs: true,
static_libs: [
"mockito-target-extended-minus-junit4",
"junit",
@@ -215,7 +210,6 @@
// Same as mockito-target-extended but does not bundle junit
java_library_static {
name: "mockito-target-extended-minus-junit4",
- no_framework_libs: true,
static_libs: [
"mockito",
"dexmaker",
