diff options
| author | Orion Hodson <oth@google.com> | 2020-04-14 18:57:10 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-04-14 18:57:10 +0000 |
| commit | 5929ad77e0f169e5dcb2e4740aea204bc6bc7ce2 (patch) | |
| tree | 6803a9bb862699fddae41cc76a1c0796bec59190 | |
| parent | c2a42f8e64e0fb40e93a24597cb65a1dbad49028 (diff) | |
| parent | 369b4ca333ba7e00284849da623bc8d90bb5acfc (diff) | |
| download | platform_frameworks_rs-5929ad77e0f169e5dcb2e4740aea204bc6bc7ce2.tar.gz platform_frameworks_rs-5929ad77e0f169e5dcb2e4740aea204bc6bc7ce2.tar.bz2 platform_frameworks_rs-5929ad77e0f169e5dcb2e4740aea204bc6bc7ce2.zip | |
Merge "Add dependencies on jni_headers" am: d3f80c78b0 am: 369b4ca333
Change-Id: I6a7c9dd4efb5695910c81f92c9bcc4fca0429695
| -rw-r--r-- | cpp/Android.bp | 10 | ||||
| -rw-r--r-- | support/jni/Android.bp | 5 |
2 files changed, 13 insertions, 2 deletions
diff --git a/cpp/Android.bp b/cpp/Android.bp index 973c5633e..fc32d52d9 100644 --- a/cpp/Android.bp +++ b/cpp/Android.bp @@ -58,8 +58,14 @@ cc_defaults { // We need to export not just rs/cpp but also rs. This is because // RenderScript.h includes rsCppStructs.h, which includes rs/rsDefines.h. - header_libs: ["rs-headers"], - export_header_lib_headers: ["rs-headers"], + header_libs: [ + "jni_headers", + "rs-headers" + ], + export_header_lib_headers: [ + "jni_headers", + "rs-headers" + ], export_include_dirs: ["."], shared_libs: [ diff --git a/support/jni/Android.bp b/support/jni/Android.bp index 4f4fef80f..331ea01ba 100644 --- a/support/jni/Android.bp +++ b/support/jni/Android.bp @@ -23,6 +23,8 @@ cc_library_shared { "-DRS_COMPATIBILITY_LIB", ], + header_libs: ["jni_headers"], + shared_libs: [ "libandroid", "libdl", @@ -43,6 +45,9 @@ cc_library_shared { srcs: ["android_renderscript_RenderScript.cpp"], + header_libs: ["jni_headers"], + export_header_lib_headers: ["jni_headers"], + shared_libs: [ "libdl", "libjnigraphics", |