Merge "Convert several libraries to soong."

2 files changed, 70 insertions, 73 deletions

diff --git a/ext4_utils/Android.bp b/ext4_utils/Android.bp
new file mode 100644
index 00000000..a2987aa9
--- /dev/null
+++ b/ext4_utils/Android.bp
@@ -0,0 +1,70 @@
+// Copyright 2010 The Android Open Source Project
+
+cc_library {
+    name: "libext4_utils",
+    host_supported: true,
+    srcs: [
+        "make_ext4fs.c",
+        "ext4fixup.c",
+        "ext4_utils.c",
+        "allocate.c",
+        "contents.c",
+        "extent.c",
+        "indirect.c",
+        "sha1.c",
+        "wipe.c",
+        "crc16.c",
+        "ext4_sb.c",
+    ],
+    // Various instances of dereferencing a type-punned pointer in extent.c
+    cflags: ["-fno-strict-aliasing"],
+    export_include_dirs: ["include"],
+    shared_libs: [
+        "libsparse",
+    ],
+
+    target: {
+        host: {
+            static_libs: ["libsparse"],
+            shared_libs: ["libz-host"],
+        },
+        linux: {
+            static_libs: ["libselinux"],
+        },
+        darwin: {
+            static_libs: ["libselinux"],
+        },
+        windows: {
+            host_ldlibs: ["-lws2_32"],
+            enabled: true,
+        },
+
+        android: {
+            srcs: [
+                "key_control.cpp",
+                "ext4_crypt.cpp",
+            ],
+            shared_libs: [
+                "libbase",
+                "libselinux",
+            ],
+
+            static: {
+                srcs: [
+                    "ext4_crypt_init_extensions.cpp",
+                ],
+                static_libs: [
+                    "liblogwrap",
+                ]
+            },
+            shared: {
+                cflags: ["-DREAL_UUID"],
+                shared_libs: [
+                    "libcutils",
+                    "libext2_uuid",
+                    "libz",
+                ]
+            },
+        },
+    },
+}
diff --git a/ext4_utils/Android.mk b/ext4_utils/Android.mk
index 4287650d..e59eb4a3 100644
--- a/ext4_utils/Android.mk
+++ b/ext4_utils/Android.mk
@@ -2,41 +2,11 @@
 
 LOCAL_PATH:= $(call my-dir)
 
-libext4_utils_src_files := \
-    make_ext4fs.c \
-    ext4fixup.c \
-    ext4_utils.c \
-    allocate.c \
-    contents.c \
-    extent.c \
-    indirect.c \
-    sha1.c \
-    wipe.c \
-    crc16.c \
-    ext4_sb.c
-
 #
 # -- All host/targets including windows
 #
 
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(libext4_utils_src_files)
-LOCAL_MODULE := libext4_utils
-# Various instances of dereferencing a type-punned pointer in extent.c
-LOCAL_CFLAGS += -fno-strict-aliasing
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/include
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-    $(LOCAL_PATH)/include
-LOCAL_STATIC_LIBRARIES := \
-    libsparse
-LOCAL_STATIC_LIBRARIES_darwin += libselinux
-LOCAL_STATIC_LIBRARIES_linux += libselinux
-LOCAL_MODULE_HOST_OS := darwin linux windows
-include $(BUILD_HOST_STATIC_LIBRARY)
-
-
-include $(CLEAR_VARS)
 LOCAL_SRC_FILES := make_ext4fs_main.c
 LOCAL_MODULE := make_ext4fs
 LOCAL_C_INCLUDES := \
@@ -66,52 +36,9 @@ include $(BUILD_HOST_EXECUTABLE)
 # -- All host/targets excluding windows
 #
 
-libext4_utils_src_files += \
-    key_control.cpp \
-    ext4_crypt.cpp
-
 ifneq ($(HOST_OS),windows)
 
 include $(CLEAR_VARS)
-LOCAL_SRC_FILES := $(libext4_utils_src_files)
-LOCAL_MODULE := libext4_utils
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/include \
-    system/core/logwrapper/include
-# Various instances of dereferencing a type-punned pointer in extent.c
-LOCAL_CFLAGS += -fno-strict-aliasing
-LOCAL_CFLAGS += -DREAL_UUID
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-    $(LOCAL_PATH)/include
-LOCAL_SHARED_LIBRARIES := \
-    libbase \
-    libcutils \
-    libext2_uuid \
-    libselinux \
-    libsparse
-include $(BUILD_SHARED_LIBRARY)
-
-
-include $(CLEAR_VARS)
-LOCAL_SRC_FILES := \
-    $(libext4_utils_src_files) \
-    ext4_crypt_init_extensions.cpp
-LOCAL_MODULE := libext4_utils
-LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/include
-# Various instances of dereferencing a type-punned pointer in extent.c
-LOCAL_CFLAGS += -fno-strict-aliasing
-LOCAL_EXPORT_C_INCLUDE_DIRS := \
-    $(LOCAL_PATH)/include
-LOCAL_STATIC_LIBRARIES := \
-    liblogwrap \
-    libsparse \
-    libselinux \
-    libbase
-include $(BUILD_STATIC_LIBRARY)
-
-
-include $(CLEAR_VARS)
 LOCAL_SRC_FILES := make_ext4fs_main.c
 LOCAL_MODULE := make_ext4fs
 LOCAL_C_INCLUDES := \