commit 9b123643c1350303f9ab7b83c7f6c5a84ae2ba00
author Orion Hodson <oth@google.com> Tue Apr 14 18:37:23 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Apr 14 18:37:23 2020 +0000
tree eb0b5589206b3e041548808bb85f7323603fd8d9
parent 81a6c2ae580605d7a68f575842668a3a6f5804da
parent 86d9a592ede44cdb4e5dbc46aa14fdae6565b189

Add explicit dependencies on jni_headers am: 86d9a592ed

Change-Id: I45b19a32b1218d4030b5578fc592b17a248ba97d

apps/alloc_stress_app/Android.bp

diff --git a/apps/alloc_stress_app/Android.bp b/apps/alloc_stress_app/Android.bp
index 110523d..144be77 100644
--- a/apps/alloc_stress_app/Android.bp
+++ b/apps/alloc_stress_app/Android.bp
@@ -17,6 +17,7 @@
     sdk_version: "26", // Oreo
     cppflags: ["-std=c++11"],
     srcs: ["src/cpp/alloc_stress_activity.cpp"],
+    header_libs: ["jni_headers"],
     shared_libs: ["liblog"],
     stl: "c++_static",
 }

benchmark_libs/Android.bp

diff --git a/benchmark_libs/Android.bp b/benchmark_libs/Android.bp
index c6fcfde..ef17a91 100644
--- a/benchmark_libs/Android.bp
+++ b/benchmark_libs/Android.bp
@@ -21,6 +21,7 @@
     ],
 
     export_include_dirs: ["."],
+    header_libs: ["jni_headers"],
     shared_libs: [
         "liblog",
         "libnativewindow",

benchmark_libs/agq.h

diff --git a/benchmark_libs/agq.h b/benchmark_libs/agq.h
index 7c86b95..70aa3f5 100644
--- a/benchmark_libs/agq.h
+++ b/benchmark_libs/agq.h
@@ -17,7 +17,6 @@
 #ifndef AGQ_H
 #define AGQ_H
 
-#include <jni.h>
 #include <android/native_activity.h>
 
 namespace android {

functional_tests/java/Android.bp

diff --git a/functional_tests/java/Android.bp b/functional_tests/java/Android.bp
index 476bce8..4f60661 100644
--- a/functional_tests/java/Android.bp
+++ b/functional_tests/java/Android.bp
@@ -17,6 +17,7 @@
     sdk_version: "26", // Oreo
     srcs: ["src/cpp/surface_flinger_test_activity.cpp", "src/cpp/native_choreo_activity.cpp",],
     stl: "c++_shared",
+    header_libs: ["jni_headers"],
     shared_libs: [
         "liblog",
         "libandroid",