commit 373a9b5c718a45ac484afcf4fe6ce84f4bb562b3
author Andreas Gampe <agampe@google.com> Wed Oct 18 09:01:57 2017 -0700
committer Andreas Gampe <agampe@google.com> Wed Oct 25 10:13:59 2017 -0700
tree 52a3e78fa8bc94a76674caaae837c728332d05dc
parent d0332e01ac26c2fd0a900de000a55ed5768ff936

ART: Depend on libnativehelper headers only

Depend on header-only versions where possible. Move projects
excluding libart to libnativehelper_header_only.

Bug: 65522645
Test: mmma art
Change-Id: I53dd3b2a97e94ee685f72de007ed3858f7f5c6b6

compiler/Android.bp

diff --git a/compiler/Android.bp b/compiler/Android.bp
index c2984e1..fe0f3c7 100644
--- a/compiler/Android.bp
+++ b/compiler/Android.bp
@@ -191,11 +191,11 @@
     shared_libs: [
         "libbase",
         "liblzma",
-        "libnativehelper",
     ],
     include_dirs: ["art/disassembler"],
     header_libs: [
         "art_cmdlineparser_headers",  // For compiler_options.
+        "libnativehelper_header_only",
     ],
 
     export_include_dirs: ["."],
@@ -407,7 +407,10 @@
         },
     },
 
-    header_libs: ["libart_simulator_headers"],
+    header_libs: [
+        "libart_simulator_headers",
+        "libnativehelper_header_only",
+    ],
 
     shared_libs: [
         "libartd-compiler",
@@ -416,7 +419,6 @@
         "libvixld-arm64",
 
         "libbacktrace",
-        "libnativehelper",
         "libnativeloader",
     ],