diff options
| author | Xin Li <delphij@google.com> | 2020-08-27 10:16:38 -0700 |
|---|---|---|
| committer | Xin Li <delphij@google.com> | 2020-08-27 10:16:38 -0700 |
| commit | 9f55db6ecbe2195e7c32c1376e8c370b870e3997 (patch) | |
| tree | 0d01efa1f64e5482aaccd1347b023501123c0d7c | |
| parent | 238eeca9461f65010b19e176c0eab98176498598 (diff) | |
| parent | b010860d951afa8c1595fc9f7c326c0ba297e472 (diff) | |
| download | tensorflow-temp_sam_168057903.tar.gz | |
Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903
Bug: 166295507
Merged-In: I817f32f0a3e0e444c40193dfd03fa1ee62fc81bb
Change-Id: If9b012a86fc5405288061a3fe0fe28657611d768
| -rw-r--r-- | Android.bp | 1 | ||||
| -rw-r--r-- | tensorflow/lite/minimal_logging_android.cc | 3 | ||||
| -rw-r--r-- | tensorflow/lite/tflite_static.bp | 7 |
3 files changed, 9 insertions, 2 deletions
diff --git a/Android.bp b/Android.bp index 5ff32738564..d8443e77070 100644 --- a/Android.bp +++ b/Android.bp @@ -20,6 +20,7 @@ cc_library_headers { apex_available: [ "com.android.neuralnetworks", "test_com.android.neuralnetworks", + "com.android.extservices", "//apex_available:platform", ], } diff --git a/tensorflow/lite/minimal_logging_android.cc b/tensorflow/lite/minimal_logging_android.cc index 92a6980ce5d..ec74e344592 100644 --- a/tensorflow/lite/minimal_logging_android.cc +++ b/tensorflow/lite/minimal_logging_android.cc @@ -42,7 +42,8 @@ void MinimalLogger::LogFormatted(LogSeverity severity, const char* format, // First log to Android's explicit log(cat) API. va_list args_for_android_log; va_copy(args_for_android_log, args); - __android_log_vprint(GetPlatformSeverity(severity), "tflite", format, args); + __android_log_vprint(GetPlatformSeverity(severity), "tflite", format, + args_for_android_log); va_end(args_for_android_log); // Also print to stderr for standard console applications. diff --git a/tensorflow/lite/tflite_static.bp b/tensorflow/lite/tflite_static.bp index 770f5a589f9..5a552db2adc 100644 --- a/tensorflow/lite/tflite_static.bp +++ b/tensorflow/lite/tflite_static.bp @@ -171,7 +171,7 @@ cc_library_static { "external/eigen", "external/flatbuffers/include", "external/gemmlowp", - "external/libtextclassifier", + "external/libtextclassifier/native/", "external/tensorflow", ], whole_static_libs: [ @@ -202,4 +202,9 @@ cc_library_static { "-Wno-visibility", ], stl: "libc++_static", + + apex_available: [ + "//apex_available:platform", + "com.android.extservices", + ], } |