Move most of runtime/base to libartbase/base
Enforce the layering that code in runtime/base should not depend on
runtime by separating it into libartbase. Some of the code in
runtime/base depends on the Runtime class, so it cannot be moved yet.
Also, some of the tests depend on CommonRuntimeTest, which itself needs
to be factored (in a subsequent CL).
Bug: 22322814
Test: make -j 50 checkbuild
make -j 50 test-art-host
Change-Id: I8b096c1e2542f829eb456b4b057c71421b77d7e2
Merged-In: c431b9dc4b23cc950eb313695258df5d89f53b22
(cherry picked from commit c431b9dc4b23cc950eb313695258df5d89f53b22)
diff --git a/libdexfile/Android.bp b/libdexfile/Android.bp
index 797b459..ae4ded5 100644
--- a/libdexfile/Android.bp
+++ b/libdexfile/Android.bp
@@ -24,6 +24,7 @@
"dex/descriptors_names.cc",
"dex/dex_file.cc",
"dex/dex_file_exception_helpers.cc",
+ "dex/dex_file_layout.cc",
"dex/dex_file_loader.cc",
"dex/dex_file_tracking_registrar.cc",
"dex/dex_file_verifier.cc",
@@ -54,6 +55,9 @@
},
generated_sources: ["dexfile_operator_srcs"],
shared_libs: [
+ // Important note: relying on libartbase's header_lib is perfectly acceptable.
+ // However, relying on the libartbase shared library introduces further, possibly cyclic,
+ // dependencies for clients outside of ART.
"liblog",
// For common macros.
"libbase",
@@ -77,6 +81,7 @@
tools: ["generate_operator_out"],
srcs: [
"dex/dex_file.h",
+ "dex/dex_file_layout.h",
"dex/dex_instruction.h",
"dex/dex_instruction_utils.h",
"dex/invoke_type.h",