commit eafeeb281349ff6d035888fbc4b05aed87529c72
author Paul Duffin <paulduffin@google.com> Fri Jul 19 10:22:32 2019 +0100
committer Paul Duffin <paulduffin@google.com> Fri Jul 19 18:13:40 2019 +0000
tree bdb88ad9e819f41791cde63b92362446a130fef6
parent de0ccffc5e8b22f86730b125cd3cfd825a576ba7

Replace use of include_dirs with header_libs on asm_defines.s

Depends on change to add support for header_libs to cc_object.

This change:
* Removes unused art/libartbase and system/core/base/include from
  asm_defines.s.
* Replaces include_dirs with header_libs.

Bug: 35624006
Test: m cpp-define-generator-asm-support - compare output before and after change
Change-Id: I1475193e057abe2a6e7a320fcc989fa37d37792f

tools/cpp-define-generator/Android.bp

diff --git a/tools/cpp-define-generator/Android.bp b/tools/cpp-define-generator/Android.bp
index 027f128..1f0d264 100644
--- a/tools/cpp-define-generator/Android.bp
+++ b/tools/cpp-define-generator/Android.bp
@@ -23,12 +23,10 @@
         "art_debug_defaults",
         "art_defaults",
     ],
-    include_dirs: [
-        "art/libartbase",
-        "art/libdexfile",
-        "art/libartbase",
-        "art/runtime",
-        "system/core/base/include",
+    header_libs: [
+        "art_libartbase_headers", // For base/bit_utils.h
+        "libart_runtime_headers_ndk",
+        "libdexfile_all_headers", // For dex/modifiers.h
     ],
     // Produce text file rather than binary.
     cflags: ["-S"],