commit 813e5e6412cb1f5d72e6fdcd7bea9e4258d39075
author Greg Hartman <ghartman@google.com> Wed Dec 06 20:56:16 2017 -0800
committer Greg Hartman <ghartman@google.com> Thu Dec 07 08:02:16 2017 -0800
tree e3ede1c5fc11d80536695c5979765f99038747b1
parent f46d75a53f92adf22f7f669dd5f1444909b3f04d

Rename linux to linux_glibc

Test: local build
Change-Id: I61e1fd55fa05187c232fc2ebed9f9b4fd7dd0488
Merged-In: I61e1fd55fa05187c232fc2ebed9f9b4fd7dd0488

Android.bp

diff --git a/Android.bp b/Android.bp
index 5ad19cf..3c1d05b 100644
--- a/Android.bp
+++ b/Android.bp
@@ -40,13 +40,12 @@
         "cuttlefish_kernel_headers",
     ],
     target: {
-        linux: {
+        linux_glibc: {
             host_ldlibs: ["-lrt"],
             cflags: ["-DCUTTLEFISH_HOST"],
         },
         // We don't need 32 bit host-side builds
-        // TODO(ghartman): linux_glibc on master
-        linux_x86: {
+        linux_glibc_x86: {
             enabled: false,
         },
         // We don't need Darwin host-side builds
@@ -101,8 +100,7 @@
         "liblog",
     ],
     target: {
-        //TODO(ghartman): linux_glibc on master
-        linux: {
+        linux_glibc: {
             srcs: [
                 "host/vsoc/lib/gralloc_buffer_region_view.cpp",
                 "host/vsoc/lib/host_lock.cpp",
@@ -144,7 +142,7 @@
         "libbase",
     ],
     target : {
-        linux_x86_64: {
+        linux_glibc_x86_64: {
             static_libs: [
                 "libcuttlefish_host_config",
                 "libgflags",