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

Merge "Use new soong_cc_rust_prebuilt.mk"

Browse Source
This commit is contained in:
Ivan Lozano
2021-11-15 22:19:46 +00:00
committed by Gerrit Code Review
parent 92a89ed1c5 d06cc748c1
commit 3e1bc6cc0d
5 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/androidmk.go
View File

@@ -114,7 +114,7 @@ type AndroidMkEntries struct {
// If true, the module is skipped and does not appear on the final Android-<product name>.mk // If true, the module is skipped and does not appear on the final Android-<product name>.mk
// file. Useful when a module needs to be skipped conditionally. // file. Useful when a module needs to be skipped conditionally.
Disabled bool Disabled bool
// The postprocessing mk file to include, e.g. $(BUILD_SYSTEM)/soong_cc_prebuilt.mk // The postprocessing mk file to include, e.g. $(BUILD_SYSTEM)/soong_cc_rust_prebuilt.mk
// If not set, $(BUILD_SYSTEM)/prebuilt.mk is used. // If not set, $(BUILD_SYSTEM)/prebuilt.mk is used.
Include string Include string
// Required modules that need to be built and included in the final build output when building // Required modules that need to be built and included in the final build output when building

2
apex/androidmk.go
View File

@@ -272,7 +272,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo
fmt.Fprintln(w, "LOCAL_PREBUILT_COVERAGE_ARCHIVE :=", ccMod.CoverageOutputFile().String()) fmt.Fprintln(w, "LOCAL_PREBUILT_COVERAGE_ARCHIVE :=", ccMod.CoverageOutputFile().String())
} }
} }
fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_cc_prebuilt.mk") fmt.Fprintln(w, "include $(BUILD_SYSTEM)/soong_cc_rust_prebuilt.mk")
default: default:
fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.stem()) fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.stem())
if fi.builtFile == a.manifestPbOut && apexType == flattenedApex { if fi.builtFile == a.manifestPbOut && apexType == flattenedApex {

6
cc/androidmk.go
View File

@@ -80,7 +80,7 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries {
// to be installed. And this is breaking some older devices (like marlin) // to be installed. And this is breaking some older devices (like marlin)
// where system.img is small. // where system.img is small.
Required: c.Properties.AndroidMkRuntimeLibs, Required: c.Properties.AndroidMkRuntimeLibs,
Include: "$(BUILD_SYSTEM)/soong_cc_prebuilt.mk", Include: "$(BUILD_SYSTEM)/soong_cc_rust_prebuilt.mk",
ExtraEntries: []android.AndroidMkExtraEntriesFunc{ ExtraEntries: []android.AndroidMkExtraEntriesFunc{
func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
@@ -582,8 +582,8 @@ func (p *prebuiltLinker) AndroidMkEntries(ctx AndroidMkContext, entries *android
if p.properties.Check_elf_files != nil { if p.properties.Check_elf_files != nil {
entries.SetBool("LOCAL_CHECK_ELF_FILES", *p.properties.Check_elf_files) entries.SetBool("LOCAL_CHECK_ELF_FILES", *p.properties.Check_elf_files)
} else { } else {
// soong_cc_prebuilt.mk does not include check_elf_file.mk by default // soong_cc_rust_prebuilt.mk does not include check_elf_file.mk by default
// because cc_library_shared and cc_binary use soong_cc_prebuilt.mk as well. // because cc_library_shared and cc_binary use soong_cc_rust_prebuilt.mk as well.
// In order to turn on prebuilt ABI checker, set `LOCAL_CHECK_ELF_FILES` to // In order to turn on prebuilt ABI checker, set `LOCAL_CHECK_ELF_FILES` to
// true if `p.properties.Check_elf_files` is not specified. // true if `p.properties.Check_elf_files` is not specified.
entries.SetBool("LOCAL_CHECK_ELF_FILES", true) entries.SetBool("LOCAL_CHECK_ELF_FILES", true)

2
rust/androidmk.go
View File

@@ -51,7 +51,7 @@ func (mod *Module) AndroidMkEntries() []android.AndroidMkEntries {
ret := android.AndroidMkEntries{ ret := android.AndroidMkEntries{
OutputFile: android.OptionalPathForPath(mod.UnstrippedOutputFile()), OutputFile: android.OptionalPathForPath(mod.UnstrippedOutputFile()),
Include: "$(BUILD_SYSTEM)/soong_rust_prebuilt.mk", Include: "$(BUILD_SYSTEM)/soong_cc_rust_prebuilt.mk",
ExtraEntries: []android.AndroidMkExtraEntriesFunc{ ExtraEntries: []android.AndroidMkExtraEntriesFunc{
func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
entries.AddStrings("LOCAL_RLIB_LIBRARIES", mod.Properties.AndroidMkRlibs...) entries.AddStrings("LOCAL_RLIB_LIBRARIES", mod.Properties.AndroidMkRlibs...)

4
sh/sh_binary.go
View File

@@ -284,7 +284,7 @@ func (s *ShBinary) AndroidMkEntries() []android.AndroidMkEntries {
return []android.AndroidMkEntries{android.AndroidMkEntries{ return []android.AndroidMkEntries{android.AndroidMkEntries{
Class: "EXECUTABLES", Class: "EXECUTABLES",
OutputFile: android.OptionalPathForPath(s.outputFilePath), OutputFile: android.OptionalPathForPath(s.outputFilePath),
Include: "$(BUILD_SYSTEM)/soong_cc_prebuilt.mk", Include: "$(BUILD_SYSTEM)/soong_cc_rust_prebuilt.mk",
ExtraEntries: []android.AndroidMkExtraEntriesFunc{ ExtraEntries: []android.AndroidMkExtraEntriesFunc{
func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
s.customAndroidMkEntries(entries) s.customAndroidMkEntries(entries)
@@ -433,7 +433,7 @@ func (s *ShTest) AndroidMkEntries() []android.AndroidMkEntries {
return []android.AndroidMkEntries{android.AndroidMkEntries{ return []android.AndroidMkEntries{android.AndroidMkEntries{
Class: "NATIVE_TESTS", Class: "NATIVE_TESTS",
OutputFile: android.OptionalPathForPath(s.outputFilePath), OutputFile: android.OptionalPathForPath(s.outputFilePath),
Include: "$(BUILD_SYSTEM)/soong_cc_prebuilt.mk", Include: "$(BUILD_SYSTEM)/soong_cc_rust_prebuilt.mk",
ExtraEntries: []android.AndroidMkExtraEntriesFunc{ ExtraEntries: []android.AndroidMkExtraEntriesFunc{
func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {
s.customAndroidMkEntries(entries) s.customAndroidMkEntries(entries)