diff options
author | Colin Cross <ccross@android.com> | 2017-08-29 16:02:06 -0700 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2017-08-31 13:48:52 -0700 |
commit | 76b5f0ca31ed182ed9cee26d49aafbb862093b64 (patch) | |
tree | 4ff0f6c7133400f2080c6d85e70c9a1937e07db8 /java/java.go | |
parent | 227d4369431f630e00dc976853e541c9ad6c4054 (diff) |
Rename no_standard_libraries to no_standard_libs
For consistency with libs and static_libs. And make it a *bool
so that it can be overriden when used in java_defaults modules.
Test: java_test.go
Change-Id: If0eaf5d5571dc6e565056d273b0addd960d6b33f
Diffstat (limited to 'java/java.go')
-rw-r--r-- | java/java.go | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/java/java.go b/java/java.go index d18656c68..ac484c54b 100644 --- a/java/java.go +++ b/java/java.go @@ -24,6 +24,7 @@ import ( "strings" "github.com/google/blueprint" + "github.com/google/blueprint/proptools" "android/soong/android" "android/soong/genrule" @@ -76,7 +77,7 @@ type CompilerProperties struct { // don't build against the default libraries (legacy-test, core-junit, // ext, and framework for device targets) - No_standard_libraries bool + No_standard_libs *bool // list of module-specific flags that will be used for javac compiles Javacflags []string `android:"arch_variant"` @@ -174,7 +175,7 @@ var ( ) func (j *Module) deps(ctx android.BottomUpMutatorContext) { - if !j.properties.No_standard_libraries { + if !proptools.Bool(j.properties.No_standard_libs) { if ctx.Device() { switch j.deviceProperties.Sdk_version { case "": |