commit d3fd1ae6ba5d8f7bee765ad10988b0136dcbc8a5
author Orion Hodson <oth@google.com> Fri Apr 03 09:42:02 2020 +0100
committer Orion Hodson <oth@google.com> Thu Apr 16 08:26:03 2020 +0000
tree e404848d79df532dda349b3f4a75cd4883219852
parent 8607a8bae7da02e77166da6079f4a1ff24261919

Add explicit dependencies on jni_headers

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

Bug: 152482542
Test: m
Change-Id: Idbd0632428ae2ecf1de64c4a8b6467bea6516373
Exempt-From-Owner-Approval: build refactoring

media/libmedia/Android.bp

diff --git a/media/libmedia/Android.bp b/media/libmedia/Android.bp
index 778ee44..b56ea56 100644
--- a/media/libmedia/Android.bp
+++ b/media/libmedia/Android.bp
@@ -282,11 +282,13 @@
         "bionic_libc_platform_headers",
         "libstagefright_headers",
         "media_ndk_headers",
+        "jni_headers",
     ],
 
     export_header_lib_headers: [
         "libstagefright_headers",
         "media_ndk_headers",
+        "jni_headers",
     ],
 
     shared_libs: [

media/ndk/Android.bp

diff --git a/media/ndk/Android.bp b/media/ndk/Android.bp
index 24cad4d..ce91249 100644
--- a/media/ndk/Android.bp
+++ b/media/ndk/Android.bp
@@ -70,6 +70,7 @@
     ],
 
     header_libs: [
+        "jni_headers",
         "libmediadrm_headers",
     ],
 
@@ -97,6 +98,8 @@
         "libmediandk_utils",
     ],
 
+    export_header_lib_headers: ["jni_headers"],
+
     export_include_dirs: ["include"],
 
     export_shared_lib_headers: [