StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Restrict bp2build of hdr library props" into main am: fa774656a1

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

Change-Id: Ib54542a42ddd136e6eca4e0449ccfb857215c1b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Liz Kammer
2023-10-17 14:25:04 +00:00
committed by Automerger Merge Worker
parent 0c8830aecf fa774656a1
commit fef6ec9f60
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bp2build/build_conversion.go
View File

@@ -830,11 +830,9 @@ func GenerateBazelTargets(ctx *CodegenContext, generateFilegroups bool) (convers
depLabels.Add(&depLabel) depLabels.Add(&depLabel)
} }
a := struct { a := struct {
Deps bazel.LabelListAttribute Deps bazel.LabelListAttribute
System_dynamic_deps bazel.LabelListAttribute
}{ }{
Deps: bazel.MakeLabelListAttribute(bazel.UniqueSortedBazelLabelList(depLabels)), Deps: bazel.MakeLabelListAttribute(bazel.UniqueSortedBazelLabelList(depLabels)),
System_dynamic_deps: bazel.MakeLabelListAttribute(bazel.MakeLabelList([]bazel.Label{})),
} }
ndkSysroot := bTarget{ ndkSysroot := bTarget{
targetName: "ndk_sysroot", targetName: "ndk_sysroot",

3
cc/library_headers.go
View File

@@ -122,8 +122,6 @@ type bazelCcLibraryHeadersAttributes struct {
Export_absolute_includes bazel.StringListAttribute Export_absolute_includes bazel.StringListAttribute
Export_system_includes bazel.StringListAttribute Export_system_includes bazel.StringListAttribute
Deps bazel.LabelListAttribute Deps bazel.LabelListAttribute
Implementation_deps bazel.LabelListAttribute
System_dynamic_deps bazel.LabelListAttribute
sdkAttributes sdkAttributes
} }
@@ -139,7 +137,6 @@ func libraryHeadersBp2Build(ctx android.Bp2buildMutatorContext, module *Module)
Export_absolute_includes: exportedIncludes.AbsoluteIncludes, Export_absolute_includes: exportedIncludes.AbsoluteIncludes,
Export_system_includes: exportedIncludes.SystemIncludes, Export_system_includes: exportedIncludes.SystemIncludes,
Deps: linkerAttrs.deps, Deps: linkerAttrs.deps,
System_dynamic_deps: linkerAttrs.systemDynamicDeps,
Hdrs: baseAttributes.hdrs, Hdrs: baseAttributes.hdrs,
sdkAttributes: bp2BuildParseSdkAttributes(module), sdkAttributes: bp2BuildParseSdkAttributes(module),
} }