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

Remove unnecessary symlink for non-flattend APEXes am: 7aa3f76696 am: 3afe2c13a0 am: 635e0adf7c 

Change-Id: I8d166396df0a743a6df5539d987638b187aca435
This commit is contained in:
Automerger Merge Worker 2020-01-28 13:27:44 +00:00
parent fffc24fbaf 635e0adf7c
commit 32c27cfdc2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apex/androidmk.go
View File

@ -177,7 +177,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexName, moduleDir string)
fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_cc_prebuilt.mk")
} else {
fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.builtFile.Base())
if fi.builtFile == a.manifestPbOut {
if fi.builtFile == a.manifestPbOut && apexType == flattenedApex {
if a.primaryApexType {
// Make apex_manifest.pb module for this APEX to override all other
// modules in the APEXes being overridden by this APEX
@ -187,7 +187,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexName, moduleDir string)
}
fmt.Fprintln(w, "LOCAL_OVERRIDES_MODULES :=", strings.Join(patterns, " "))
if apexType == flattenedApex && len(a.compatSymlinks) > 0 {
if len(a.compatSymlinks) > 0 {
// For flattened apexes, compat symlinks are attached to apex_manifest.json which is guaranteed for every apex
postInstallCommands = append(postInstallCommands, a.compatSymlinks...)
}