commit db21f09a8e02bcfd3fefea68084667688268f1fa
author Ryan Mitchell <rtmitchell@google.com> Mon Nov 16 23:08:18 2020 +0000
committer Ryan Mitchell <rtmitchell@google.com> Tue Nov 17 23:01:35 2020 +0000
tree c9b22a2676936eaf56ee1160c9349632ccd7ba44
parent 687f5e163f24ff31f822f986fd7a99b8832b6286

Revert^2 "libandroidfw hardening for IncFs"

55ef6167a2c235bd88c7216238b2001b46795b79

Change-Id: I02d4890d181655dfd0a14c188468db512559d27b

libs/androidfw/Android.bp

diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp
index a3fcf90..8330363 100644
--- a/libs/androidfw/Android.bp
+++ b/libs/androidfw/Android.bp
@@ -61,6 +61,9 @@
     ],
     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 @@
                 "CursorWindow.cpp",
             ],
             shared_libs: [
-                "libziparchive",
                 "libbase",
                 "libbinder",
                 "liblog",
                 "libcutils",
+                "libincfs",
                 "libutils",
                 "libz",
+                "libziparchive",
             ],
             static: {
                 enabled: false,
@@ -86,11 +90,11 @@
                 enabled: false,
             },
             static_libs: [
-                "libziparchive",
                 "libbase",
-                "liblog",
                 "libcutils",
+                "liblog",
                 "libutils",
+                "libziparchive",
             ],
             shared_libs: [
                 "libz",