Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b826a2f2 authored by Paul Duffin's avatar Paul Duffin
Browse files

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
parent b6c6bdd1

java/testing.go

+0 −5
Original line number Diff line number Diff line
@@ -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,

		}