diff options
| author | Kah Xuan Lim <kahxuan@google.com> | 2023-08-09 14:26:31 +0800 |
|---|---|---|
| committer | Kah Xuan Lim <kahxuan@google.com> | 2023-10-31 01:54:53 +0000 |
| commit | a7c8adf80ae4d7b62d9c4ab46806bf25d800c65e (patch) | |
| tree | 2930cb0606388c1f4fd3d9ab494a88cabbe75884 | |
| parent | 4caaeccf5e27c826a888968d3ff026a0fadc4712 (diff) | |
| download | tensorflow-a7c8adf80ae4d7b62d9c4ab46806bf25d800c65e.tar.gz | |
Add NNAPI native deps to libtensorflow_jni.so
`delegates/nnapi/java/src/main/native/nnapi_delegate_impl_jni.cc` is not included as srcs for build target `libtensorflow_jni.so` in google3 but not in the Soong build file, which results in runtime error when trying to create NnApiDelegate even when the native library has been loaded.
Bug: 295442020
Change-Id: I82b0dd863c43b32c9b292ecdbe40d2e17e2df364
| -rw-r--r-- | tensorflow/lite/Android.bp | 41 | ||||
| -rw-r--r-- | tensorflow/lite/java/Android.bp | 39 |
2 files changed, 41 insertions, 39 deletions
diff --git a/tensorflow/lite/Android.bp b/tensorflow/lite/Android.bp index 759fede4a86..f7a28b11275 100644 --- a/tensorflow/lite/Android.bp +++ b/tensorflow/lite/Android.bp @@ -155,6 +155,47 @@ cc_library_shared { stl: "libc++_static", } +cc_library_shared { + name: "libtensorflowlite_jni", + sdk_version: "current", + min_sdk_version: "30", + export_include_dirs: [ + "delegates/nnapi/java/src/main/native/", + "java/src/main/native/", + ], + srcs: [ + "delegates/nnapi/java/src/main/native/*.cc", + "java/src/main/native/*.cc", + ], + header_libs: [ + "flatbuffer_headers", + "jni_headers", + "tensorflow_headers", + ], + static_libs: [ + "libruy_static", + "libtflite_static", + ], + shared_libs: [ + "liblog", + ], + cflags: [ + "-Wno-unused-function", + "-Wno-unused-parameter", + ], + ldflags: [ + // Allow (benign) missing symbols referenced in the version script. + "-Wl,--undefined-version", + ], + version_script: "java/tflite_version_script.lds", + stl: "libc++_static", + apex_available: [ + "//apex_available:platform", + "com.android.adservices", + "com.android.extservices", + ], +} + cc_library_static { name: "tflite_mutable_op_resolver", defaults: ["tflite_defaults"], diff --git a/tensorflow/lite/java/Android.bp b/tensorflow/lite/java/Android.bp index 33a7c373dd8..5be051ba90e 100644 --- a/tensorflow/lite/java/Android.bp +++ b/tensorflow/lite/java/Android.bp @@ -41,42 +41,3 @@ java_library_static { "com.android.extservices", ], } - -cc_library_shared { - name: "libtensorflowlite_jni", - sdk_version: "current", - min_sdk_version: "30", - export_include_dirs: [ - "src/main/native/", - ], - srcs: [ - "src/main/native/*.cc", - ], - header_libs: [ - "flatbuffer_headers", - "jni_headers", - "tensorflow_headers", - ], - static_libs: [ - "libruy_static", - "libtflite_static", - ], - shared_libs: [ - "liblog", - ], - cflags: [ - "-Wno-unused-function", - "-Wno-unused-parameter", - ], - ldflags: [ - // Allow (benign) missing symbols referenced in the version script. - "-Wl,--undefined-version", - ], - version_script: "tflite_version_script.lds", - stl: "libc++_static", - apex_available: [ - "//apex_available:platform", - "com.android.adservices", - "com.android.extservices", - ], -} |