commit 026b3d4604e0c15b45da1ccefbca6a9daf0236c8
author Dan Willemsen <dwillemsen@google.com> Tue Oct 03 02:30:05 2017 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Oct 03 02:30:05 2017 +0000
tree 8f7a0d8ec7057651704182247eff7497903fad89
parent 498e8ed7cee16eea695fe96e3e626a97bf97ac44
parent 99988f8dcad80e5baa02be571a9ec7c2540f1544

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

build/Android.bp

diff --git a/build/Android.bp b/build/Android.bp
index 8e8a2f6..ff762dd 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -83,7 +83,7 @@
                 "bionic/libc/private",
             ],
         },
-        linux: {
+        linux_glibc: {
             cflags: [
                 // Enable missing-noreturn only on non-Mac. As lots of things are not implemented for
                 // Apple, it's a pain.

dalvikvm/Android.bp

diff --git a/dalvikvm/Android.bp b/dalvikvm/Android.bp
index 0405fe1..cca9ac4 100644
--- a/dalvikvm/Android.bp
+++ b/dalvikvm/Android.bp
@@ -36,7 +36,7 @@
             ],
             ldflags: ["-Wl,--export-dynamic"],
         },
-        linux: {
+        linux_glibc: {
             ldflags: ["-Wl,--export-dynamic"],
         },
     },

test/Android.bp

diff --git a/test/Android.bp b/test/Android.bp
index 2af03e3..cb18070 100644
--- a/test/Android.bp
+++ b/test/Android.bp
@@ -74,7 +74,7 @@
     ],
 
     target: {
-        linux: {
+        linux_glibc: {
             ldflags: [
                 // Allow jni_compiler_test to find Java_MyClassNatives_bar
                 // within itself using dlopen(NULL, ...).
@@ -143,7 +143,7 @@
                 "-Wno-missing-noreturn",
             ],
         },
-        linux: {
+        linux_glibc: {
             cflags: [
                 // gtest issue
                 "-Wno-used-but-marked-unused",