commit c919bd6eee9eb76c030d3778b6979415b368cbe5
author Treehugger Robot <treehugger-gerrit@google.com> Fri Jun 23 00:53:04 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jun 23 00:53:04 2023 +0000
tree 3e1aee21d07728d2903f5266302694596832288e
parent 5bc69b5b3459126674c1101e6a39e650e2572404
parent 733640c8a8d8293ee0737c8ac4fd3539a0cdcdb9

Merge "Compile libext2_blkid and libext2_uuid on Mac OS X for the Cuttlefish launcher" am: ee2a1486b2 am: b015b5db0b am: e13ce2f1f9 am: 7e22869bd1 am: 05315bbed2 am: 733640c8a8

Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2634239

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

lib/blkid/Android.bp

diff --git a/lib/blkid/Android.bp b/lib/blkid/Android.bp
index 891c74a..89e39ab 100644
--- a/lib/blkid/Android.bp
+++ b/lib/blkid/Android.bp
@@ -38,6 +38,9 @@
     shared_libs: ["libext2_uuid"],
 
     target: {
+        darwin: {
+            enabled: true,
+        },
         windows: {
             enabled: true,
         },

lib/uuid/Android.bp

diff --git a/lib/uuid/Android.bp b/lib/uuid/Android.bp
index 3e6048d..279592b 100644
--- a/lib/uuid/Android.bp
+++ b/lib/uuid/Android.bp
@@ -40,6 +40,9 @@
         "uuid_time.c",
     ],
     target: {
+        darwin: {
+            enabled: true,
+        },
         windows: {
             enabled: true,
         },