diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-19 07:25:44 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-19 07:25:44 +0000 |
| commit | 99db6995400e29118de44f5c5fcd8465df2b54fa (patch) | |
| tree | 61985030cbb3d27f378d9a10024b889194730207 | |
| parent | 9fdce5b41f46f15e23f0332bb0bcb7a56559ec5d (diff) | |
| parent | 28a789d56409ea70ed707f7dd01f857c0bf611c4 (diff) | |
| download | android_external_e2fsprogs-99db6995400e29118de44f5c5fcd8465df2b54fa.tar.gz android_external_e2fsprogs-99db6995400e29118de44f5c5fcd8465df2b54fa.tar.bz2 android_external_e2fsprogs-99db6995400e29118de44f5c5fcd8465df2b54fa.zip | |
release-request-bd6aa7dd-7b02-4794-942c-14599bf61208-for-git_oc-mr1-release-4193791 snap-temp-L98700000083613807
Change-Id: I0d3bb62bd600d03ff2f7a6eeb22d07362d10977f
| -rw-r--r-- | contrib/android/Android.bp | 37 | ||||
| -rw-r--r-- | misc/Android.bp | 38 |
2 files changed, 56 insertions, 19 deletions
diff --git a/contrib/android/Android.bp b/contrib/android/Android.bp index afa335e0..18d38501 100644 --- a/contrib/android/Android.bp +++ b/contrib/android/Android.bp @@ -18,15 +18,34 @@ cc_binary { "hashmap.c", ], cflags: ["-W", "-Wall"], - shared_libs: [ - "libext2fs", - "libext2_com_err", - "libext2_misc", - "libcutils", - "libbase", - "libselinux", - "libcrypto", - ], + target: { + host: { + static_libs: [ + "libext2_com_err", + "libext2_misc", + "libext2fs", + "libsparse", + "libz", + "libcutils", + "libbase", + "libselinux", + "libcrypto", + "liblog", + ], + }, + android: { + shared_libs: [ + "libext2fs", + "libext2_com_err", + "libext2_misc", + "libcutils", + "libbase", + "libselinux", + "libcrypto", + ], + }, + }, + stl: "libc++_static", } //########################################################################## diff --git a/misc/Android.bp b/misc/Android.bp index 5183981f..d307477b 100644 --- a/misc/Android.bp +++ b/misc/Android.bp @@ -35,16 +35,34 @@ cc_binary { "mke2fs.conf", ], cflags: ["-W", "-Wall", "-Wno-macro-redefined"], - shared_libs: [ - "libext2fs", - "libext2_blkid", - "libext2_misc", - "libext2_uuid", - "libext2_quota", - "libext2_com_err", - "libext2_e2p", - ], - system_shared_libs: ["libc"], + target: { + host: { + static_libs: [ + "libext2_blkid", + "libext2_misc", + "libext2_uuid", + "libext2_quota", + "libext2_com_err", + "libext2_e2p", + "libext2fs", + "libsparse", + "libbase", + "libz", + ], + }, + android: { + shared_libs: [ + "libext2fs", + "libext2_blkid", + "libext2_misc", + "libext2_uuid", + "libext2_quota", + "libext2_com_err", + "libext2_e2p", + ], + }, + }, + stl: "libc++_static", include_dirs: ["external/e2fsprogs/e2fsck"], } |