Merge "Add explicit dependencies on jni_headers"

This commit is contained in:
Orion Hodson
2020-04-16 10:29:06 +00:00
committed by Gerrit Code Review
8 changed files with 10 additions and 4 deletions

View File

@@ -28,6 +28,8 @@ cc_binary {
name: "bootanimation", name: "bootanimation",
defaults: ["bootanimation_defaults"], defaults: ["bootanimation_defaults"],
header_libs: ["jni_headers"],
shared_libs: [ shared_libs: [
"libOpenSLES", "libOpenSLES",
"libbootanimation", "libbootanimation",

View File

@@ -14,6 +14,7 @@
cc_library_shared { cc_library_shared {
name: "libmemoryintarraytest", name: "libmemoryintarraytest",
header_libs: ["jni_headers"],
shared_libs: [ shared_libs: [
"libcutils", "libcutils",
], ],

View File

@@ -16,8 +16,6 @@
#include "PathParser.h" #include "PathParser.h"
#include "jni.h"
#include <errno.h> #include <errno.h>
#include <stdlib.h> #include <stdlib.h>
#include <utils/Log.h> #include <utils/Log.h>

View File

@@ -22,7 +22,6 @@
#include <android/log.h> #include <android/log.h>
#include <cutils/compiler.h> #include <cutils/compiler.h>
#include <jni.h>
#include <string> #include <string>

View File

@@ -65,6 +65,8 @@ cc_library_static {
"-Wno-unused-parameter", "-Wno-unused-parameter",
], ],
header_libs: ["jni_headers"],
shared_libs: [ shared_libs: [
"libmedia", "libmedia",
"libgui", "libgui",

View File

@@ -24,6 +24,8 @@ cc_library_shared {
cflags: ["-Werror"], cflags: ["-Werror"],
header_libs: ["jni_headers"],
shared_libs: [ shared_libs: [
"libdl", "libdl",
"liblog", "liblog",

View File

@@ -47,6 +47,7 @@ cc_defaults {
cflags: ["-D_DARWIN_UNLIMITED_STREAMS"], cflags: ["-D_DARWIN_UNLIMITED_STREAMS"],
}, },
}, },
header_libs: ["jni_headers"],
static_libs: [ static_libs: [
"libandroidfw", "libandroidfw",
"libutils", "libutils",

View File

@@ -19,6 +19,7 @@ cc_library {
name: "libdumpcoverage", name: "libdumpcoverage",
srcs: ["dump_coverage.cc"], srcs: ["dump_coverage.cc"],
header_libs: [ header_libs: [
"jni_headers",
"libopenjdkjvmti_headers", "libopenjdkjvmti_headers",
], ],