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

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

Remove the mention to the (APEX) manifest (`apex_manifest.json`) from
this field's documentation, as `Apex_name` is neither read from nor
written to that file.

Test: n/a
Change-Id: Ia0dfac4f35f1ea697f379bcb19dd11af8705a0a0
This commit is contained in:
Roland Levillain 2019-09-19 16:37:20 +01:00
parent 4e839ec3a5
commit 411c584cba
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. // If unspecified, a default one is automatically generated.
AndroidManifest *string `android:"path"` AndroidManifest *string `android:"path"`
// Canonical name of the APEX bundle in the manifest file. // Canonical name of the APEX bundle. Used to determine the path to the activated APEX on
// If unspecified, defaults to the value of name // device (/apex/<apex_name>).
// If unspecified, defaults to the value of name.
Apex_name *string Apex_name *string
// Determines the file contexts file for setting security context to each file in this APEX bundle. // 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, "\ninclude $(CLEAR_VARS)")
fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir) fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)
fmt.Fprintln(w, "LOCAL_MODULE :=", fi.moduleName+suffix) fmt.Fprintln(w, "LOCAL_MODULE :=", fi.moduleName+suffix)
// /apex/<name>/{lib|framework|...} // /apex/<apex_name>/{lib|framework|...}
pathWhenActivated := filepath.Join("$(PRODUCT_OUT)", "apex", pathWhenActivated := filepath.Join("$(PRODUCT_OUT)", "apex",
proptools.StringDefault(a.properties.Apex_name, name), fi.installDir) proptools.StringDefault(a.properties.Apex_name, name), fi.installDir)
if a.properties.Flattened && apexType.image() { if a.properties.Flattened && apexType.image() {