Merge changes from upstream
Commands: git clone https://fuchsia.googlesource.com/third_party/abseil-cpp cd abseil-cpp git checkout upstream/master git checkout origin/master -b ${USER}-merge git merge upstream/master New version of Tink needed by Cobalt uses flat_hash_map. Change-Id: Icefc708c0b6dedf3ef4981f7b19ca2036a3c9a6b
Showing
- .gitignore 13 additions, 0 deletions.gitignore
- CMake/AbseilHelpers.cmake 208 additions, 123 deletionsCMake/AbseilHelpers.cmake
- CMake/AbseilInstallDirs.cmake 20 additions, 0 deletionsCMake/AbseilInstallDirs.cmake
- CMake/Googletest/CMakeLists.txt.in 0 additions, 0 deletionsCMake/Googletest/CMakeLists.txt.in
- CMake/Googletest/DownloadGTest.cmake 1 addition, 1 deletionCMake/Googletest/DownloadGTest.cmake
- CMake/README.md 9 additions, 15 deletionsCMake/README.md
- CMake/abslConfig.cmake.in 7 additions, 0 deletionsCMake/abslConfig.cmake.in
- CMake/install_test_project/CMakeLists.txt 27 additions, 0 deletionsCMake/install_test_project/CMakeLists.txt
- CMake/install_test_project/simple.cc 23 additions, 0 deletionsCMake/install_test_project/simple.cc
- CMake/install_test_project/test.sh 144 additions, 0 deletionsCMake/install_test_project/test.sh
- CMakeLists.txt 86 additions, 24 deletionsCMakeLists.txt
- CONTRIBUTING.md 47 additions, 0 deletionsCONTRIBUTING.md
- LICENSE 3 additions, 4 deletionsLICENSE
- LTS.md 2 additions, 0 deletionsLTS.md
- README.md 13 additions, 7 deletionsREADME.md
- UPGRADES.md 17 additions, 0 deletionsUPGRADES.md
- WORKSPACE 30 additions, 14 deletionsWORKSPACE
- absl/BUILD.bazel 11 additions, 6 deletionsabsl/BUILD.bazel
- absl/CMakeLists.txt 4 additions, 1 deletionabsl/CMakeLists.txt
- absl/algorithm/BUILD.bazel 9 additions, 2 deletionsabsl/algorithm/BUILD.bazel
Loading
Please register or sign in to comment