Add explicit dependencies on jni_headers
Bug: 152482542
Test: lunch aosp_x86_64 && m checkbuild
Change-Id: I1859a5b15d7e1a4939968908d862d27b2345acc4
diff --git a/tools/cpp-define-generator/Android.bp b/tools/cpp-define-generator/Android.bp
index 65310b8..c0b236c 100644
--- a/tools/cpp-define-generator/Android.bp
+++ b/tools/cpp-define-generator/Android.bp
@@ -25,6 +25,7 @@
],
header_libs: [
"art_libartbase_headers", // For base/bit_utils.h
+ "jni_headers",
"libart_runtime_headers_ndk",
"libdexfile_all_headers", // For dex/modifiers.h
],
diff --git a/tools/jvmti-agents/breakpoint-logger/Android.bp b/tools/jvmti-agents/breakpoint-logger/Android.bp
index 57878cd..a18b298 100644
--- a/tools/jvmti-agents/breakpoint-logger/Android.bp
+++ b/tools/jvmti-agents/breakpoint-logger/Android.bp
@@ -36,6 +36,7 @@
},
},
header_libs: [
+ "jni_headers",
"libopenjdkjvmti_headers",
],
}
diff --git a/tools/jvmti-agents/dump-jvmti-state/Android.bp b/tools/jvmti-agents/dump-jvmti-state/Android.bp
index 3a48941..7bbe062 100644
--- a/tools/jvmti-agents/dump-jvmti-state/Android.bp
+++ b/tools/jvmti-agents/dump-jvmti-state/Android.bp
@@ -29,6 +29,7 @@
"libbase",
],
header_libs: [
+ "jni_headers",
"libopenjdkjvmti_headers",
],
}
diff --git a/tools/jvmti-agents/field-counts/Android.bp b/tools/jvmti-agents/field-counts/Android.bp
index a91af99..ae4e0ef 100644
--- a/tools/jvmti-agents/field-counts/Android.bp
+++ b/tools/jvmti-agents/field-counts/Android.bp
@@ -24,9 +24,9 @@
// to be same ISA as what it is attached to.
compile_multilib: "both",
header_libs: [
+ "jni_headers",
"libopenjdkjvmti_headers",
"libnativehelper_header_only",
- "jni_headers",
],
}
diff --git a/tools/jvmti-agents/field-null-percent/Android.bp b/tools/jvmti-agents/field-null-percent/Android.bp
index 4950b7f..31dbef9 100644
--- a/tools/jvmti-agents/field-null-percent/Android.bp
+++ b/tools/jvmti-agents/field-null-percent/Android.bp
@@ -24,6 +24,7 @@
// to be same ISA as what it is attached to.
compile_multilib: "both",
header_libs: [
+ "jni_headers",
"libopenjdkjvmti_headers",
],
}
diff --git a/tools/jvmti-agents/jit-load/Android.bp b/tools/jvmti-agents/jit-load/Android.bp
index 5adf98c..8d53d18 100644
--- a/tools/jvmti-agents/jit-load/Android.bp
+++ b/tools/jvmti-agents/jit-load/Android.bp
@@ -38,6 +38,7 @@
},
},
header_libs: [
+ "jni_headers",
"libopenjdkjvmti_headers",
],
}
diff --git a/tools/jvmti-agents/list-extensions/Android.bp b/tools/jvmti-agents/list-extensions/Android.bp
index 09ba5aa..1a07345 100644
--- a/tools/jvmti-agents/list-extensions/Android.bp
+++ b/tools/jvmti-agents/list-extensions/Android.bp
@@ -29,6 +29,7 @@
"libbase",
],
header_libs: [
+ "jni_headers",
"libopenjdkjvmti_headers",
],
}
diff --git a/tools/jvmti-agents/titrace/Android.bp b/tools/jvmti-agents/titrace/Android.bp
index 21c2bf0..0720a6a 100644
--- a/tools/jvmti-agents/titrace/Android.bp
+++ b/tools/jvmti-agents/titrace/Android.bp
@@ -39,6 +39,7 @@
},
},
header_libs: [
+ "jni_headers",
"libopenjdkjvmti_headers",
"libdexfile_all_headers", // for dex_instruction_list.h only
],
diff --git a/tools/jvmti-agents/wrapagentproperties/Android.bp b/tools/jvmti-agents/wrapagentproperties/Android.bp
index 88b1e67..1c808c1 100644
--- a/tools/jvmti-agents/wrapagentproperties/Android.bp
+++ b/tools/jvmti-agents/wrapagentproperties/Android.bp
@@ -36,6 +36,7 @@
},
},
header_libs: [
+ "jni_headers",
"libopenjdkjvmti_headers",
],
}