diff options
| author | 2020-07-09 18:03:41 +0100 | |
|---|---|---|
| committer | 2020-07-23 09:06:52 +0100 | |
| commit | 84c3807b9929e221085f76a78dea920a0b500d42 (patch) | |
| tree | 8ccee440f76a8ce6cca7f4ccfb4e18fef99582d8 /java/sdk.go | |
| parent | 0bcda81dd540fe78ffe5cf19da8e92a56133d7df (diff) | |
Enforce the legacy core/platform API restriction.
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
Merged-In: I15e5a6c2f07e73718803501d705de0d7ab9bec90
Merged-In: Iaa97ddaa015e8079fcb3426585c5101c7ec9e22a
(cherry picked from commit c0f4373106d6c205d11e3bbd61085736de7ec2df)
Diffstat (limited to 'java/sdk.go')
| -rw-r--r-- | java/sdk.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/sdk.go b/java/sdk.go index 6564f6d28..6e67a13cd 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -413,8 +413,8 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep case sdkPrivate: return sdkDep{ useModule: true, - systemModules: config.LegacyCorePlatformSystemModules, - bootclasspath: config.LegacyCorePlatformBootclasspathLibraries, + systemModules: corePlatformSystemModules(ctx), + bootclasspath: corePlatformBootclasspathLibraries(ctx), classpath: config.FrameworkLibraries, frameworkResModule: "framework-res", } @@ -438,8 +438,8 @@ func decodeSdkDep(ctx android.EarlyModuleContext, sdkContext sdkContext) sdkDep case sdkCorePlatform: return sdkDep{ useModule: true, - systemModules: config.LegacyCorePlatformSystemModules, - bootclasspath: config.LegacyCorePlatformBootclasspathLibraries, + systemModules: corePlatformSystemModules(ctx), + bootclasspath: corePlatformBootclasspathLibraries(ctx), noFrameworksLibs: true, } case sdkPublic: |