Merge changes I9f68c887,Ic18f2dc5

am: b6ffb625eb

Change-Id: I1a325caecf48547b15ad754b5d90e0ca2c1775bb
This commit is contained in:
android-build-prod (mdb)
2018-04-30 19:04:24 -07:00
committed by android-build-merger
2 changed files with 9 additions and 1 deletions

View File

@@ -32,6 +32,14 @@ all Android.bp files.
For a list of valid module types and their properties see
[$OUT_DIR/soong/.bootstrap/docs/soong_build.html](https://go/Android.bp).
### Globs
Properties that take a list of files can also take glob patterns. Glob
patterns can contain the normal Unix wildcard `*`, for example "*.java". Glob
patterns can also contain a single `**` wildcard as a path element, which will
match zero or more path elements. For example, `java/**/*.java` will match
`java/Main.java` and `java/com/android/Main.java`.
### Variables
An Android.bp file may contain top-level variable assignments:

View File

@@ -709,7 +709,7 @@ func (library *libraryDecorator) buildShared() bool {
}
func (library *libraryDecorator) getWholeStaticMissingDeps() []string {
return library.wholeStaticMissingDeps
return append([]string(nil), library.wholeStaticMissingDeps...)
}
func (library *libraryDecorator) objs() Objects {