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 "Refine sysprop_library header rules" am: 4c4de0edc3 am: 1ee0c0c4ba am: b904808ac6 

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcd813e9ae13863a4a5118130da416c30b6ef62c
This commit is contained in:
Inseob Kim 2021-01-20 02:16:09 +00:00 committed by Automerger Merge Worker
parent 6761a5eeae b904808ac6
commit 6a993709d4
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cc/library.go
View File

@ -1318,17 +1318,13 @@ func (library *libraryDecorator) link(ctx ModuleContext,
if library.baseCompiler.hasSrcExt(".sysprop") {
dir := android.PathForModuleGen(ctx, "sysprop", "include")
if library.Properties.Sysprop.Platform != nil {
isClientProduct := ctx.ProductSpecific() && !ctx.useVndk()
isClientVendor := ctx.useVndk()
isOwnerPlatform := Bool(library.Properties.Sysprop.Platform)
// If the owner is different from the user, expose public header. That is,
// 1) if the user is product (as owner can only be platform / vendor)
// 2) if one is platform and the other is vendor
// Exceptions are ramdisk and recovery. They are not enforced at all. So
// they always use internal header.
if !ctx.inRamdisk() && !ctx.inVendorRamdisk() && !ctx.inRecovery() &&
(isClientProduct || (isOwnerPlatform == isClientVendor)) {
// 2) if the owner is platform and the client is vendor
// We don't care Platform -> Vendor dependency as it's already forbidden.
if ctx.Device() && (ctx.ProductSpecific() || (isOwnerPlatform && ctx.inVendor())) {
dir = android.PathForModuleGen(ctx, "sysprop/public", "include")
}
}