commit 16616fd81f1e3c227efaa6c078126272e5d67c09
author Oystein Eftevaag <oysteine@google.com> Thu Mar 16 20:38:46 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Mar 16 20:38:46 2023 +0000
tree 07b9b342d4ebbd1dea2458358ee2b863898f0911
parent 061f68cd158fa658ec0b9b2b989ed55764870047
parent c7e4441964f25637b38dbba0d554f3d922f540d6

Enable Windows host compilation of gflags am: 791196a1e8 am: 1e32a9e8c7 am: 073396cf0a am: c7e4441964

Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/2411455

Change-Id: Ibbf78b40a1a1016770d6ccc090baabf9d6c30ccb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

Android.bp

diff --git a/Android.bp b/Android.bp
index 9ac1f35..ff2b82d 100644
--- a/Android.bp
+++ b/Android.bp
@@ -21,8 +21,8 @@
     ],
 }
 
-cc_library {
-    name: "libgflags",
+cc_defaults {
+    name: "gflags_defaults",
     host_supported: true,
     vendor_available: true,
     product_available: true,
@@ -47,10 +47,26 @@
     export_include_dirs: [
         "android",
     ],
+}
+
+cc_library {
+    name: "libgflags",
     static: {
         apex_available: [
             "com.android.gki.*",
             "com.android.virt",
         ],
     },
+    defaults: ["gflags_defaults"],
+}
+
+cc_library_host_static {
+    name: "libgflags_cuttlefish",
+    target: {
+        windows: {
+            enabled: true,
+        },
+    },
+    defaults: ["gflags_defaults"],
+    visibility: ["//device/google/cuttlefish:__subpackages__"],
 }