commit a2525a8eba151c83e3ac1d8b0d24834c28b5aeb2
author Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 10 19:13:44 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jan 10 19:13:44 2020 +0000
tree 03ce5748758d3f1eff075c01cfb0bb332770e44e
parent 920796f25d3ff94ba7850f3c01899c70ed4b688b
parent f60518df5e4cad700bc3b953d426571a0582cf36

Merge "Allow resize2fs to compile with BUILD_HOST_static" am: e2c8b268cf am: f60518df5e

Change-Id: I10d8a70a0d37da95953b7b970ac7c632ba1c1e39

resize/Android.bp

diff --git a/resize/Android.bp b/resize/Android.bp
index d55e24c..399201c 100644
--- a/resize/Android.bp
+++ b/resize/Android.bp
@@ -13,12 +13,27 @@
         "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"],
 }