aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2023-06-22 20:46:19 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2023-06-22 20:46:19 +0000
commitb015b5db0b1bb36ac31853c77246f7c939de5416 (patch)
tree3e1aee21d07728d2903f5266302694596832288e
parent34483aac102cb8147e8ef200b0c6ef4343889d1b (diff)
parentee2a1486b2a05c3997bcaa3a7dc46dc5550aeb85 (diff)
downloade2fsprogs-b015b5db0b1bb36ac31853c77246f7c939de5416.tar.gz
Merge "Compile libext2_blkid and libext2_uuid on Mac OS X for the Cuttlefish launcher" am: ee2a1486b2
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2634239 Change-Id: Ib7970a844b70ceb5a3eb0ad96b7f663071aaa8e8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r--lib/blkid/Android.bp3
-rw-r--r--lib/uuid/Android.bp3
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/blkid/Android.bp b/lib/blkid/Android.bp
index 891c74a3..89e39ab0 100644
--- 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 3e6048d0..279592bd 100644
--- 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,
},