Cleanup some usages of include_dirs
The include_dirs property causes problems when unbundling as they can
directly reference directories inside the runtime module repositories
which will break the unbundled build as those repositories will not be
present. While these usages do not cause problems as they are
references within the runtime module repository they need removing so
that the build can enforce no usage of runtime module repository paths
in the include_dirs property.
This change:
* Replaces include_dirs with local_include_dirs where possible.
* Uses libnativehelper provided header libs, this is possible as they
have been updated to build against the NDK.
* Adds headers for disassembler, libdexfile
* Makes libart_runtime_headers build against NDK.
Test: m checkbuild
Bug: 134379140
Change-Id: Iaf065caf4b6a2fcf252f6d5da8fff5be97a242ea
diff --git a/runtime/Android.bp b/runtime/Android.bp
index db4ef02..895e2c6 100644
--- a/runtime/Android.bp
+++ b/runtime/Android.bp
@@ -679,9 +679,10 @@
}
cc_library_headers {
- name: "libart_runtime_headers",
+ name: "libart_runtime_headers_ndk",
host_supported: true,
export_include_dirs: ["."],
+ sdk_version: "current",
}
genrule {