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.
Bug: 113936524
Test: m checkbuild
Change-Id: If9008c50920779048480f5eeeb0084f26006c998
diff --git a/cc/library.go b/cc/library.go
index 7886c35..7330e3f 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -237,6 +237,9 @@
// not included in the NDK.
ndkSysrootPath android.Path
+ // Location of the linked, unstripped library for shared libraries
+ unstrippedOutputFile android.Path
+
// Decorated interafaces
*baseCompiler
*baseLinker
@@ -564,6 +567,8 @@
library.stripper.strip(ctx, outputFile, strippedOutputFile, builderFlags)
}
+ library.unstrippedOutputFile = outputFile
+
if Bool(library.baseLinker.Properties.Use_version_lib) && ctx.Host() {
versionedOutputFile := outputFile
outputFile = android.PathForModuleOut(ctx, "unversioned", fileName)