Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]

In the future, target.linux will apply to all targets running a linux kernel
(android, linux_glibc, linux_bionic). So move all current users to the specific
linux_glibc.

There will be another cleanup pass later that will move some instances back to
target.linux if the properties should be shared with target.android and
target.linux_bionic, but target.linux needs to be removed first.

Test: out/soong/build.ninja identical before/after
Change-Id: Iadc1ba324e03fd2b1b52bf471ffa2a71e0ec3e61
Exempt-From-Owner-Approval: build system cleanup

diff --git a/btcore/Android.bp b/btcore/Android.bp
index b91091c..eba1ae3 100644 (file)
--- a/btcore/Android.bp
+++ b/btcore/Android.bp
@@ -20,7 +20,7 @@ cc_library_static {
         darwin: {
             enabled: false,
         },
-        linux: {
+        linux_glibc: {
             cflags: ["-D_GNU_SOURCE"],
         },
     },

diff --git a/osi/Android.bp b/osi/Android.bp
index 77a779c..da62a2f 100644 (file)
--- a/osi/Android.bp
+++ b/osi/Android.bp
@@ -94,7 +94,7 @@ cc_library_static {
         darwin: {
             enabled: false,
         },
-        linux: {
+        linux_glibc: {
             cflags: [
                 "-D_GNU_SOURCE",
                 "-DOS_GENERIC",
@@ -144,7 +144,7 @@ cc_test {
         "libosi",
     ],
     target: {
-        linux: {
+        linux_glibc: {
             cflags: ["-DOS_GENERIC"],
         },
         darwin: {

diff --git a/service/Android.bp b/service/Android.bp
index a106052..3c82986 100644 (file)
--- a/service/Android.bp
+++ b/service/Android.bp
@@ -137,7 +137,7 @@ cc_test {
                 "test/stub_ipc_handler_linux.cc",
             ],
         },
-        linux: {
+        linux_glibc: {
             srcs: btserviceLinuxSrc + [
                 // TODO(bcf): Fix this test.
                 //"test/ipc_linux_unittest.cc",