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
diff --git a/java/sdk.go b/java/sdk.go
index 9dfb38b..e01b730 100644
--- a/java/sdk.go
+++ b/java/sdk.go
@@ -45,9 +45,6 @@
// 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 @@
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 @@
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 @@
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":