diff options
| author | 2019-10-18 01:30:39 +0000 | |
|---|---|---|
| committer | 2019-10-18 01:30:39 +0000 | |
| commit | d091c6a67a45ecd06a783d0c2033d9b75d849168 (patch) | |
| tree | 117ff114bd076490449017688748b687df58d72f /java/androidmk.go | |
| parent | c5bba642f17068ea3f481e3fbcbd3a6ba54abac9 (diff) | |
| parent | f7487318accdf7b1e8dc9738c27c95fbef6426d8 (diff) | |
Merge "Support privleged app in APEX"
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 955f22b36..7927acff7 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -317,7 +317,7 @@ func (app *AndroidApp) AndroidMkEntries() android.AndroidMkEntries { entries.SetPath("LOCAL_FULL_MANIFEST_FILE", app.manifestPath) - entries.SetBoolIfTrue("LOCAL_PRIVILEGED_MODULE", Bool(app.appProperties.Privileged)) + entries.SetBoolIfTrue("LOCAL_PRIVILEGED_MODULE", app.Privileged()) entries.SetPath("LOCAL_CERTIFICATE", app.certificate.Pem) entries.AddStrings("LOCAL_OVERRIDES_PACKAGES", app.getOverriddenPackages()...) @@ -630,7 +630,7 @@ func (a *AndroidAppImport) AndroidMkEntries() android.AndroidMkEntries { Include: "$(BUILD_SYSTEM)/soong_app_prebuilt.mk", ExtraEntries: []android.AndroidMkExtraEntriesFunc{ func(entries *android.AndroidMkEntries) { - entries.SetBoolIfTrue("LOCAL_PRIVILEGED_MODULE", Bool(a.properties.Privileged)) + entries.SetBoolIfTrue("LOCAL_PRIVILEGED_MODULE", a.Privileged()) if a.certificate != nil { entries.SetPath("LOCAL_CERTIFICATE", a.certificate.Pem) } else { |