aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-13Jeff moved to a different team so remove him from OWNERS am: 6acca678b8 am: ↵HEADandroid-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16aml_rkp_341510000aml_rkp_341311000aml_rkp_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341613000aml_hef_341512030aml_hef_341415040aml_hef_341311010aml_hef_341114030aml_cfg_341510000mastermainandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseandroid14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-mainline-healthfitness-releaseandroid14-devXin Li
edb1927e46 am: 18af125c0c am: b8c58b552c am: 5dc154dd2a am: 40b00562bf Original change: https://android-review.googlesource.com/c/platform/external/shflags/+/2059666 Change-Id: Icc38d1e824bb28c570bb438d78237aca8b31330c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Jeff moved to a different team so remove him from OWNERS am: 6acca678b8 am: ↵android-u-beta-1-gplandroid-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32main-16k-with-phonesandroid13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseXin Li
edb1927e46 am: 18af125c0c am: b8c58b552c am: 5dc154dd2a Original change: https://android-review.googlesource.com/c/platform/external/shflags/+/2059666 Change-Id: I8cbd372bd2de24ca816148abcc417537e4b64f6e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Jeff moved to a different team so remove him from OWNERS am: 6acca678b8 am: ↵Xin Li
edb1927e46 am: 18af125c0c am: b8c58b552c am: 1c67359490 Original change: https://android-review.googlesource.com/c/platform/external/shflags/+/2059666 Change-Id: Ibd62225c291cc75042b56536606982b844fb3af0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Jeff moved to a different team so remove him from OWNERS am: 6acca678b8 am: ↵Xin Li
edb1927e46 am: 18af125c0c am: b8c58b552c Original change: https://android-review.googlesource.com/c/platform/external/shflags/+/2059666 Change-Id: I7085c1ddf344b15318b60997766d9ebbfd704ceb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Jeff moved to a different team so remove him from OWNERS am: 6acca678b8 am: ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010Xin Li
edb1927e46 am: 18af125c0c am: b8c58b552c Original change: https://android-review.googlesource.com/c/platform/external/shflags/+/2059666 Change-Id: Id4ea008eab1e67050f7ff7597f1f01144d2bf784 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-13Jeff moved to a different team so remove him from OWNERS am: 6acca678b8 am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010main-16kandroid13-frc-odp-releaseandroid13-devXin Li
edb1927e46 am: 18af125c0c Original change: https://android-review.googlesource.com/c/platform/external/shflags/+/2059666 Change-Id: I12857d2db82b3a356ece95d004b43b8d05272ec2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12Jeff moved to a different team so remove him from OWNERS am: 6acca678b8 am: ↵Xin Li
edb1927e46 Original change: https://android-review.googlesource.com/c/platform/external/shflags/+/2059666 Change-Id: I91ac8d0f91f4b2dbd490f329a94118ec6bc52d69 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12Jeff moved to a different team so remove him from OWNERS am: 6acca678b8Xin Li
Original change: https://android-review.googlesource.com/c/platform/external/shflags/+/2059666 Change-Id: I433a076daa15b84da6908561ac7b2bc5b7c648e1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-12Jeff moved to a different team so remove him from OWNERSXin Li
Change-Id: If1bd74ebf85b15658c5d6dc8b49e77b355a9842a
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Id14b9b3c0e345d29980c60e6061b9a27df8bc638
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 04aa44404b -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseXin Li
ours am: cd5220d226 -s ours am: 0891fc869c -s ours am skip reason: Change-Id I3cbb723cf362632f98b1272fb8b98ac97a642248 with SHA-1 97813cb582 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia633e854a3dc4da88563a440900ba217e6ecc4d5
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 04aa44404b -s ↵Xin Li
ours am: cd5220d226 -s ours am: 0891fc869c -s ours am skip reason: Change-Id I3cbb723cf362632f98b1272fb8b98ac97a642248 with SHA-1 97813cb582 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9f472c811f91899814ef6899e8d7ecb77952754d
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 04aa44404b -s ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
ours am: cd5220d226 -s ours am skip reason: Change-Id I3cbb723cf362632f98b1272fb8b98ac97a642248 with SHA-1 97813cb582 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8b3cf000ffa1fe428624b233780b5ad4142f66c5
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 04aa44404b -s oursXin Li
am skip reason: Change-Id I3cbb723cf362632f98b1272fb8b98ac97a642248 with SHA-1 97813cb582 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I17ee0d230267075e511917c31a0143fac9c79b33
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I3cbb723cf362632f98b1272fb8b98ac97a642248 Change-Id: I2c535b9b697216f2210ec719d10a60e7eea6e6aa
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/shflags am: 1eca1ae9a0 am: ↵Bob Badour
92fe1c1b82 am: 789cff296e am: 9f001691ed Original change: https://android-review.googlesource.com/c/platform/external/shflags/+/1588909 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic5d14ee2683cc90010d139e7a8a5a23995367145
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/shflags am: 1eca1ae9a0 am: ↵Bob Badour
92fe1c1b82 am: 789cff296e am: 9f001691ed Original change: https://android-review.googlesource.com/c/platform/external/shflags/+/1588909 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5eadaec03270f1e62637f6ab7fbe013a6ca62d84
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/shflags am: 1eca1ae9a0 am: ↵Bob Badour
92fe1c1b82 am: 789cff296e Original change: https://android-review.googlesource.com/c/platform/external/shflags/+/1588909 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9b0c2487878bfd57759e759ed4b079386c389e0d
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/shflags am: 1eca1ae9a0 am: 92fe1c1b82Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/shflags/+/1588909 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0171b9f48c66ee8bd3ff56c9bce99adf75f1defe
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/shflags am: 1eca1ae9a0Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/shflags/+/1588909 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib21ca08803c9c2b3e450617444a9334c1100279a
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/shflagsandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ica5e2d5d3f3808ab7c2eaf01b31cb8098213a4a6
2020-11-25Mark ab/6881855 as merged am: 1fb0267ab5 am: 97813cb582Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/shflags/+/13112960 Change-Id: Ib52416a34c9991ada72d5bd7ced3e1958927e6a5
2020-11-25Mark ab/6881855 as merged am: 1fb0267ab5Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/shflags/+/13112960 Change-Id: I3cbb723cf362632f98b1272fb8b98ac97a642248
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I364ba9472709ccbcedcd5c2c27f1ee43d745b0fb
2020-10-12Use sh_binary_host for the shflags shell script. am: 922f738474 am: ↵Martin Stjernholm
92abceda54 am: 8d70be281b am: ff80316135 Original change: https://android-review.googlesource.com/c/platform/external/shflags/+/1447017 Change-Id: Ic76070d5a2d6e43a2d9b9c01f96ccce25e91c0c3
2020-10-12Use sh_binary_host for the shflags shell script. am: 922f738474 am: ↵Martin Stjernholm
92abceda54 am: 8d70be281b Original change: https://android-review.googlesource.com/c/platform/external/shflags/+/1447017 Change-Id: I16d838a106150ec86ee88cbffd6b9559f942cfa1
2020-10-12Use sh_binary_host for the shflags shell script. am: 922f738474 am: 92abceda54Martin Stjernholm
Original change: https://android-review.googlesource.com/c/platform/external/shflags/+/1447017 Change-Id: I260c9d41bfb9a1e978261f0e3a632b275311bea1
2020-10-12Use sh_binary_host for the shflags shell script. am: 922f738474Martin Stjernholm
Original change: https://android-review.googlesource.com/c/platform/external/shflags/+/1447017 Change-Id: Ic7ec0b7f5bba7e58ab0cad4ae5c57beb7da385bc
2020-10-07Use sh_binary_host for the shflags shell script.Martin Stjernholm
It's more appropriate (cc_prebuilt_binary will now symlink the file in the source directory and require it to be executable). Test: rm -rf out/host/ out/soong/host && m shflags Check that out/host/linux-x86/bin/lib/shflags/shflags still is created. Test: m Change-Id: I9a0100261c90e6bce1723a69d73f5719d4296a43
2020-05-19Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: ↵Bob Badour
2e0d635a87 am: 3dac286b93 am: 7ef808bcfa am: 32260528c6 am: 6708202791 Change-Id: I4ada1b396edc7d5f0cdea325d59146b6b3b9f3bb
2020-05-19Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: ↵Bob Badour
2e0d635a87 am: 3dac286b93 am: 7ef808bcfa am: 32260528c6 Change-Id: Ica82bc9d7f59e667bb401efef521088df410bd47
2020-05-19Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: ↵Bob Badour
2e0d635a87 am: 3dac286b93 am: 7ef808bcfa Change-Id: I195127d7fcb35686c41a0095d886ba39da60bc5c
2020-05-19Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: ↵Bob Badour
2e0d635a87 am: 3dac286b93 Change-Id: Ia5282f67996c2f14271d3cd84a7c25f76ed6ec73
2020-05-19Merge remote-tracking branch 'aosp/upstream-master' into mymerge am: 2e0d635a87android-r-beta-3android-r-beta-2Bob Badour
Change-Id: I4dcd750b88f1b92613edadbd1ae463ff2f76ed66
2020-05-18Merge remote-tracking branch 'aosp/upstream-master' into mymergeBob Badour
The version of shflags we have now includes a file with an erroneous LGPL license header even after the author relicensed under Apache2. Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: manual build Test: treehugger Change-Id: Ifc31394445d94248473d60b011fa76f66985e0b4
2020-04-13Test with Ubuntu Trusty as well.Kate Ward
2020-04-13Removed FLAGS_ARGC harder.Kate Ward
2020-04-13Removed FLAGS_ARGC harder.Kate Ward
2020-04-13Renamed to CHANGES-1.3.md.Kate Ward
2020-04-13Reformatted.Kate Ward
2020-04-13Reformatted.Kate Ward
2020-04-13Reformatted.Kate Ward
2020-04-13Fixed a couple of potential set -e stragglers.Kate Ward
2020-04-13Fixed #50. FLAGS_ARGC is no longer exported. Started 1.4.0pre series.Kate Ward
2020-04-13Pulled from upstream.Kate Ward
2020-04-12Fixed handling of deleted files.Kate Ward
2020-04-12Fixed more set -e issues.Kate Ward
2020-04-12Fixed bug that allowed bad commit to succeed.Kate Ward
2020-04-12Fixed shellcheck errors.Kate Ward
2020-04-12Fixed more set -e errors.Kate Ward