From b826a2f269f9f0d134eac9f23af3144223568b8a Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 11 Jun 2019 14:47:19 +0100 Subject: [PATCH] Remove unnecessary use of sdk_version: "core_current" Modules that specify no_standard_libs: true should not specify the sdk_version property as well because the former supercedes the latter. Bug: 134566750 Test: m Change-Id: I1d8663dc3a25baf23a1b136c7f35cf130cd7543b --- java/testing.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/java/testing.go b/java/testing.go index e1b06a075..a9d4670fc 100644 --- a/java/testing.go +++ b/java/testing.go @@ -55,7 +55,6 @@ func GatherRequiredDepsForTest() string { name: "%s", srcs: ["a.java"], no_standard_libs: true, - sdk_version: "core_current", system_modules: "core-platform-api-stubs-system-modules", } `, extra) @@ -66,7 +65,6 @@ func GatherRequiredDepsForTest() string { name: "framework", srcs: ["a.java"], no_standard_libs: true, - sdk_version: "core_current", system_modules: "core-platform-api-stubs-system-modules", aidl: { export_include_dirs: ["framework/aidl"], @@ -82,7 +80,6 @@ func GatherRequiredDepsForTest() string { name: "android.hidl.base-V1.0-java", srcs: ["a.java"], no_standard_libs: true, - sdk_version: "core_current", system_modules: "core-platform-api-stubs-system-modules", installable: true, } @@ -91,7 +88,6 @@ func GatherRequiredDepsForTest() string { name: "android.hidl.manager-V1.0-java", srcs: ["a.java"], no_standard_libs: true, - sdk_version: "core_current", system_modules: "core-platform-api-stubs-system-modules", installable: true, } @@ -100,7 +96,6 @@ func GatherRequiredDepsForTest() string { name: "org.apache.http.legacy", srcs: ["a.java"], no_standard_libs: true, - sdk_version: "core_current", system_modules: "core-platform-api-stubs-system-modules", installable: true, }