StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support overrides for android_app"

Browse Source
This commit is contained in:
Jason Monk
2018-08-10 19:11:10 +00:00
committed by Gerrit Code Review
parent 280febfb14 d4122be915
commit fe295b45fc
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
java/androidmk.go
View File

@@ -232,6 +232,9 @@ func (app *AndroidApp) AndroidMk() android.AndroidMkData {
} }
fmt.Fprintln(w, "LOCAL_CERTIFICATE :=", app.certificate.pem.String()) fmt.Fprintln(w, "LOCAL_CERTIFICATE :=", app.certificate.pem.String())
if len(app.appProperties.Overrides) > 0 {
fmt.Fprintln(w, "LOCAL_OVERRIDES_PACKAGES := "+strings.Join(app.appProperties.Overrides, " "))
}
}, },
}, },
} }

7
java/app.go
View File

@@ -51,6 +51,13 @@ type appProperties struct {
// list of resource labels to generate individual resource packages // list of resource labels to generate individual resource packages
Package_splits []string Package_splits []string
// Names of modules to be overridden. Listed modules can only be other binaries
// (in Make or Soong).
// This does not completely prevent installation of the overridden binaries, but if both
// binaries would be installed by default (in PRODUCT_PACKAGES) the other binary will be removed
// from PRODUCT_PACKAGES.
Overrides []string
} }
type AndroidApp struct { type AndroidApp struct {