commit f24dfb082abc4715024fe7d5e80fdba6b4e08ba2
author Andreas Gampe <agampe@google.com> Wed Nov 01 15:41:25 2017 -0700
committer Andreas Gampe <agampe@google.com> Wed Nov 01 21:07:27 2017 -0700
tree 85536b9259695ac4360261a0b03a4c7c1ea589c0
parent fdb7a61597bd3e836d43d78dd744719bf92b17a1

ART: Clean up global includes - lz4

Remove lz4 from the ART-global includes.

Test: mmma art
Change-Id: Ieb28085e9763631a723799428a77d02df0ba3c78

build/Android.bp

diff --git a/build/Android.bp b/build/Android.bp
index cde0bad..bfe835d 100644
--- a/build/Android.bp
+++ b/build/Android.bp
@@ -127,7 +127,6 @@
     },
 
     include_dirs: [
-        "external/lz4/lib",
         "external/valgrind/include",
         "external/valgrind",
         "external/vixl/src",

dex2oat/Android.bp

diff --git a/dex2oat/Android.bp b/dex2oat/Android.bp
index a93b0e7..6b63878 100644
--- a/dex2oat/Android.bp
+++ b/dex2oat/Android.bp
@@ -39,6 +39,9 @@
         "liblz4",
         "liblzma",
     ],
+    include_dirs: [
+        "external/lz4/lib",
+    ],
     export_include_dirs: ["."],
 
     // For SHA-1 checksumming of build ID

runtime/Android.bp

diff --git a/runtime/Android.bp b/runtime/Android.bp
index f6520a1..881d441 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -405,6 +405,7 @@
     include_dirs: [
         "art/sigchainlib",
         "external/icu/icu4c/source/common",
+        "external/lz4/lib",
     ],
     header_libs: [
         "art_cmdlineparser_headers",