diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-06-22 21:52:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-22 21:52:16 +0000 |
| commit | e13ce2f1f9370845c8605812aa1386c08defdbc9 (patch) | |
| tree | 3e1aee21d07728d2903f5266302694596832288e | |
| parent | 34483aac102cb8147e8ef200b0c6ef4343889d1b (diff) | |
| parent | b015b5db0b1bb36ac31853c77246f7c939de5416 (diff) | |
| download | e2fsprogs-e13ce2f1f9370845c8605812aa1386c08defdbc9.tar.gz | |
Merge "Compile libext2_blkid and libext2_uuid on Mac OS X for the Cuttlefish launcher" am: ee2a1486b2 am: b015b5db0b
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2634239
Change-Id: I5b2b2f350d3d22ab44dff6d057c0e70fc261c851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | lib/blkid/Android.bp | 3 | ||||
| -rw-r--r-- | lib/uuid/Android.bp | 3 |
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, }, |