diff options
| author | 2019-06-11 13:40:47 +0100 | |
|---|---|---|
| committer | 2019-06-17 11:21:39 +0100 | |
| commit | a3d0986cfc352eb784d659825ff93772963dcbd5 (patch) | |
| tree | 8494c7f0a31188a53c7cc5e0cb4d72763f698489 /java/sdk.go | |
| parent | 301ba52886bcfdc8d019ad1af2a391d895cd8f07 (diff) | |
Remove the no_standard_libs property
Corrects an error message that refers to no_standard_libs.
Removes any tests that use no_standard_libs:true where possible as
there are duplicate tests for sdk_version:"none". Otherwise, switches
them over to use sdk_version:"none".
The androidmk mapping from LOCAL_NO_STANDARD_LIBRARIES to
no_standard_libs has also been removed. There was little point in
updating the tool to map it through to sdk_version:"none" as there are
only a couple of places where it is used, in art's test running mk
targets and in some unbundled packages to work around some limitation
in .mk based build.
Bug: 134566750
Test: m droid
Change-Id: I6413c9b1fe3e63b93753a6a017d2981e32b7e013
Diffstat (limited to 'java/sdk.go')
| -rw-r--r-- | java/sdk.go | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/java/sdk.go b/java/sdk.go index 9dfb38bf4..e01b730df 100644 --- a/java/sdk.go +++ b/java/sdk.go @@ -45,9 +45,6 @@ type sdkContext interface { // 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 } @@ -145,8 +142,7 @@ func decodeSdkDep(ctx android.BaseModuleContext, sdkContext sdkContext) sdkDep { jars: android.Paths{jarPath.Path(), lambdaStubsPath}, aidl: android.OptionalPathForPath(aidlPath.Path()), - // Pass values straight through for now to match previous behavior. - noStandardLibs: sdkContext.noStandardLibs(), + // Pass value straight through for now to match previous behavior. noFrameworksLibs: sdkContext.noFrameworkLibs(), } } @@ -159,8 +155,7 @@ func decodeSdkDep(ctx android.BaseModuleContext, sdkContext sdkContext) sdkDep { frameworkResModule: r, aidl: android.OptionalPathForPath(aidl), - // Pass values straight through for now to match previous behavior. - noStandardLibs: sdkContext.noStandardLibs(), + // Pass value straight through for now to match previous behavior. noFrameworksLibs: sdkContext.noFrameworkLibs(), } @@ -197,8 +192,7 @@ func decodeSdkDep(ctx android.BaseModuleContext, sdkContext sdkContext) sdkDep { useDefaultLibs: true, frameworkResModule: "framework-res", - // Pass values straight through for now to match previous behavior. - noStandardLibs: sdkContext.noStandardLibs(), + // Pass value straight through for now to match previous behavior. noFrameworksLibs: sdkContext.noFrameworkLibs(), } case "none": |