diff --git a/android/androidmk.go b/android/androidmk.go index 9025a746a..0adc2a6eb 100644 --- a/android/androidmk.go +++ b/android/androidmk.go @@ -114,7 +114,7 @@ type AndroidMkEntries struct { // If true, the module is skipped and does not appear on the final Android-.mk // file. Useful when a module needs to be skipped conditionally. 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. Include string // Required modules that need to be built and included in the final build output when building diff --git a/apex/androidmk.go b/apex/androidmk.go index d612f1e6a..c68d2c1a2 100644 --- a/apex/androidmk.go +++ b/apex/androidmk.go @@ -262,7 +262,7 @@ func (a *apexBundle) androidMkForFiles(w io.Writer, apexBundleName, apexName, mo 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: fmt.Fprintln(w, "LOCAL_MODULE_STEM :=", fi.stem()) if fi.builtFile == a.manifestPbOut && apexType == flattenedApex { diff --git a/cc/androidmk.go b/cc/androidmk.go index 5c4ef1705..45bb1ca2a 100644 --- a/cc/androidmk.go +++ b/cc/androidmk.go @@ -80,7 +80,7 @@ func (c *Module) AndroidMkEntries() []android.AndroidMkEntries { // to be installed. And this is breaking some older devices (like marlin) // where system.img is small. Required: c.Properties.AndroidMkRuntimeLibs, - Include: "$(BUILD_SYSTEM)/soong_cc_prebuilt.mk", + Include: "$(BUILD_SYSTEM)/soong_cc_rust_prebuilt.mk", ExtraEntries: []android.AndroidMkExtraEntriesFunc{ 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 { entries.SetBool("LOCAL_CHECK_ELF_FILES", *p.properties.Check_elf_files) } else { - // soong_cc_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. + // soong_cc_rust_prebuilt.mk does not include check_elf_file.mk by default + // 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 // true if `p.properties.Check_elf_files` is not specified. entries.SetBool("LOCAL_CHECK_ELF_FILES", true) diff --git a/rust/androidmk.go b/rust/androidmk.go index 7eb5dbdbd..ea2c497ac 100644 --- a/rust/androidmk.go +++ b/rust/androidmk.go @@ -51,7 +51,7 @@ func (mod *Module) AndroidMkEntries() []android.AndroidMkEntries { ret := android.AndroidMkEntries{ OutputFile: android.OptionalPathForPath(mod.UnstrippedOutputFile()), - Include: "$(BUILD_SYSTEM)/soong_rust_prebuilt.mk", + Include: "$(BUILD_SYSTEM)/soong_cc_rust_prebuilt.mk", ExtraEntries: []android.AndroidMkExtraEntriesFunc{ func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { entries.AddStrings("LOCAL_RLIB_LIBRARIES", mod.Properties.AndroidMkRlibs...) diff --git a/sh/sh_binary.go b/sh/sh_binary.go index d5033ef84..c32cde01e 100644 --- a/sh/sh_binary.go +++ b/sh/sh_binary.go @@ -284,7 +284,7 @@ func (s *ShBinary) AndroidMkEntries() []android.AndroidMkEntries { return []android.AndroidMkEntries{android.AndroidMkEntries{ Class: "EXECUTABLES", OutputFile: android.OptionalPathForPath(s.outputFilePath), - Include: "$(BUILD_SYSTEM)/soong_cc_prebuilt.mk", + Include: "$(BUILD_SYSTEM)/soong_cc_rust_prebuilt.mk", ExtraEntries: []android.AndroidMkExtraEntriesFunc{ func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { s.customAndroidMkEntries(entries) @@ -433,7 +433,7 @@ func (s *ShTest) AndroidMkEntries() []android.AndroidMkEntries { return []android.AndroidMkEntries{android.AndroidMkEntries{ Class: "NATIVE_TESTS", OutputFile: android.OptionalPathForPath(s.outputFilePath), - Include: "$(BUILD_SYSTEM)/soong_cc_prebuilt.mk", + Include: "$(BUILD_SYSTEM)/soong_cc_rust_prebuilt.mk", ExtraEntries: []android.AndroidMkExtraEntriesFunc{ func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) { s.customAndroidMkEntries(entries)