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 "Do not install init.rc for (vendor_)ramdisk variants." am: 4396c01aff 

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1516202

Change-Id: I586cc3fbd5bab032ab8477f809e3c7b1f141f7a5
This commit is contained in:
Yifan Hong 2020-12-03 22:29:44 +00:00 committed by Automerger Merge Worker
parent 440ad728a4 4396c01aff
commit d2694d71e0
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
android/androidmk.go
View File

@ -499,7 +499,9 @@ func (a *AndroidMkEntries) fillInEntries(config Config, bpPath string, mod bluep
}
}
a.AddStrings("LOCAL_INIT_RC", amod.commonProperties.Init_rc...)
if !amod.InRamdisk() && !amod.InVendorRamdisk() {
a.AddStrings("LOCAL_INIT_RC", amod.commonProperties.Init_rc...)
}
a.AddStrings("LOCAL_VINTF_FRAGMENTS", amod.commonProperties.Vintf_fragments...)
a.SetBoolIfTrue("LOCAL_PROPRIETARY_MODULE", Bool(amod.commonProperties.Proprietary))
if Bool(amod.commonProperties.Vendor) || Bool(amod.commonProperties.Soc_specific) {