Clean up crt defaults
Make crt_so_defaults inherit from crt_defaults, remove duplicates
from crt_so_defaults, and make the users of crt_so_defaults not
directly use crt_defaults.
Test: m checkbuild
Change-Id: I1448a5a4c86521b994fd4d79120e0b7d3a9c5ba9
diff --git a/libc/Android.bp b/libc/Android.bp
index 5791db0..6720119 100644
--- a/libc/Android.bp
+++ b/libc/Android.bp
@@ -1969,16 +1969,13 @@
defaults: ["linux_bionic_supported"],
vendor_available: true,
-
- cflags: ["-Wno-gcc-compat", "-Werror"],
+ cflags: ["-Wno-gcc-compat", "-Wall", "-Werror"],
}
cc_defaults {
name: "crt_so_defaults",
+ defaults: ["crt_defaults"],
- cflags: ["-Wno-gcc-compat", "-Werror"],
-
- vendor_available: true,
arch: {
mips: {
cflags: ["-fPIC"],
@@ -2007,10 +2004,7 @@
},
srcs: ["arch-common/bionic/crtbrand.S"],
- defaults: [
- "crt_defaults",
- "crt_so_defaults",
- ],
+ defaults: ["crt_so_defaults"],
}
cc_object {
@@ -2018,19 +2012,13 @@
local_include_dirs: ["include"],
srcs: ["arch-common/bionic/crtbegin_so.c"],
- defaults: [
- "crt_defaults",
- "crt_so_defaults",
- ],
+ defaults: ["crt_so_defaults"],
}
cc_object {
name: "crtbegin_so",
- defaults: [
- "crt_defaults",
- "crt_so_defaults",
- ],
+ defaults: ["crt_so_defaults"],
objs: [
"crtbegin_so1",
"crtbrand",
@@ -2042,10 +2030,7 @@
local_include_dirs: ["include"],
srcs: ["arch-common/bionic/crtend_so.S"],
- defaults: [
- "crt_defaults",
- "crt_so_defaults",
- ],
+ defaults: ["crt_so_defaults"],
}
cc_object {