StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Split the core/platform API into stable and legacy versions.

Browse Source 
For now, everything outside libcore still uses the legacy version.

Test: treehugger
Bug: 157640067
Change-Id: If5234e9ee533ff537926801a0af045d36b1caf01
This commit is contained in:
Pete Gillin
2020-06-02 15:59:45 +01:00
parent 8a624337b3
commit 1f41dbff64
6 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/testing.go
View File

@@ -173,7 +173,8 @@ func GatherRequiredDepsForTest() string {
"android_module_lib_stubs_current",
"android_system_server_stubs_current",
"core.current.stubs",
"core.platform.api.stubs",
"legacy.core.platform.api.stubs",
"stable.core.platform.api.stubs",
"kotlin-stdlib",
"kotlin-stdlib-jdk7",
"kotlin-stdlib-jdk8",
@@ -186,7 +187,7 @@ func GatherRequiredDepsForTest() string {
name: "%s",
srcs: ["a.java"],
sdk_version: "none",
system_modules: "core-platform-api-stubs-system-modules",
system_modules: "legacy-core-platform-api-stubs-system-modules",
}
`, extra)
}
@@ -196,7 +197,7 @@ func GatherRequiredDepsForTest() string {
name: "framework",
srcs: ["a.java"],
sdk_version: "none",
system_modules: "core-platform-api-stubs-system-modules",
system_modules: "legacy-core-platform-api-stubs-system-modules",
aidl: {
export_include_dirs: ["framework/aidl"],
},
@@ -211,7 +212,7 @@ func GatherRequiredDepsForTest() string {
name: "android.hidl.base-V1.0-java",
srcs: ["a.java"],
sdk_version: "none",
system_modules: "core-platform-api-stubs-system-modules",
system_modules: "legacy-core-platform-api-stubs-system-modules",
installable: true,
}
@@ -219,7 +220,7 @@ func GatherRequiredDepsForTest() string {
name: "android.hidl.manager-V1.0-java",
srcs: ["a.java"],
sdk_version: "none",
system_modules: "core-platform-api-stubs-system-modules",
system_modules: "legacy-core-platform-api-stubs-system-modules",
installable: true,
}
@@ -227,7 +228,7 @@ func GatherRequiredDepsForTest() string {
name: "org.apache.http.legacy",
srcs: ["a.java"],
sdk_version: "none",
system_modules: "core-platform-api-stubs-system-modules",
system_modules: "legacy-core-platform-api-stubs-system-modules",
installable: true,
}
@@ -235,7 +236,7 @@ func GatherRequiredDepsForTest() string {
name: "android.test.base",
srcs: ["a.java"],
sdk_version: "none",
system_modules: "core-platform-api-stubs-system-modules",
system_modules: "legacy-core-platform-api-stubs-system-modules",
installable: true,
}
@@ -243,14 +244,14 @@ func GatherRequiredDepsForTest() string {
name: "android.test.mock",
srcs: ["a.java"],
sdk_version: "none",
system_modules: "core-platform-api-stubs-system-modules",
system_modules: "legacy-core-platform-api-stubs-system-modules",
installable: true,
}
`
systemModules := []string{
"core-current-stubs-system-modules",
"core-platform-api-stubs-system-modules",
"legacy-core-platform-api-stubs-system-modules",
}
for _, extra := range systemModules {