From 54c4f2afb5a7fb8d974d78f401fa4e421675a18f Mon Sep 17 00:00:00 2001 From: Orion Hodson Date: Fri, 3 Apr 2020 12:45:16 +0100 Subject: [PATCH] Add explicit dependencies on jni_headers Preparation for removing implicit include paths for jni.h from soong. Bug: 152482542 Test: lunch aosp_x86_64 && m checkbuild Change-Id: Ib36e679819a3309ccbf12fd592309b16c8bbd6c8 --- native/dicttoolkit/Android.bp | 1 + native/jni/Android.bp | 2 ++ 2 files changed, 3 insertions(+) diff --git a/native/dicttoolkit/Android.bp b/native/dicttoolkit/Android.bp index b214ff984..fd35697c1 100644 --- a/native/dicttoolkit/Android.bp +++ b/native/dicttoolkit/Android.bp @@ -37,6 +37,7 @@ cc_defaults { "-Wno-unused-function", ], + header_libs: ["jni_headers"], local_include_dirs: ["src"], // TODO include_dirs: ["packages/inputmethods/LatinIME/native/jni/src"], diff --git a/native/jni/Android.bp b/native/jni/Android.bp index 5649fc1ea..7419ed1fe 100644 --- a/native/jni/Android.bp +++ b/native/jni/Android.bp @@ -130,6 +130,7 @@ cc_library { "-Wno-unused-parameter", "-Wno-unused-function", ], + header_libs: ["jni_headers"], local_include_dirs: ["src"], srcs: [ @@ -167,6 +168,7 @@ cc_library_static { "-Wall", "-Werror", ], + header_libs: ["jni_headers"], local_include_dirs: ["src"], sdk_version: "14", stl: "libc++_static",