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

Commit edd2ecf8 authored by Trevor Radcliffe's avatar Trevor Radcliffe Committed by Automerger Merge Worker
Browse files

Merge "CFI Versionscript changes in bp2build" am: 197f4306 am: 82674cf6 am: c554111b 

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



Change-Id: I01cb2321a6c753443218b7a2d31ad74a0922b005
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 32d2f8f3 c554111b

bp2build/cc_binary_conversion_test.go

+2 −0
Original line number Diff line number Diff line
@@ -222,6 +222,7 @@ func TestCcBinaryVersionScriptAndDynamicList(t *testing.T) { 
        "-Wl,--version-script,$(location vs)",

        "-Wl,--dynamic-list,$(location dynamic.list)",

    ]`,

				"features": `["android_cfi_exports_map"]`,

			},

			},

		},
@@ -249,6 +250,7 @@ func TestCcBinaryLdflagsSplitBySpaceExceptSoongAdded(t *testing.T) { 
        "version_script",

        "dynamic.list",

    ]`,

				"features": `["android_cfi_exports_map"]`,

				"linkopts": `[

        "--nospace_flag",

        "-z",

bp2build/cc_library_conversion_test.go

+11 −2
Original line number Diff line number Diff line
@@ -901,6 +901,7 @@ cc_library { 
        "-Wl,--dynamic-list,$(location dynamic.list)",

    ]`,

			"srcs":     `["a.cpp"]`,

			"features": `["android_cfi_exports_map"]`,

		}),

	},

	)
@@ -958,6 +959,11 @@ cc_library { 
        "//conditions:default": [],

    })`,

			"srcs": `["a.cpp"]`,

			"features": `select({

        "//build/bazel/platforms/arch:arm": ["android_cfi_exports_map"],

        "//build/bazel/platforms/arch:arm64": ["android_cfi_exports_map"],

        "//conditions:default": [],

    })`,

		}),

	},

	)
@@ -985,12 +991,15 @@ cc_library { 
}

`,

		ExpectedBazelTargets: []string{

			MakeBazelTarget("cc_library_static", "foo_bp2build_cc_library_static", AttrNameToString{}),

			MakeBazelTarget("cc_library_static", "foo_bp2build_cc_library_static", AttrNameToString{

				"features": `["android_cfi_exports_map"]`,

			}),

			MakeBazelTarget("cc_library_shared", "foo", AttrNameToString{

				"additional_linker_inputs": `[

        "version_script",

        "dynamic.list",

    ]`,

				"features": `["android_cfi_exports_map"]`,

				"linkopts": `[

        "--nospace_flag",

        "-z",

bp2build/cc_library_shared_conversion_test.go

+3 −0
Original line number Diff line number Diff line
@@ -362,6 +362,7 @@ cc_library_shared { 
        "-Wl,--version-script,$(location version_script)",

        "-Wl,--dynamic-list,$(location dynamic.list)",

    ]`,

				"features": `["android_cfi_exports_map"]`,

			}),

		},

	})
@@ -398,6 +399,7 @@ cc_library_shared { 
        "-Wl,--version-script,$(location version_script)",

        "-Wl,--dynamic-list,$(location dynamic.list)",

    ]`,

				"features": `["android_cfi_exports_map"]`,

			}),

		},

	})
@@ -913,6 +915,7 @@ func TestCCLibraryFlagSpaceSplitting(t *testing.T) { 
        "header.h",

    ]`,

				"linkopts": `["-Wl,--version-script,$(location version_script)"]`,

				"features": `["android_cfi_exports_map"]`,

			}),

		},

	})

cc/bp2build.go

+1 −0
Original line number Diff line number Diff line
@@ -1257,6 +1257,7 @@ func (la *linkerAttributes) bp2buildForAxisAndConfig(ctx android.BazelConversion 
		label := android.BazelLabelForModuleSrcSingle(ctx, *props.Version_script)

		additionalLinkerInputs.Add(&label)

		linkerFlags = append(linkerFlags, fmt.Sprintf("-Wl,--version-script,$(location %s)", label.Label))

		axisFeatures = append(axisFeatures, "android_cfi_exports_map")

	}



	if props.Dynamic_list != nil {