diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2023-06-22 23:25:34 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-06-22 23:25:34 +0000 |
| commit | 05315bbed202f9138bf7f6d7e1edb584a26f7765 (patch) | |
| tree | 3e1aee21d07728d2903f5266302694596832288e | |
| parent | e260ee25c2d43214585049ae03fc5eb9713aa91e (diff) | |
| parent | 7e22869bd1e0bb3655b18c3c4a114f5e11a9d705 (diff) | |
| download | e2fsprogs-05315bbed202f9138bf7f6d7e1edb584a26f7765.tar.gz | |
Merge "Compile libext2_blkid and libext2_uuid on Mac OS X for the Cuttlefish launcher" am: ee2a1486b2 am: b015b5db0b am: e13ce2f1f9 am: 7e22869bd1
Original change: https://android-review.googlesource.com/c/platform/external/e2fsprogs/+/2634239
Change-Id: I2eafbd11cfc60997e806e231047a35997e82fcce
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, }, |