diff options
| author | 2019-06-17 21:24:33 +0000 | |
|---|---|---|
| committer | 2019-06-17 21:24:33 +0000 | |
| commit | 33ee25466f752420ba42f899457b37f402459005 (patch) | |
| tree | b985f857c29e0cee58c6b1a5f07e8ccd744890cb /java/testing.go | |
| parent | 2deb017c04d1982e39dcaef7b96c524c6f493388 (diff) | |
| parent | 50c217c744901bf8a2408f110840bf22225ae361 (diff) | |
Merge changes I42cb181f,I6413c9b1
* changes:
Add sdk_version:"core_platform" to replace no_framework_libs:true
Remove the no_standard_libs property
Diffstat (limited to 'java/testing.go')
| -rw-r--r-- | java/testing.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/testing.go b/java/testing.go index 7cd187164..5d116a787 100644 --- a/java/testing.go +++ b/java/testing.go @@ -64,7 +64,7 @@ func GatherRequiredDepsForTest() string { java_library { name: "framework", srcs: ["a.java"], - no_standard_libs: true, + sdk_version: "none", system_modules: "core-platform-api-stubs-system-modules", aidl: { export_include_dirs: ["framework/aidl"], @@ -73,13 +73,13 @@ func GatherRequiredDepsForTest() string { android_app { name: "framework-res", - no_framework_libs: true, + sdk_version: "core_platform", } java_library { name: "android.hidl.base-V1.0-java", srcs: ["a.java"], - no_standard_libs: true, + sdk_version: "none", system_modules: "core-platform-api-stubs-system-modules", installable: true, } @@ -87,7 +87,7 @@ func GatherRequiredDepsForTest() string { java_library { name: "android.hidl.manager-V1.0-java", srcs: ["a.java"], - no_standard_libs: true, + sdk_version: "none", system_modules: "core-platform-api-stubs-system-modules", installable: true, } @@ -95,7 +95,7 @@ func GatherRequiredDepsForTest() string { java_library { name: "org.apache.http.legacy", srcs: ["a.java"], - no_standard_libs: true, + sdk_version: "none", system_modules: "core-platform-api-stubs-system-modules", installable: true, } |