aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-01-10 18:39:34 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2020-01-10 18:39:34 +0000
commite2c8b268cf994af605ef8698fc7a0ce80ee70703 (patch)
tree03ce5748758d3f1eff075c01cfb0bb332770e44e
parent570728a24fa1d6fe1155086cf87972b84b8cae30 (diff)
parent2c767b86591c64cd7b84c5619e8d8b8a0afd557e (diff)
downloade2fsprogs-e2c8b268cf994af605ef8698fc7a0ce80ee70703.tar.gz
Merge "Allow resize2fs to compile with BUILD_HOST_static"
-rw-r--r--resize/Android.bp29
1 files changed, 22 insertions, 7 deletions
diff --git a/resize/Android.bp b/resize/Android.bp
index d55e24c2..399201c3 100644
--- a/resize/Android.bp
+++ b/resize/Android.bp
@@ -13,12 +13,27 @@ cc_binary {
"sim_progress.c",
"resource_track.c",
],
- shared_libs: [
- "libext2fs",
- "libext2_com_err",
- "libext2_e2p",
- "libext2_uuid",
- "libext2_blkid",
- ],
+ // Host binaries can be compiled statically to be re-used in other environments.
+ // For android binaries, we keep shared libraries to keep the binary size smaller.
+ target: {
+ host: {
+ static_libs: [
+ "libext2fs",
+ "libext2_com_err",
+ "libext2_e2p",
+ "libext2_uuid",
+ "libext2_blkid",
+ ],
+ },
+ android: {
+ shared_libs: [
+ "libext2fs",
+ "libext2_com_err",
+ "libext2_e2p",
+ "libext2_uuid",
+ "libext2_blkid",
+ ],
+ },
+ },
system_shared_libs: ["libc", "libdl"],
}