From: Jaegeuk Kim <jaegeuk@google.com>
Date: Wed, 12 Feb 2020 19:34:49 +0000 (-0800)
Subject: AOSP: tune2fs, resize2fs: make ramdisk binaries.
X-Git-Tag: archive/debian/1.45.6-1~1^2~1
X-Git-Url: http://git.ipfire.org/?p=thirdparty%2Fe2fsprogs.git;a=commitdiff_plain;h=247973bcc46ffce4a00b9bc95d1a6d612cc0e9ad

AOSP: tune2fs, resize2fs: make ramdisk binaries.

Bug: 149391799
Change-Id: I5183755915710e28a603e3f718f16813ea9991a0
Signed-off-by: Jaegeuk Kim <jaegeuk@google.com>
From AOSP commit: a13a88d0d557a396f63702fb8db008487e2384d7
---

diff --git a/misc/Android.bp b/misc/Android.bp
index c873c104d..a93bea4d5 100644
--- a/misc/Android.bp
+++ b/misc/Android.bp
@@ -143,6 +143,16 @@ cc_binary {
     static_libs: tune2fs_libs,
 }
 
+cc_binary {
+    name: "tune2fs_ramdisk",
+    stem: "tune2fs",
+    static_executable: true,
+    ramdisk: true,
+    defaults: ["tune2fs-defaults"],
+    system_shared_libs: [],
+    static_libs: tune2fs_libs,
+}
+
 cc_library_static {
     name: "libtune2fs",
     defaults: ["tune2fs-defaults"],
diff --git a/resize/Android.bp b/resize/Android.bp
index 399201c3b..8acdcf620 100644
--- a/resize/Android.bp
+++ b/resize/Android.bp
@@ -1,10 +1,16 @@
 // Copyright 2017 The Android Open Source Project
 
-cc_binary {
-    name: "resize2fs",
-    host_supported: true,
-    defaults: ["e2fsprogs-defaults"],
+resize2fs_libs = [
+    "libext2fs",
+    "libext2_com_err",
+    "libext2_e2p",
+    "libext2_uuid",
+    "libext2_blkid",
+]
 
+cc_defaults {
+    name: "resize2fs-defaults",
+    defaults: ["e2fsprogs-defaults"],
     srcs: [
         "extent.c",
         "resize2fs.c",
@@ -13,27 +19,32 @@ cc_binary {
         "sim_progress.c",
         "resource_track.c",
     ],
+}
+
+cc_binary {
+    name: "resize2fs",
+    host_supported: true,
+    defaults: ["resize2fs-defaults"],
+
     // 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",
-            ],
+            static_libs: resize2fs_libs,
         },
         android: {
-            shared_libs: [
-                "libext2fs",
-                "libext2_com_err",
-                "libext2_e2p",
-                "libext2_uuid",
-                "libext2_blkid",
-            ],
+            shared_libs: resize2fs_libs,
         },
     },
     system_shared_libs: ["libc", "libdl"],
 }
+
+cc_binary {
+    name: "resize2fs_ramdisk",
+    stem: "resize2fs",
+    static_executable: true,
+    ramdisk: true,
+    defaults: ["resize2fs-defaults"],
+    system_shared_libs: [],
+    static_libs: resize2fs_libs,
+}