commit ed38697b9f8e4140802f13e3bb4e174bf7201eed
author Orion Hodson <oth@google.com> Mon Jun 01 09:20:10 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 01 09:20:10 2020 +0000
tree d59698b9aacd42201a585bee90f33719caa6338b
parent 43beafe0b045a122d1e352d693abc282f03d4397
parent a58ef3567b5dc5fd6b3cb5749c7a6908eeee4764

Merge "Add dependencies on jni_headers"

libs/input/Android.bp

diff --git a/libs/input/Android.bp b/libs/input/Android.bp
index 2d78811..6132b1c 100644
--- a/libs/input/Android.bp
+++ b/libs/input/Android.bp
@@ -34,6 +34,9 @@
 
     clang: true,
 
+    header_libs: ["jni_headers"],
+    export_header_lib_headers: ["jni_headers"],
+
     shared_libs: [
         "libbase",
         "liblog",

services/inputflinger/host/Android.bp

diff --git a/services/inputflinger/host/Android.bp b/services/inputflinger/host/Android.bp
index cbe0190..b56f356 100644
--- a/services/inputflinger/host/Android.bp
+++ b/services/inputflinger/host/Android.bp
@@ -21,6 +21,7 @@
         "InputHost.cpp",
     ],
 
+    header_libs: ["jni_headers"],
     shared_libs: [
         "libbinder",
         "libcrypto",
@@ -42,6 +43,7 @@
         //-fvisibility=hidden
     ],
 
+    export_header_lib_headers: ["jni_headers"],
     export_include_dirs: ["."],
 }
 

services/vr/virtual_touchpad/Android.bp

diff --git a/services/vr/virtual_touchpad/Android.bp b/services/vr/virtual_touchpad/Android.bp
index dcaa663..9cf4905 100644
--- a/services/vr/virtual_touchpad/Android.bp
+++ b/services/vr/virtual_touchpad/Android.bp
@@ -14,6 +14,7 @@
 ]
 
 header_libraries = [
+    "jni_headers",
     "libdvr_headers",
 ]