diff options
| author | Ryan Mitchell <rtmitchell@google.com> | 2020-11-16 23:08:18 +0000 |
|---|---|---|
| committer | Ryan Mitchell <rtmitchell@google.com> | 2020-12-08 16:58:12 +0000 |
| commit | 80094e39f90801c44cd80ab0f98df505828ea1f3 (patch) | |
| tree | e70d5241691a509ce9cf774dc39ce85932fdd1d2 /libs/androidfw/Android.bp | |
| parent | ec7e7f5622e3444a3003db20ddfd8f5745971fa7 (diff) | |
Revert^2 "libandroidfw hardening for IncFs"
55ef6167a2c235bd88c7216238b2001b46795b79
Change-Id: I02d4890d181655dfd0a14c188468db512559d27b
Merged-In: I02d4890d181655dfd0a14c188468db512559d27b
Diffstat (limited to 'libs/androidfw/Android.bp')
| -rw-r--r-- | libs/androidfw/Android.bp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp index aa34edf487fe..6a7df94331f3 100644 --- a/libs/androidfw/Android.bp +++ b/libs/androidfw/Android.bp @@ -61,6 +61,9 @@ cc_library { ], export_include_dirs: ["include"], export_shared_lib_headers: ["libz"], + static_libs: ["libincfs-utils"], + whole_static_libs: ["libincfs-utils"], + export_static_lib_headers: ["libincfs-utils"], target: { android: { srcs: [ @@ -69,13 +72,14 @@ cc_library { "CursorWindow.cpp", ], shared_libs: [ - "libziparchive", "libbase", "libbinder", "liblog", "libcutils", + "libincfs", "libutils", "libz", + "libziparchive", ], static: { enabled: false, @@ -86,11 +90,11 @@ cc_library { enabled: false, }, static_libs: [ - "libziparchive", "libbase", - "liblog", "libcutils", + "liblog", "libutils", + "libziparchive", ], shared_libs: [ "libz", |