Ignore shared libs for static executables.
Ie42edc5184f315f998db953594e425214b810e0e added system_shared_libs to
static libraries so that their exported headers can be referenced.
However, it also added unrequired dependencies, which is an
error-triggering issue for static executables.
This change addresses it by adding a condition to shared libs handling code
in binary.go.
Bug: 121152570
Test: cc_test.go, library_test.go
Change-Id: I1828442c4e496f8d815fccaeca970cd5766bdf5d
diff --git a/cc/cc_test.go b/cc/cc_test.go
index e368fb3..33a90f2 100644
--- a/cc/cc_test.go
+++ b/cc/cc_test.go
@@ -53,6 +53,7 @@
func createTestContext(t *testing.T, config android.Config, bp string) *android.TestContext {
ctx := android.NewTestArchContext()
+ ctx.RegisterModuleType("cc_binary", android.ModuleFactoryAdaptor(binaryFactory))
ctx.RegisterModuleType("cc_library", android.ModuleFactoryAdaptor(LibraryFactory))
ctx.RegisterModuleType("cc_library_shared", android.ModuleFactoryAdaptor(LibrarySharedFactory))
ctx.RegisterModuleType("cc_library_headers", android.ModuleFactoryAdaptor(LibraryHeaderFactory))
@@ -194,11 +195,23 @@
}
cc_object {
+ name: "crtbegin_static",
+ recovery_available: true,
+ vendor_available: true,
+ }
+
+ cc_object {
name: "crtend_so",
recovery_available: true,
vendor_available: true,
}
+ cc_object {
+ name: "crtend_android",
+ recovery_available: true,
+ vendor_available: true,
+ }
+
cc_library {
name: "libprotobuf-cpp-lite",
}
@@ -1845,3 +1858,28 @@
t.Errorf("%q is not found in %q", libFoo1VersioningMacro, cFlags)
}
}
+
+func TestStaticExecutable(t *testing.T) {
+ ctx := testCc(t, `
+ cc_binary {
+ name: "static_test",
+ srcs: ["foo.c"],
+ static_executable: true,
+ }`)
+
+ variant := "android_arm64_armv8-a_core"
+ binModuleRule := ctx.ModuleForTests("static_test", variant).Rule("ld")
+ libFlags := binModuleRule.Args["libFlags"]
+ systemStaticLibs := []string{"libc.a", "libm.a", "libdl.a"}
+ for _, lib := range systemStaticLibs {
+ if !strings.Contains(libFlags, lib) {
+ t.Errorf("Static lib %q was not found in %q", lib, libFlags)
+ }
+ }
+ systemSharedLibs := []string{"libc.so", "libm.so", "libdl.so"}
+ for _, lib := range systemSharedLibs {
+ if strings.Contains(libFlags, lib) {
+ t.Errorf("Shared lib %q was found in %q", lib, libFlags)
+ }
+ }
+}