diff options
| author | Kaiyi Li <kaiyili@google.com> | 2022-08-27 17:05:16 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-08-27 17:05:16 +0000 |
| commit | a69069de0e96ab7276efb565d50253a72aa784bf (patch) | |
| tree | 15f0e5883c5b158944101612a2f309e85e333c92 | |
| parent | de84b30c30f615bb8b013f98750d16af4bcec8ad (diff) | |
| parent | 376a1f78dce47f61fb22d4432aff87ccbac9eaa6 (diff) | |
| download | flatbuffers-a69069de0e96ab7276efb565d50253a72aa784bf.tar.gz | |
Do not use the version detection script am: 1d621f5aa6 am: 618e703253 am: 993656126a am: 376a1f78dc
Original change: https://android-review.googlesource.com/c/platform/external/flatbuffers/+/2195177
Change-Id: Ic82da896ecca188c04ac3aa25deeffbf80980935
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | CMake/Version.cmake | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/CMake/Version.cmake b/CMake/Version.cmake index a35a1e4e..b4059f73 100644 --- a/CMake/Version.cmake +++ b/CMake/Version.cmake @@ -4,7 +4,9 @@ set(VERSION_PATCH 7) set(VERSION_COMMIT 0) find_program(GIT git) -if(GIT AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") +# TODO(kaiyili, b/243773680): the upstream version detect script will break the +# build. Upstream a change to fix this, and revert the following lines. +if(FALSE AND GIT AND EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/.git") execute_process( COMMAND ${GIT} describe --tags WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} |