enable JNI dependency for android_app example am: 5563202921 am: bf0fbf8ca8 am: 2eca5496d6 am: 978e8e2e9c

Original change: https://android-review.googlesource.com/c/platform/build/bazel/+/2058543

Change-Id: Iebdbb3123c83de8efee2f8411f81e720fefe1414
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

4 files changed, 10 insertions, 10 deletions

diff --git a/examples/android_app/java/com/app/BUILD b/examples/android_app/java/com/app/BUILD
index bd758d0d..786bfbdb 100644
--- a/examples/android_app/java/com/app/BUILD
+++ b/examples/android_app/java/com/app/BUILD
@@ -1,4 +1,6 @@
 load("//build/bazel/rules/android:android_binary.bzl", "android_binary")
+load("//build/bazel/rules/cc:cc_library_static.bzl", "cc_library_static")
+load("//build/bazel/rules/cc:cc_library_shared.bzl", "cc_library_shared")
 load("@rules_android//rules:rules.bzl", "android_library")
 
 android_binary(
@@ -30,14 +32,14 @@ android_binary(
 android_library(
     name = "applib",
     srcs = [
+        "Jni.java",
         "MainActivity.java",
-        #"Jni.java", # TODO(b/220366404): integrate JNI
     ],
     manifest = "AndroidManifest.xml",
     resource_files = glob(["res/**"]),
     deps = [
+        ":jni",
         ":lib",
-        #":jni", # TODO(b/220366404): integrate JNI
     ],
 )
 
@@ -46,16 +48,15 @@ android_library(
     srcs = ["Lib.java"],
 )
 
-cc_library(
+cc_library_shared(
     name = "jni",
     srcs = ["jni.cc"],
-    tags = ["manual"],  # need to be built in android transition, so exclude from ... and :all target patterns
     deps = [":jni_dep"],
 )
 
-cc_library(
+cc_library_static(
     name = "jni_dep",
     srcs = ["jni_dep.cc"],
     hdrs = ["jni_dep.h"],
-    tags = ["manual"],  # need to be built in android transition, so exclude from ... and :all target patterns
+    deps = ["//libnativehelper:jni_headers"],
 )
diff --git a/examples/android_app/java/com/app/Jni.java b/examples/android_app/java/com/app/Jni.java
index 5466b01f..2aea68c3 100644
--- a/examples/android_app/java/com/app/Jni.java
+++ b/examples/android_app/java/com/app/Jni.java
@@ -19,4 +19,3 @@ package com.app;
 public class Jni {
   public static native String hello();
 }
-
diff --git a/examples/android_app/java/com/app/jni.cc b/examples/android_app/java/com/app/jni.cc
index a3996b67..99ef4830 100644
--- a/examples/android_app/java/com/app/jni.cc
+++ b/examples/android_app/java/com/app/jni.cc
@@ -17,10 +17,10 @@
 #include <jni.h>
 #include <string>
 
-#include "java/app/jni_dep.h"
+#include "build/bazel/examples/android_app/java/com/app/jni_dep.h"
 
 extern "C" JNIEXPORT jstring JNICALL
-Java_app_Jni_hello(JNIEnv *env, jclass clazz) {
+Java_com_app_Jni_hello(JNIEnv *env, jclass clazz) {
   std::string hello = "Hello";
   std::string jni = "JNI";
   return NewStringLatin1(env, (hello + " " + jni).c_str());
diff --git a/examples/android_app/java/com/app/jni_dep.cc b/examples/android_app/java/com/app/jni_dep.cc
index fed44c4e..6a6414ff 100644
--- a/examples/android_app/java/com/app/jni_dep.cc
+++ b/examples/android_app/java/com/app/jni_dep.cc
@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "java/app/jni_dep.h"
+#include "build/bazel/examples/android_app/java/com/app/jni_dep.h"
 
 #include <stdlib.h>
 #include <string.h>