AOSP: Compile libext2_blkid and libext2_uuid on Mac OS X for the Cuttlefish launcher

Test: m libext2_blkid libext2_uuid
Bug: 288342686
Change-Id: Ieaf2b73efe4b9e1ed0b52e12cf931d225cd8844d
From AOSP commit: 24d1f08c6c42a292cb49c0526d2a39e889c50683

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

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