Merge "Remove libnativehelper directories from include_dirs"

This commit is contained in:
Paul Duffin
2019-07-16 19:07:10 +00:00
committed by Gerrit Code Review

View File

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