diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2024-03-25 16:16:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-03-25 16:16:47 +0000 |
| commit | 14b1a1985fa19dc298f09cd051f46851d4dcf56c (patch) | |
| tree | b7c7b730cd7a6ae62b0e79de7260a499f1120464 | |
| parent | b0e0d998d2f175a586e48b01d39761e4fceaf662 (diff) | |
| parent | 260be9cbec37956b08618ef148d1d47b7367dacf (diff) | |
| download | protobuf-androidx-transition-release.tar.gz | |
Merge "Snap for 11610999 from 24a7e90629553667d2c1f5f748e5c5242790f7e5 to androidx-transition-release" into androidx-transition-releaseandroidx-transition-release
| -rw-r--r-- | .gitmodules.disabled (renamed from .gitmodules) | 0 | ||||
| -rw-r--r-- | cmake/libprotobuf.cmake | 2 | ||||
| m--------- | third_party/benchmark | 0 | ||||
| m--------- | third_party/googletest | 0 |
4 files changed, 2 insertions, 0 deletions
diff --git a/.gitmodules b/.gitmodules.disabled index bcd125a49..bcd125a49 100644 --- a/.gitmodules +++ b/.gitmodules.disabled diff --git a/cmake/libprotobuf.cmake b/cmake/libprotobuf.cmake index fd70da7e4..71fdb004f 100644 --- a/cmake/libprotobuf.cmake +++ b/cmake/libprotobuf.cmake @@ -126,6 +126,8 @@ if(MSVC AND protobuf_BUILD_SHARED_LIBS) PUBLIC PROTOBUF_USE_DLLS PRIVATE LIBPROTOBUF_EXPORTS) endif() +# Suppress inconsistent-missing-override warnings that are being ignored upstream +target_compile_options(libprotobuf PRIVATE -Wno-inconsistent-missing-override) set_target_properties(libprotobuf PROPERTIES VERSION ${protobuf_VERSION} OUTPUT_NAME ${LIB_PREFIX}protobuf diff --git a/third_party/benchmark b/third_party/benchmark deleted file mode 160000 -Subproject 5b7683f49e1e9223cf9927b24f6fd3d6bd82e3f diff --git a/third_party/googletest b/third_party/googletest deleted file mode 160000 -Subproject 5ec7f0c4a113e2f18ac2c6cc7df51ad6afc2408 |