Merge "liblp: Allow building liblp as a shared library."

am: 2756339c77

Change-Id: I20ea48eff3843461cdc00c470643088d350195f6

fs_mgr/Android.bp

@@ -56,20 +56,21 @@ cc_library {
         "liblog",
         "libsquashfs_utils",
         "libselinux",
+        "liblp",
     ],
     static_libs: [
         "libavb",
         "libfstab",
         "libdm",
-        "liblp",
     ],
     export_static_lib_headers: [
         "libfstab",
         "libdm",
+    ],
+    export_shared_lib_headers: [
         "liblp",
     ],
     whole_static_libs: [
-        "liblp",
         "liblogwrap",
         "libdm",
         "libfstab",

fs_mgr/liblp/Android.bp

@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-cc_library_static {
+cc_library {
     name: "liblp",
     host_supported: true,
     recovery_available: true,
@@ -29,17 +29,14 @@ cc_library_static {
         "utility.cpp",
         "writer.cpp",
     ],
-    static_libs: [
+    shared_libs: [
         "libbase",
         "liblog",
         "libcrypto",
         "libcrypto_utils",
         "libsparse",
-    ],
-    whole_static_libs: [
         "libext2_uuid",
         "libext4_utils",
-        "libsparse",
         "libz",
     ],
     export_include_dirs: ["include"],
@@ -51,12 +48,9 @@ cc_test {
     cppflags: [
         "-Wno-unused-parameter",
     ],
-    static_libs: [
-        "libbase",
-        "liblog",
-        "libcrypto",
-        "libcrypto_utils",
+    shared_libs: [
         "liblp",
+        "libbase",
         "libfs_mgr",
     ],
     srcs: [

init/Android.mk

@@ -67,6 +67,7 @@ LOCAL_STATIC_LIBRARIES := \
     libprotobuf-cpp-lite \
     libpropertyinfoserializer \
     libpropertyinfoparser \
+    liblp \
 
 shared_libs := \
     libcutils \