From f3b039f1b6eab47c4cc8bc6702b6274192d7ca89 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 12 Jul 2019 14:42:46 +0100 Subject: [PATCH] Remove libnativehelper directories from include_dirs Uses libnativehelper_header_only library headers instead. Needed as libnativehelper is part of the runtime module and so will not be present in an unbundled build, instead its build targets will be provided as prebuilts. Bug: 134379140 Test: m checkbuild Change-Id: I8becbda3a202ddaed52eaf861ac94fe4b08807c2 --- tools/lock_agent/Android.bp | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/tools/lock_agent/Android.bp b/tools/lock_agent/Android.bp index 408946b288369..79dce4a8ce095 100644 --- a/tools/lock_agent/Android.bp +++ b/tools/lock_agent/Android.bp @@ -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", ], }