ART: Clean up global includes - zlib
Remove zlib from the ART-global includes.
Test: mmma art
Change-Id: Ib5c12d46aae9cc1288c7a4f2f7e0f60444f2c6e0
diff --git a/build/Android.bp b/build/Android.bp
index bfe835d..1c183b3 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -130,7 +130,6 @@
"external/valgrind/include",
"external/valgrind",
"external/vixl/src",
- "external/zlib",
],
header_libs: [
"jni_platform_headers",
diff --git a/compiler/Android.bp b/compiler/Android.bp
index fe0f3c7..8599471 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -422,6 +422,10 @@
"libnativeloader",
],
+ include_dirs: [
+ "external/zlib",
+ ],
+
target: {
host: {
shared_libs: [
diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index 6b63878..13d2655 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -41,6 +41,7 @@
],
include_dirs: [
"external/lz4/lib",
+ "external/zlib",
],
export_include_dirs: ["."],
@@ -223,6 +224,9 @@
"linker/oat_writer_test.cc",
],
header_libs: ["dex2oat_headers"],
+ include_dirs: [
+ "external/zlib",
+ ],
shared_libs: [
"libartd-compiler",
"libartd-dexlayout",
diff --git a/runtime/Android.bp b/runtime/Android.bp
index 881d441..31d951e 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -406,6 +406,7 @@
"art/sigchainlib",
"external/icu/icu4c/source/common",
"external/lz4/lib",
+ "external/zlib",
],
header_libs: [
"art_cmdlineparser_headers",
@@ -628,6 +629,9 @@
header_libs: [
"art_cmdlineparser_headers", // For parsed_options_test.
],
+ include_dirs: [
+ "external/zlib",
+ ],
}
art_cc_test {