diff options
| author | Colin Cross <ccross@android.com> | 2022-04-13 02:27:30 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-04-13 02:27:30 +0000 |
| commit | 7563023510bf04108a954596ea9393a4c11ac279 (patch) | |
| tree | 2ce94d7f0804ccb77d1fa9b2a1bca00eecdff1e2 /third_party/abseil-cpp/absl/flags/flag_test_defs.cc | |
| parent | f60eaea2240ba9e1c508e8e0c91d39ee9fc47be5 (diff) | |
| parent | a9167328fc721c9637f0bcd87525cd23ff5ddac1 (diff) | |
| download | webrtc-7563023510bf04108a954596ea9393a4c11ac279.tar.gz | |
Merge changes I0ab600cd,I1e74c64a am: 798f3afdf6 am: 2f9c4b2c3b am: a9167328fct_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-dev
Original change: https://android-review.googlesource.com/c/platform/external/webrtc/+/2062410
Change-Id: I9a35945cfb943544bbb0f4632fef787ea38c1ad1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'third_party/abseil-cpp/absl/flags/flag_test_defs.cc')
| -rw-r--r-- | third_party/abseil-cpp/absl/flags/flag_test_defs.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/abseil-cpp/absl/flags/flag_test_defs.cc b/third_party/abseil-cpp/absl/flags/flag_test_defs.cc index 49f91dee39..4e1693cdb9 100644 --- a/third_party/abseil-cpp/absl/flags/flag_test_defs.cc +++ b/third_party/abseil-cpp/absl/flags/flag_test_defs.cc @@ -20,5 +20,5 @@ ABSL_FLAG(int, mistyped_int_flag, 0, ""); ABSL_FLAG(std::string, mistyped_string_flag, "", ""); -ABSL_RETIRED_FLAG(bool, old_bool_flag, true, - "repetition of retired flag definition"); +ABSL_FLAG(bool, flag_on_separate_file, false, ""); +ABSL_RETIRED_FLAG(bool, retired_flag_on_separate_file, false, ""); |