diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-09-01 22:21:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-09-01 22:21:25 +0000 |
| commit | 5ade8a859d082efae0d0f2c8a645bd6c42b81499 (patch) | |
| tree | 6e2b4094d4c457b9eef18c939230c5615ab2103f | |
| parent | b0579d70b867e6480fb041965636806feac01df3 (diff) | |
| parent | 7f9036c89bca2f4b246edd9fdde005afc8051e24 (diff) | |
| download | android_build_soong-5ade8a859d082efae0d0f2c8a645bd6c42b81499.tar.gz android_build_soong-5ade8a859d082efae0d0f2c8a645bd6c42b81499.tar.bz2 android_build_soong-5ade8a859d082efae0d0f2c8a645bd6c42b81499.zip | |
Merge changes I7b6c6ce0,If0eaf5d5
* changes:
Allow java modules to use filegroups
Rename no_standard_libraries to no_standard_libs
| -rw-r--r-- | androidmk/cmd/androidmk/android.go | 2 | ||||
| -rw-r--r-- | java/app.go | 3 | ||||
| -rw-r--r-- | java/java.go | 7 | ||||
| -rw-r--r-- | java/java_test.go | 2 |
4 files changed, 9 insertions, 5 deletions
diff --git a/androidmk/cmd/androidmk/android.go b/androidmk/cmd/androidmk/android.go index 19ed4ecf..ee722e01 100644 --- a/androidmk/cmd/androidmk/android.go +++ b/androidmk/cmd/androidmk/android.go @@ -123,7 +123,7 @@ func init() { "LOCAL_NO_CRT": "nocrt", "LOCAL_ALLOW_UNDEFINED_SYMBOLS": "allow_undefined_symbols", "LOCAL_RTTI_FLAG": "rtti", - "LOCAL_NO_STANDARD_LIBRARIES": "no_standard_libraries", + "LOCAL_NO_STANDARD_LIBRARIES": "no_standard_libs", "LOCAL_PACK_MODULE_RELOCATIONS": "pack_relocations", "LOCAL_TIDY": "tidy", "LOCAL_PROPRIETARY_MODULE": "proprietary", diff --git a/java/app.go b/java/app.go index a0c4912f..e6b91a73 100644 --- a/java/app.go +++ b/java/app.go @@ -21,6 +21,7 @@ import ( "strings" "github.com/google/blueprint" + "github.com/google/blueprint/proptools" "android/soong/android" ) @@ -68,7 +69,7 @@ type AndroidApp struct { func (a *AndroidApp) DepsMutator(ctx android.BottomUpMutatorContext) { a.Module.deps(ctx) - if !a.properties.No_standard_libraries { + if !proptools.Bool(a.properties.No_standard_libs) { switch a.deviceProperties.Sdk_version { // TODO: Res_sdk_version? case "current", "system_current", "": ctx.AddDependency(ctx.Module(), frameworkResTag, "framework-res") diff --git a/java/java.go b/java/java.go index d18656c6..a8093e7b 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 "": @@ -199,6 +200,8 @@ func (j *Module) deps(ctx android.BottomUpMutatorContext) { } ctx.AddDependency(ctx.Module(), libTag, j.properties.Libs...) ctx.AddDependency(ctx.Module(), staticLibTag, j.properties.Static_libs...) + + android.ExtractSourcesDeps(ctx, j.properties.Srcs) } func (j *Module) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.OptionalPath, diff --git a/java/java_test.go b/java/java_test.go index d73ae0bd..6d9445b6 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -69,7 +69,7 @@ func testJava(t *testing.T, bp string) *android.TestContext { bp += fmt.Sprintf(` java_library { name: "%s", - no_standard_libraries: true, + no_standard_libs: true, } `, extra) } |