Skip to content
Snippets Groups Projects
Commit 63f06b73 authored by Orion Hodson's avatar Orion Hodson
Browse files

Add explicit dependencies on jni_headers

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

Also remove unnecessary jni.h includes from PathParser.{h,cpp}.

Bug: 152482542
Test: lunch aosp_x86_64 && m checkbuild
Change-Id: Ib18afa3d2c93ed3ce69204286d5177991100fd7e
Exempt-From-Owner-Approval: build refactoring
parent 8e8224c9
No related branches found
No related tags found
No related merge requests found
......@@ -28,6 +28,8 @@ cc_binary {
name: "bootanimation",
defaults: ["bootanimation_defaults"],
header_libs: ["jni_headers"],
shared_libs: [
"libOpenSLES",
"libbootanimation",
......
......@@ -14,6 +14,7 @@
cc_library_shared {
name: "libmemoryintarraytest",
header_libs: ["jni_headers"],
shared_libs: [
"libcutils",
],
......@@ -23,4 +24,4 @@ cc_library_shared {
"android_util_MemoryIntArrayTest.cpp",
],
cflags: ["-Werror"],
}
\ No newline at end of file
}
......@@ -16,8 +16,6 @@
#include "PathParser.h"
#include "jni.h"
#include <errno.h>
#include <stdlib.h>
#include <utils/Log.h>
......
......@@ -22,7 +22,6 @@
#include <android/log.h>
#include <cutils/compiler.h>
#include <jni.h>
#include <string>
......
......@@ -65,6 +65,8 @@ cc_library_static {
"-Wno-unused-parameter",
],
header_libs: ["jni_headers"],
shared_libs: [
"libmedia",
"libgui",
......
......@@ -24,6 +24,8 @@ cc_library_shared {
cflags: ["-Werror"],
header_libs: ["jni_headers"],
shared_libs: [
"libdl",
"liblog",
......
......@@ -47,6 +47,7 @@ cc_defaults {
cflags: ["-D_DARWIN_UNLIMITED_STREAMS"],
},
},
header_libs: ["jni_headers"],
static_libs: [
"libandroidfw",
"libutils",
......
......@@ -19,6 +19,7 @@ cc_library {
name: "libdumpcoverage",
srcs: ["dump_coverage.cc"],
header_libs: [
"jni_headers",
"libopenjdkjvmti_headers",
],
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment