Use soong_cc_prebuilt.mk instead of prebuilt.mk for Soong cc modules
Export Soong cc modules to Make using a new soong_cc_prebuilt.mk that
bypasses all of prebuilt_internal.mk, dynamic_binary.mk and binary.mk.
This also means that stripping is handled in Soong instead of Make.
Relands If9008c50920779048480f5eeeb0084f26006c998 with fixes for
mac builds.
Bug: 113936524
Test: m checkbuild
Change-Id: I9710ff57f0793f36eb889eabd08bd60a365a88dd
diff --git a/cc/binary.go b/cc/binary.go
index be79032..6352ba1 100644
--- a/cc/binary.go
+++ b/cc/binary.go
@@ -78,6 +78,9 @@
toolPath android.OptionalPath
+ // Location of the linked, unstripped binary
+ unstrippedOutputFile android.Path
+
// Names of symlinks to be installed for use in LOCAL_MODULE_SYMLINKS
symlinks []string
@@ -306,6 +309,8 @@
binary.stripper.strip(ctx, outputFile, strippedOutputFile, builderFlags)
}
+ binary.unstrippedOutputFile = outputFile
+
if String(binary.Properties.Prefix_symbols) != "" {
afterPrefixSymbols := outputFile
outputFile = android.PathForModuleOut(ctx, "unprefixed", fileName)