Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fef6ec9f authored by Liz Kammer's avatar Liz Kammer Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: Ib54542a42ddd136e6eca4e0449ccfb857215c1b2
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 0c8830ae fa774656

bp2build/build_conversion.go

+2 −4
Original line number Diff line number Diff line
@@ -831,10 +831,8 @@ func GenerateBazelTargets(ctx *CodegenContext, generateFilegroups bool) (convers 
		}

		a := struct {

			Deps bazel.LabelListAttribute

			System_dynamic_deps bazel.LabelListAttribute

		}{

			Deps: bazel.MakeLabelListAttribute(bazel.UniqueSortedBazelLabelList(depLabels)),

			System_dynamic_deps: bazel.MakeLabelListAttribute(bazel.MakeLabelList([]bazel.Label{})),

		}

		ndkSysroot := bTarget{

			targetName:            "ndk_sysroot",

cc/library_headers.go

+0 −3
Original line number Diff line number Diff line
@@ -122,8 +122,6 @@ type bazelCcLibraryHeadersAttributes struct { 
	Export_absolute_includes bazel.StringListAttribute

	Export_system_includes   bazel.StringListAttribute

	Deps                     bazel.LabelListAttribute

	Implementation_deps      bazel.LabelListAttribute

	System_dynamic_deps      bazel.LabelListAttribute

	sdkAttributes

}
@@ -139,7 +137,6 @@ func libraryHeadersBp2Build(ctx android.Bp2buildMutatorContext, module *Module) 
		Export_absolute_includes: exportedIncludes.AbsoluteIncludes,

		Export_system_includes:   exportedIncludes.SystemIncludes,

		Deps:                     linkerAttrs.deps,

		System_dynamic_deps:      linkerAttrs.systemDynamicDeps,

		Hdrs:                     baseAttributes.hdrs,

		sdkAttributes:            bp2BuildParseSdkAttributes(module),

	}