commit aa7e1b1c560b22cb6b379041fbe17826562735a7
author Dan Willemsen <dwillemsen@google.com> Tue Oct 03 02:43:32 2017 +0000
committer android-build-merger <android-build-merger@google.com> Tue Oct 03 02:43:32 2017 +0000
tree a9d1ef6085988e33a8d53d32e22adc7afc889033
parent 9020d5ed4bc954fe7446552038ea10f7e28bc505
parent 1a323e5268f1a0c647db8e1a96c486f9aeecc1dd

Merge "Rename target.linux[_x86[_64]] to target.linux_glibc[_x86[_64]]"
am: 1a323e5268

Change-Id: I90dee38cddaa1becbcc7dcfe91d7ecd09e22dcdd

Android.bp

diff --git a/Android.bp b/Android.bp
index 387d42f..286599a 100644
--- a/Android.bp
+++ b/Android.bp
@@ -388,7 +388,7 @@
             static_libs: ["libunwindbacktrace"],
             ldflags: ["-Wl,--exclude-libs,libunwindbacktrace.a"],
         },
-        linux: {
+        linux_glibc: {
             static_libs: ["libunwindbacktrace"],
             shared_libs: ["liblzma"],
         },
@@ -429,7 +429,7 @@
         android_x86: {
             enabled: true,
         },
-        linux: {
+        linux_glibc: {
             enabled: true,
         },
     },