Use target.linux for all linux kernel based targets
Now in Android.bp files, target.linux applies to all targets running a
linux kernel (android, linux_glibc, linux_bionic). So common
flags/sources/etc can be combined instead of copying them to each
target.
Test: m
Change-Id: Ic1da96e3dfea043367c41f3a61d2ee9f4cc3984a
diff --git a/Android.bp b/Android.bp
index 2bc9f95..b44abf3 100644
--- a/Android.bp
+++ b/Android.bp
@@ -56,6 +56,8 @@
cflags: [
"-finline-functions",
],
+ },
+ linux: {
cppflags: [
"-Woverloaded-virtual",
],
@@ -79,8 +81,6 @@
host_ldlibs: ["-luuid"],
},
linux_glibc: {
- cppflags: ["-Woverloaded-virtual"],
-
// Add on ncurses to have support for terminfo
host_ldlibs: [
"-lncurses",
diff --git a/tools/bugpoint/Android.bp b/tools/bugpoint/Android.bp
index b1a6839..89514b8 100644
--- a/tools/bugpoint/Android.bp
+++ b/tools/bugpoint/Android.bp
@@ -34,7 +34,7 @@
darwin: {
ldflags: ["-Wl,-export_dynamic"],
},
- linux_glibc: {
+ linux: {
ldflags: ["-Wl,--export-dynamic"],
},
},
diff --git a/tools/opt/Android.bp b/tools/opt/Android.bp
index 633ec4e..499c4d4 100644
--- a/tools/opt/Android.bp
+++ b/tools/opt/Android.bp
@@ -62,7 +62,7 @@
darwin: {
ldflags: ["-Wl,-export_dynamic"],
},
- linux_glibc: {
+ linux: {
ldflags: ["-Wl,--export-dynamic"],
},
},
