From a58ef3567b5dc5fd6b3cb5749c7a6908eeee4764 Mon Sep 17 00:00:00 2001
From: Orion Hodson <oth@google.com>
Date: Wed, 22 Apr 2020 11:10:13 +0100
Subject: [PATCH] Add dependencies on jni_headers

Preparation for removing implicit include paths for jni.h from soong.

Bug: 152482542
Test: m checkbuild
Change-Id: I06873e61e519b6e54d7325f90231bce732790366
Merged-In: I06873e61e519b6e54d7325f90231bce732790366
Exempt-From-Owner-Approval: build clean-up
(cherry picked from commit e32877afccb09f4d6fe0f24586a07f748b92e23e)
---
 libs/input/Android.bp                   | 3 +++
 services/inputflinger/host/Android.bp   | 2 ++
 services/vr/virtual_touchpad/Android.bp | 1 +
 3 files changed, 6 insertions(+)

diff --git a/libs/input/Android.bp b/libs/input/Android.bp
index 2d788119cd..6132b1ceca 100644
--- a/libs/input/Android.bp
+++ b/libs/input/Android.bp
@@ -34,6 +34,9 @@ cc_library {
 
     clang: true,
 
+    header_libs: ["jni_headers"],
+    export_header_lib_headers: ["jni_headers"],
+
     shared_libs: [
         "libbase",
         "liblog",
diff --git a/services/inputflinger/host/Android.bp b/services/inputflinger/host/Android.bp
index cbe0190dfa..b56f356dfd 100644
--- a/services/inputflinger/host/Android.bp
+++ b/services/inputflinger/host/Android.bp
@@ -21,6 +21,7 @@ cc_library_shared {
         "InputHost.cpp",
     ],
 
+    header_libs: ["jni_headers"],
     shared_libs: [
         "libbinder",
         "libcrypto",
@@ -42,6 +43,7 @@ cc_library_shared {
         //-fvisibility=hidden
     ],
 
+    export_header_lib_headers: ["jni_headers"],
     export_include_dirs: ["."],
 }
 
diff --git a/services/vr/virtual_touchpad/Android.bp b/services/vr/virtual_touchpad/Android.bp
index dcaa663160..9cf4905b68 100644
--- a/services/vr/virtual_touchpad/Android.bp
+++ b/services/vr/virtual_touchpad/Android.bp
@@ -14,6 +14,7 @@ shared_libs = [
 ]
 
 header_libraries = [
+    "jni_headers",
     "libdvr_headers",
 ]