openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Fix documentation of field `soong.apex.apexBundleProperties.Apex_name`." 

am: 50aee7c375

Change-Id: I011f653685e7d58c66cbe7df6536368aa9e12e70
This commit is contained in:
Roland Levillain 2019-09-20 08:13:38 -07:00 committed by android-build-merger
parent 46c91e3e6a 50aee7c375
commit 9d380cbcc6
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
apex/apex.go
View File

@ -339,8 +339,9 @@ type apexBundleProperties struct {
// If unspecified, a default one is automatically generated.
AndroidManifest *string `android:"path"`
// Canonical name of the APEX bundle in the manifest file.
// If unspecified, defaults to the value of name
// Canonical name of the APEX bundle. Used to determine the path to the activated APEX on
// device (/apex/<apex_name>).
// If unspecified, defaults to the value of name.
Apex_name *string
// Determines the file contexts file for setting security context to each file in this APEX bundle.
@ -1558,7 +1559,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, name, moduleDir string, apex
fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)")
fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)
fmt.Fprintln(w, "LOCAL_MODULE :=", fi.moduleName+suffix)
// /apex/<name>/{lib|framework|...}
// /apex/<apex_name>/{lib|framework|...}
pathWhenActivated := filepath.Join("$(PRODUCT_OUT)", "apex",
proptools.StringDefault(a.properties.Apex_name, name), fi.installDir)
if a.properties.Flattened && apexType.image() {