diff options
-rw-r--r-- | fs_mgr/Android.bp | 5 | ||||
-rw-r--r-- | fs_mgr/liblp/Android.bp | 14 | ||||
-rw-r--r-- | init/Android.mk | 1 |
3 files changed, 8 insertions, 12 deletions
diff --git a/fs_mgr/Android.bp b/fs_mgr/Android.bp index bf69096ad..196321c74 100644 --- a/fs_mgr/Android.bp +++ b/fs_mgr/Android.bp | |||
@@ -56,20 +56,21 @@ cc_library { | |||
56 | "liblog", | 56 | "liblog", |
57 | "libsquashfs_utils", | 57 | "libsquashfs_utils", |
58 | "libselinux", | 58 | "libselinux", |
59 | "liblp", | ||
59 | ], | 60 | ], |
60 | static_libs: [ | 61 | static_libs: [ |
61 | "libavb", | 62 | "libavb", |
62 | "libfstab", | 63 | "libfstab", |
63 | "libdm", | 64 | "libdm", |
64 | "liblp", | ||
65 | ], | 65 | ], |
66 | export_static_lib_headers: [ | 66 | export_static_lib_headers: [ |
67 | "libfstab", | 67 | "libfstab", |
68 | "libdm", | 68 | "libdm", |
69 | ], | ||
70 | export_shared_lib_headers: [ | ||
69 | "liblp", | 71 | "liblp", |
70 | ], | 72 | ], |
71 | whole_static_libs: [ | 73 | whole_static_libs: [ |
72 | "liblp", | ||
73 | "liblogwrap", | 74 | "liblogwrap", |
74 | "libdm", | 75 | "libdm", |
75 | "libfstab", | 76 | "libfstab", |
diff --git a/fs_mgr/liblp/Android.bp b/fs_mgr/liblp/Android.bp index 1434b212e..89282dbc2 100644 --- a/fs_mgr/liblp/Android.bp +++ b/fs_mgr/liblp/Android.bp | |||
@@ -14,7 +14,7 @@ | |||
14 | // limitations under the License. | 14 | // limitations under the License. |
15 | // | 15 | // |
16 | 16 | ||
17 | cc_library_static { | 17 | cc_library { |
18 | name: "liblp", | 18 | name: "liblp", |
19 | host_supported: true, | 19 | host_supported: true, |
20 | recovery_available: true, | 20 | recovery_available: true, |
@@ -29,17 +29,14 @@ cc_library_static { | |||
29 | "utility.cpp", | 29 | "utility.cpp", |
30 | "writer.cpp", | 30 | "writer.cpp", |
31 | ], | 31 | ], |
32 | static_libs: [ | 32 | shared_libs: [ |
33 | "libbase", | 33 | "libbase", |
34 | "liblog", | 34 | "liblog", |
35 | "libcrypto", | 35 | "libcrypto", |
36 | "libcrypto_utils", | 36 | "libcrypto_utils", |
37 | "libsparse", | 37 | "libsparse", |
38 | ], | ||
39 | whole_static_libs: [ | ||
40 | "libext2_uuid", | 38 | "libext2_uuid", |
41 | "libext4_utils", | 39 | "libext4_utils", |
42 | "libsparse", | ||
43 | "libz", | 40 | "libz", |
44 | ], | 41 | ], |
45 | export_include_dirs: ["include"], | 42 | export_include_dirs: ["include"], |
@@ -51,12 +48,9 @@ cc_test { | |||
51 | cppflags: [ | 48 | cppflags: [ |
52 | "-Wno-unused-parameter", | 49 | "-Wno-unused-parameter", |
53 | ], | 50 | ], |
54 | static_libs: [ | 51 | shared_libs: [ |
55 | "libbase", | ||
56 | "liblog", | ||
57 | "libcrypto", | ||
58 | "libcrypto_utils", | ||
59 | "liblp", | 52 | "liblp", |
53 | "libbase", | ||
60 | "libfs_mgr", | 54 | "libfs_mgr", |
61 | ], | 55 | ], |
62 | srcs: [ | 56 | srcs: [ |
diff --git a/init/Android.mk b/init/Android.mk index a81a0f6b0..d0cb820b5 100644 --- a/init/Android.mk +++ b/init/Android.mk | |||
@@ -67,6 +67,7 @@ LOCAL_STATIC_LIBRARIES := \ | |||
67 | libprotobuf-cpp-lite \ | 67 | libprotobuf-cpp-lite \ |
68 | libpropertyinfoserializer \ | 68 | libpropertyinfoserializer \ |
69 | libpropertyinfoparser \ | 69 | libpropertyinfoparser \ |
70 | liblp \ | ||
70 | 71 | ||
71 | shared_libs := \ | 72 | shared_libs := \ |
72 | libcutils \ | 73 | libcutils \ |