diff --git a/bp2build/build_conversion.go b/bp2build/build_conversion.go index 53c37b90e..ed6e2dd1c 100644 --- a/bp2build/build_conversion.go +++ b/bp2build/build_conversion.go @@ -830,11 +830,9 @@ func GenerateBazelTargets(ctx *CodegenContext, generateFilegroups bool) (convers depLabels.Add(&depLabel) } a := struct { - Deps bazel.LabelListAttribute - System_dynamic_deps bazel.LabelListAttribute + Deps bazel.LabelListAttribute }{ - Deps: bazel.MakeLabelListAttribute(bazel.UniqueSortedBazelLabelList(depLabels)), - System_dynamic_deps: bazel.MakeLabelListAttribute(bazel.MakeLabelList([]bazel.Label{})), + Deps: bazel.MakeLabelListAttribute(bazel.UniqueSortedBazelLabelList(depLabels)), } ndkSysroot := bTarget{ targetName: "ndk_sysroot", diff --git a/cc/library_headers.go b/cc/library_headers.go index 4da2b48ca..3f8be467b 100644 --- a/cc/library_headers.go +++ b/cc/library_headers.go @@ -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), }