diff options
Diffstat (limited to 'java/sdk.go')
| -rw-r--r-- | java/sdk.go | 20 |
1 files changed, 19 insertions, 1 deletions
diff --git a/java/sdk.go b/java/sdk.go index 90b8fac28..76d36f6bd 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -38,12 +38,18 @@ var sdkFrameworkAidlPathKey = android.NewOnceKey("sdkFrameworkAidlPathKey") var apiFingerprintPathKey = android.NewOnceKey("apiFingerprintPathKey") type sdkContext interface { - // sdkVersion eturns the sdk_version property of the current module, or an empty string if it is not set. + // sdkVersion returns the sdk_version property of the current module, or an empty string if it is not set. sdkVersion() string // minSdkVersion returns the min_sdk_version property of the current module, or sdkVersion() if it is not set. minSdkVersion() string // targetSdkVersion returns the target_sdk_version property of the current module, or sdkVersion() if it is not set. targetSdkVersion() string + + // Temporarily provide access to the no_standard_libs property (where present). + noStandardLibs() bool + + // Temporarily provide access to the no_frameworks_libs property (where present). + noFrameworkLibs() bool } func sdkVersionOrDefault(ctx android.BaseModuleContext, v string) string { @@ -138,6 +144,10 @@ func decodeSdkDep(ctx android.BaseModuleContext, sdkContext sdkContext) sdkDep { useFiles: true, jars: android.Paths{jarPath.Path(), lambdaStubsPath}, aidl: android.OptionalPathForPath(aidlPath.Path()), + + // Pass values straight through for now to match previous behavior. + noStandardLibs: sdkContext.noStandardLibs(), + noFrameworksLibs: sdkContext.noFrameworkLibs(), } } @@ -148,6 +158,10 @@ func decodeSdkDep(ctx android.BaseModuleContext, sdkContext sdkContext) sdkDep { systemModules: m + "_system_modules", frameworkResModule: r, aidl: android.OptionalPathForPath(aidl), + + // Pass values straight through for now to match previous behavior. + noStandardLibs: sdkContext.noStandardLibs(), + noFrameworksLibs: sdkContext.noFrameworkLibs(), } if m == "core.current.stubs" { @@ -182,6 +196,10 @@ func decodeSdkDep(ctx android.BaseModuleContext, sdkContext sdkContext) sdkDep { return sdkDep{ useDefaultLibs: true, frameworkResModule: "framework-res", + + // Pass values straight through for now to match previous behavior. + noStandardLibs: sdkContext.noStandardLibs(), + noFrameworksLibs: sdkContext.noFrameworkLibs(), } case "current": return toModule("android_stubs_current", "framework-res", sdkFrameworkAidlPath(ctx)) |