Merge "Remove libnativehelper directories from include_dirs" am: 0a79f4476a am: 83d403b80a

am: 3dad7f69c4

Change-Id: Iff049c73aa7049fed7425b9ffa2dd2ba82c8f0b7
This commit is contained in:
Paul Duffin
2019-07-16 13:11:48 -07:00
committed by android-build-merger

View File

@@ -12,13 +12,9 @@ cc_library {
],
sdk_version: "current",
stl: "c++_static",
include_dirs: [
// NDK headers aren't available in platform NDK builds.
"libnativehelper/include_jni",
// Use ScopedUtfChars.
"libnativehelper/header_only_include",
],
header_libs: [
// Use ScopedUtfChars.
"libnativehelper_header_only",
"libopenjdkjvmti_headers",
],
compile_multilib: "both",
@@ -32,13 +28,9 @@ cc_binary_host {
"libz",
"slicer",
],
include_dirs: [
// NDK headers aren't available in platform NDK builds.
"libnativehelper/include_jni",
// Use ScopedUtfChars.
"libnativehelper/header_only_include",
],
header_libs: [
// Use ScopedUtfChars.
"libnativehelper_header_only",
"libopenjdkjvmti_headers",
],
}