diff options
| author | 2019-06-11 13:40:47 +0100 | |
|---|---|---|
| committer | 2019-06-17 11:21:39 +0100 | |
| commit | a3d0986cfc352eb784d659825ff93772963dcbd5 (patch) | |
| tree | 8494c7f0a31188a53c7cc5e0cb4d72763f698489 /java/testing.go | |
| parent | 301ba52886bcfdc8d019ad1af2a391d895cd8f07 (diff) | |
Remove the no_standard_libs property
Corrects an error message that refers to no_standard_libs.
Removes any tests that use no_standard_libs:true where possible as
there are duplicate tests for sdk_version:"none". Otherwise, switches
them over to use sdk_version:"none".
The androidmk mapping from LOCAL_NO_STANDARD_LIBRARIES to
no_standard_libs has also been removed. There was little point in
updating the tool to map it through to sdk_version:"none" as there are
only a couple of places where it is used, in art's test running mk
targets and in some unbundled packages to work around some limitation
in .mk based build.
Bug: 134566750
Test: m droid
Change-Id: I6413c9b1fe3e63b93753a6a017d2981e32b7e013
Diffstat (limited to 'java/testing.go')
| -rw-r--r-- | java/testing.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/testing.go b/java/testing.go index 7cd187164..18fd30af2 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"], @@ -79,7 +79,7 @@ func GatherRequiredDepsForTest() string { 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, } |