diff options
| author | 2020-06-01 09:20:10 +0000 | |
|---|---|---|
| committer | 2020-06-01 09:20:10 +0000 | |
| commit | c3508715f3d749cd281675a28e7e198edf6ef3e3 (patch) | |
| tree | 80a46bdf86f8bef7fbd4aed30d43411334b5f99e | |
| parent | f3022ca483ac8e163dba319e5534ab8514a793e9 (diff) | |
| parent | f72f95cacb0987961dc445faf84040372287f185 (diff) | |
Merge changes from topic "b152482542-endrun"
* changes:
Add jni_headers dependencies to hosttests
Add jni_headers dependency to libshim_jni
Add jni_headers dependency to libsmartcamera_jni
Add jni_headers dependency to libperftestscore_jni
Add jni_headers to libframeworks_coretests_jni
7 files changed, 7 insertions, 0 deletions
diff --git a/apct-tests/perftests/core/jni/Android.bp b/apct-tests/perftests/core/jni/Android.bp index 4c0f2aaba145..d160d48538c3 100644 --- a/apct-tests/perftests/core/jni/Android.bp +++ b/apct-tests/perftests/core/jni/Android.bp @@ -10,4 +10,5 @@ cc_library_shared { "-Wunused", "-Wunreachable-code", ], + header_libs: ["jni_headers"], } diff --git a/core/tests/coretests/apks/install_jni_lib/Android.bp b/core/tests/coretests/apks/install_jni_lib/Android.bp index f20f59958736..df19fa09adcf 100644 --- a/core/tests/coretests/apks/install_jni_lib/Android.bp +++ b/core/tests/coretests/apks/install_jni_lib/Android.bp @@ -24,4 +24,5 @@ cc_test_library { "-Wall", "-Werror", ], + header_libs: ["jni_headers"] } diff --git a/core/tests/hosttests/test-apps/SharedUid/32/jni/Android.bp b/core/tests/hosttests/test-apps/SharedUid/32/jni/Android.bp index 6db0ba5f7387..9e6c17f0247a 100644 --- a/core/tests/hosttests/test-apps/SharedUid/32/jni/Android.bp +++ b/core/tests/hosttests/test-apps/SharedUid/32/jni/Android.bp @@ -26,6 +26,7 @@ cc_test_library { // All of the source files that we will compile. srcs: ["native.cpp"], + header_libs: ["jni_headers"], shared_libs: ["liblog"], cflags: [ diff --git a/core/tests/hosttests/test-apps/SharedUid/64/jni/Android.bp b/core/tests/hosttests/test-apps/SharedUid/64/jni/Android.bp index 582f2a7abfb4..91da6e44a8be 100644 --- a/core/tests/hosttests/test-apps/SharedUid/64/jni/Android.bp +++ b/core/tests/hosttests/test-apps/SharedUid/64/jni/Android.bp @@ -25,6 +25,7 @@ cc_test_library { // All of the source files that we will compile. srcs: ["native.cpp"], + header_libs: ["jni_headers"], shared_libs: ["liblog"], cflags: [ diff --git a/core/tests/hosttests/test-apps/SharedUid/dual/jni/Android.bp b/core/tests/hosttests/test-apps/SharedUid/dual/jni/Android.bp index 3e043afee7ec..662755dd35b0 100644 --- a/core/tests/hosttests/test-apps/SharedUid/dual/jni/Android.bp +++ b/core/tests/hosttests/test-apps/SharedUid/dual/jni/Android.bp @@ -27,6 +27,7 @@ cc_test_library { // All of the source files that we will compile. srcs: ["native.cpp"], + header_libs: ["jni_headers"], shared_libs: ["liblog"], cflags: [ diff --git a/packages/CtsShim/build/jni/Android.bp b/packages/CtsShim/build/jni/Android.bp index ea15b43416b4..4fc6e8dfaaee 100644 --- a/packages/CtsShim/build/jni/Android.bp +++ b/packages/CtsShim/build/jni/Android.bp @@ -17,5 +17,6 @@ cc_library_shared { name: "libshim_jni", srcs: ["Shim.c"], + header_libs: ["jni_headers"], sdk_version: "24", } diff --git a/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp b/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp index a23ac38785f6..125deb521ddc 100644 --- a/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp +++ b/tests/Camera2Tests/SmartCamera/SimpleCamera/jni/Android.bp @@ -33,5 +33,6 @@ cc_test_library { "-Werror", "-Wno-unused-parameter", ], + header_libs: ["jni_headers"], stl: "c++_static", } |