diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2022-09-28 14:40:59 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-09-28 14:40:59 +0000 |
| commit | 9fd483d058efad52f023e53f038c33101433cf9e (patch) | |
| tree | 1e15cae5b8c1e785b89caf7f7a736f633c79c32b | |
| parent | f83ff54f1d149932fde5add09205f90e0f2d6474 (diff) | |
| parent | e816c6f816e04abdf37474ad80bd5a05db8a38aa (diff) | |
| download | extras-9fd483d058efad52f023e53f038c33101433cf9e.tar.gz | |
Merge "Snap for 9115583 from 05a08b61b838f66b83e38e42a3584cfab4d5186a to gki13-boot-release" into gki13-boot-release
| -rw-r--r-- | libjsonpb/parse/jsonpb.cpp | 4 | ||||
| -rw-r--r-- | module_ndk_libs/libnativehelper/Android.bp | 4 | ||||
| l--------- | mtectrl/.clang-format | 1 |
3 files changed, 7 insertions, 2 deletions
diff --git a/libjsonpb/parse/jsonpb.cpp b/libjsonpb/parse/jsonpb.cpp index 3a042e71..e65a39d1 100644 --- a/libjsonpb/parse/jsonpb.cpp +++ b/libjsonpb/parse/jsonpb.cpp @@ -48,7 +48,7 @@ ErrorOr<std::string> MessageToJsonString(const Message& message) { &json, options); if (!status.ok()) { - return MakeError<std::string>(status.error_message().as_string()); + return MakeError<std::string>(status.message().as_string()); } return ErrorOr<std::string>(std::move(json)); } @@ -61,7 +61,7 @@ ErrorOr<std::monostate> JsonStringToMessage(const std::string& content, Message* std::string binary; auto status = JsonToBinaryString(resolver.get(), GetTypeUrl(*message), content, &binary); if (!status.ok()) { - return MakeError<std::monostate>(status.error_message().as_string()); + return MakeError<std::monostate>(status.message().as_string()); } if (!message->ParseFromString(binary)) { return MakeError<std::monostate>("Fail to parse."); diff --git a/module_ndk_libs/libnativehelper/Android.bp b/module_ndk_libs/libnativehelper/Android.bp index 43043738..e5c63261 100644 --- a/module_ndk_libs/libnativehelper/Android.bp +++ b/module_ndk_libs/libnativehelper/Android.bp @@ -55,4 +55,8 @@ ndk_library { name: "libnativehelper", symbol_file: "libnativehelper.map.txt", first_version: "S", + export_header_libs: [ + "libnativehelper_ndk_headers", + "ndk_jni.h", + ], } diff --git a/mtectrl/.clang-format b/mtectrl/.clang-format new file mode 120000 index 00000000..242a033c --- /dev/null +++ b/mtectrl/.clang-format @@ -0,0 +1 @@ +../../core/.clang-format-2
\ No newline at end of file |