Merge "Add explicit dependencies on jni_headers" am: d3af5a28ea
am: aab67ba15e
am: e04cfb092e
am: 3b8eaf98ca
Change-Id: I4c9319ccd0699e04d088d4e27430a2326b70bcfbmain
commit
10b9098292
|
@ -37,6 +37,7 @@ cc_defaults {
|
||||||
"-Wno-unused-function",
|
"-Wno-unused-function",
|
||||||
],
|
],
|
||||||
|
|
||||||
|
header_libs: ["jni_headers"],
|
||||||
local_include_dirs: ["src"],
|
local_include_dirs: ["src"],
|
||||||
// TODO
|
// TODO
|
||||||
include_dirs: ["packages/inputmethods/LatinIME/native/jni/src"],
|
include_dirs: ["packages/inputmethods/LatinIME/native/jni/src"],
|
||||||
|
|
|
@ -130,6 +130,7 @@ cc_library {
|
||||||
"-Wno-unused-parameter",
|
"-Wno-unused-parameter",
|
||||||
"-Wno-unused-function",
|
"-Wno-unused-function",
|
||||||
],
|
],
|
||||||
|
header_libs: ["jni_headers"],
|
||||||
local_include_dirs: ["src"],
|
local_include_dirs: ["src"],
|
||||||
|
|
||||||
srcs: [
|
srcs: [
|
||||||
|
@ -167,6 +168,7 @@ cc_library_static {
|
||||||
"-Wall",
|
"-Wall",
|
||||||
"-Werror",
|
"-Werror",
|
||||||
],
|
],
|
||||||
|
header_libs: ["jni_headers"],
|
||||||
local_include_dirs: ["src"],
|
local_include_dirs: ["src"],
|
||||||
sdk_version: "14",
|
sdk_version: "14",
|
||||||
stl: "libc++_static",
|
stl: "libc++_static",
|
||||||
|
|
Loading…
Reference in New Issue