From 5c2f963a1dd45214b9ce7e9baa3a1b0e5ef14aca Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Wed, 12 Jun 2019 14:21:31 +0100 Subject: Remove the no_framework_libs property Corrects an error message that refers to no_framework_libs. Removes any tests that use no_framework_libs:true where possible as there are duplicate tests for sdk_version:"core_platform". Otherwise, switches them over to use sdk_version:"core_platform". Bug: 134566750 Test: m droid Change-Id: I41abe1a49f5c744e3393ca9cdf0c41888f810c9f --- java/java.go | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'java/java.go') diff --git a/java/java.go b/java/java.go index a2e9ab023..bf80cedee 100644 --- a/java/java.go +++ b/java/java.go @@ -82,9 +82,6 @@ type CompilerProperties struct { // list of files that should be excluded from java_resources and java_resource_dirs Exclude_java_resources []string `android:"path,arch_variant"` - // don't build against the framework libraries (ext, and framework for device targets) - No_framework_libs *bool - // list of module-specific flags that will be used for javac compiles Javacflags []string `android:"arch_variant"` @@ -482,10 +479,6 @@ func (j *Module) targetSdkVersion() string { return j.sdkVersion() } -func (j *Module) noFrameworkLibs() bool { - return Bool(j.properties.No_framework_libs) -} - func (j *Module) deps(ctx android.BottomUpMutatorContext) { if ctx.Device() { sdkDep := decodeSdkDep(ctx, sdkContext(j)) @@ -506,7 +499,7 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { } } else if j.deviceProperties.System_modules == nil { ctx.PropertyErrorf("sdk_version", - `system_modules is required to be set when sdk_version is "none", did you mean no_framework_libs?`) + `system_modules is required to be set when sdk_version is "none", did you mean "core_platform"`) } else if *j.deviceProperties.System_modules != "none" { ctx.AddVariationDependencies(nil, systemModulesTag, *j.deviceProperties.System_modules) } -- cgit v1.2.3-59-g8ed1b