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

Enforce the legacy core/platform API restriction.

Browse Source 
This change silently decides whether modules which depend on either
sdkPrivate or sdkCorePlatform get the legacy or the stable version of
the core/platform API, based on whether the module's name is on a
hard-coded list or not.

Test: m java
Test: make a target from the list when its entry is commented out, which correctly fails
Bug: 157640067
Change-Id: I15e5a6c2f07e73718803501d705de0d7ab9bec90
This commit is contained in:
Pete Gillin
2020-07-09 18:03:41 +01:00
parent f9828bf665
commit c0f4373106
7 changed files with 291 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
java/testing.go
View File

@@ -135,7 +135,7 @@ func GatherRequiredDepsForTest() string {
name: "%s",
srcs: ["a.java"],
sdk_version: "none",
system_modules: "legacy-core-platform-api-stubs-system-modules",
system_modules: "stable-core-platform-api-stubs-system-modules",
}
`, extra)
}
@@ -145,7 +145,7 @@ func GatherRequiredDepsForTest() string {
name: "framework",
srcs: ["a.java"],
sdk_version: "none",
system_modules: "legacy-core-platform-api-stubs-system-modules",
system_modules: "stable-core-platform-api-stubs-system-modules",
aidl: {
export_include_dirs: ["framework/aidl"],
},
@@ -160,7 +160,7 @@ func GatherRequiredDepsForTest() string {
name: "android.hidl.base-V1.0-java",
srcs: ["a.java"],
sdk_version: "none",
system_modules: "legacy-core-platform-api-stubs-system-modules",
system_modules: "stable-core-platform-api-stubs-system-modules",
installable: true,
}
@@ -168,7 +168,7 @@ func GatherRequiredDepsForTest() string {
name: "android.hidl.manager-V1.0-java",
srcs: ["a.java"],
sdk_version: "none",
system_modules: "legacy-core-platform-api-stubs-system-modules",
system_modules: "stable-core-platform-api-stubs-system-modules",
installable: true,
}
@@ -176,7 +176,7 @@ func GatherRequiredDepsForTest() string {
name: "org.apache.http.legacy",
srcs: ["a.java"],
sdk_version: "none",
system_modules: "legacy-core-platform-api-stubs-system-modules",
system_modules: "stable-core-platform-api-stubs-system-modules",
installable: true,
}
@@ -184,7 +184,7 @@ func GatherRequiredDepsForTest() string {
name: "android.test.base",
srcs: ["a.java"],
sdk_version: "none",
system_modules: "legacy-core-platform-api-stubs-system-modules",
system_modules: "stable-core-platform-api-stubs-system-modules",
installable: true,
}
@@ -192,7 +192,7 @@ func GatherRequiredDepsForTest() string {
name: "android.test.mock",
srcs: ["a.java"],
sdk_version: "none",
system_modules: "legacy-core-platform-api-stubs-system-modules",
system_modules: "stable-core-platform-api-stubs-system-modules",
installable: true,
}
`