Revert "libandroidfw hardening for IncFs"
Revert "Move map_ptr to incfs namspace"
Revert submission 12787270
Reason for revert: b/173250495
Reverted Changes:
I5cd1bc8a2:libandroidfw hardening for IncFs
Ice5dbcfb2:Move map_ptr to incfs namspace
I29ccdc8ed:Do not cache bag parent stack until requested
I1e9e9acaa:Cache resolved theme values
Change-Id: Ib90ef68339710086df41e9abe0833a542d03a74f
diff --git a/libs/androidfw/Android.bp b/libs/androidfw/Android.bp
index 696e227..903ca2a 100644
--- a/libs/androidfw/Android.bp
+++ b/libs/androidfw/Android.bp
@@ -61,9 +61,6 @@
],
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: [
@@ -72,14 +69,13 @@
"CursorWindow.cpp",
],
shared_libs: [
+ "libziparchive",
"libbase",
"libbinder",
"liblog",
"libcutils",
- "libincfs",
"libutils",
"libz",
- "libziparchive",
],
static: {
enabled: false,
@@ -90,11 +86,11 @@
enabled: false,
},
static_libs: [
- "libbase",
- "libcutils",
- "liblog",
- "libutils",
"libziparchive",
+ "libbase",
+ "liblog",
+ "libcutils",
+ "libutils",
],
shared_libs: [
"libz",