aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-09Snap for 11200327 from 47ee746be7d10f0548de8c6b377918e00812d8d1 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
Change-Id: I5c6538e0c729a7371bdbb8f770be9923044cab5c
2023-12-08Merge "Move OWNER reference master=>main." into main am: 6305f2fcd6 am: ↵HEADmastermainTreehugger Robot
62258de1e2 am: cc7fa7df57 am: 5fa640664b am: 2b14c7a506 am: 7cef525716 Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/2661038 Change-Id: I988da89be6000bcec5d0d03f4f8504fbf1b51dd7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-08Merge "Move OWNER reference master=>main." into main am: 6305f2fcd6 am: ↵Treehugger Robot
62258de1e2 am: cc7fa7df57 am: 5fa640664b am: 2b14c7a506 Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/2661038 Change-Id: If0e8597044b048a52fb98ef47447f7e116838516 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-21Snap for 10985023 from 1b2051213e21a867177d65313bdfd635b1f3fa9a to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: Id1f2d5102257a01da9524310b10b4306cba3a6b5
2023-10-20Merge remote-tracking branch 'aosp/main' into HEAD am: 6bb6fcffe3Maciej Żenczykowski
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iputils/+/25104355 Change-Id: I5e6a57f105b13e855f88e760df48b36c6b63bfb8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-19Snap for 10970117 from bc7be2f6041727481280415c364e488dca534663 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I3989063138eb916799f89660788cc66b4020a2c2
2023-10-18[automerger skipped] Move OWNER reference master=>main. am: d2aead0a17 -s oursSam Saccone
am skip reason: Merged-In I53760c2abd6e658759122aa256d2b0956808f440 with SHA-1 0b3749df96 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iputils/+/25094061 Change-Id: I1c8cc94ef0096e2e4fd83ce6520cc159ffb0d7f7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-18Merge remote-tracking branch 'aosp/main' into HEADMaciej Żenczykowski
* aosp/main: Move OWNER reference master=>main. Ignore-AOSP-First: this is a merge from AOSP Bug: 305814576 Test: TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Icd713b70cb2747368e25c77f610d4374f520e815
2023-10-17Move OWNER reference master=>main.Sam Saccone
BUG=b/291759353 (cherry picked from https://android-review.googlesource.com/q/commit:0b3749df966338966ecad0e5a4bc9e9cef1ba2b8) Merged-In: I53760c2abd6e658759122aa256d2b0956808f440 Change-Id: I53760c2abd6e658759122aa256d2b0956808f440
2023-07-18Merge "Move OWNER reference master=>main." into main am: 6305f2fcd6 am: ↵Treehugger Robot
62258de1e2 am: cc7fa7df57 am: 5fa640664b am: 2b14c7a506 Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/2661038 Change-Id: I8a84a515c99cb1b54d090a5681b5b59a21301803 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: 6305f2fcd6 am: ↵Treehugger Robot
62258de1e2 am: cc7fa7df57 am: 5fa640664b Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/2661038 Change-Id: I81852e63ac9c98a8cf7c9f95b849b41f0f475d55 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: 6305f2fcd6 am: ↵Treehugger Robot
62258de1e2 am: cc7fa7df57 Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/2661038 Change-Id: I806c58db83b632356745fe5929a194450d8a93ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: 6305f2fcd6 am: ↵Treehugger Robot
62258de1e2 Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/2661038 Change-Id: Ife6ff39383ea49b709b8384bd31afabcb41b432e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: 6305f2fcd6Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/2661038 Change-Id: I58606b350a5d3cb33505bf76d0ebf8dc2b0f48cb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into mainTreehugger Robot
2023-07-18Move OWNER reference master=>main.Sam Saccone
BUG=b/291759353 Change-Id: I53760c2abd6e658759122aa256d2b0956808f440
2022-05-04Merge "Explicitly set `-fno-strict-aliasing`" am: 72df2a58a3 am: db41ecb0cd ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-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_341114000aml_rkp_341015010aml_rkp_341012000aml_hef_341114030android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-devandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseTreehugger Robot
am: 08a16447ee am: 6769f05347 am: 90603f8cb3 Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/2078039 Change-Id: I492e95683ef4f54d79efe3031e19980aef522f07 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Merge "Explicitly set `-fno-strict-aliasing`" am: 72df2a58a3 am: db41ecb0cd ↵android-u-beta-1-gplmain-16k-with-phonesTreehugger Robot
am: 08a16447ee am: 6769f05347 Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/2078039 Change-Id: Idf6b79df88b8db6729363942d30220f3c55bf96c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Merge "Explicitly set `-fno-strict-aliasing`" am: 72df2a58a3 am: db41ecb0cd ↵Treehugger Robot
am: 08a16447ee Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/2078039 Change-Id: I1f754637cd01d8aa43b4539566cfc4ab6c5d7334 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Merge "Explicitly set `-fno-strict-aliasing`" am: 72df2a58a3 am: db41ecb0cdmain-16kTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/2078039 Change-Id: I9994dc0e644588c2b36f78126228036c7ac9483a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Merge "Explicitly set `-fno-strict-aliasing`" am: 72df2a58a3Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/2078039 Change-Id: Ib818bf6c65999ae0c553fea4bc9a9532f4462787 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-04Merge "Explicitly set `-fno-strict-aliasing`"Treehugger Robot
2022-04-27Explicitly set `-fno-strict-aliasing`Matthew Maurer
iputils' own build system automatically adds `-fno-strict-aliasing` to its compile flags. Android currently adds `-fstrict-aliasing` to arm32 builds by default. To ensure no miscompilations on arm32, explicitly set `-fno-strict-aliasing` for the iputils module. Bug: 230627866 Test: mm Change-Id: I6cee88b61db738660806662b459ebeb11d0bb429
2022-02-09Merge "iputils: switch OWNERS to core networking" am: 11a24af6c0 am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060android-wear-13.0.0-gpl_r1android-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_r57android-13.0.0_r56android-13.0.0_r55android-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_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_ase_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-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-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-odp-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseandroid-wear-13.0.0-gpl_r1aml_tz4_332714010Treehugger Robot
0d2df43535 am: 5500b13f25 am: ce27e56d93 Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/1977048 Change-Id: I02ec1818427c597dc9485e504fb37f52987fe1b7
2022-02-09Merge "iputils: switch OWNERS to core networking" am: 11a24af6c0 am: ↵Treehugger Robot
0d2df43535 am: 5500b13f25 Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/1977048 Change-Id: I97c07b6b6b11289ac086539451e141ed967bd083
2022-02-09Merge "iputils: switch OWNERS to core networking" am: 11a24af6c0 am: 0d2df43535Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/1977048 Change-Id: I256360d57bfdeeef07b1c9a9fbbdeff5912547d9
2022-02-09Merge "iputils: switch OWNERS to core networking" am: 11a24af6c0Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/1977048 Change-Id: I2f86b9c6cc0c57132147db74cd006d7e84642fa2
2022-02-09Merge "iputils: switch OWNERS to core networking"android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Treehugger Robot
2022-02-08iputils: switch OWNERS to core networkingMaciej Żenczykowski
(effectively a no-op, just more directly accomplishes the same thing) Test: N/A, TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I4c86139cb73bfe680f3a522ebf18766ae0dcc303
2021-05-29Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iputils" am: 1f54dd7add am: ↵Bob Badour
18c7fc61c2 am: 627a090373 am: 59dce02f28 am: d411a19c70 Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/1588525 Change-Id: I3c806af455bf9eda69ee532768ec3c6015816ac9
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iputils" am: 1f54dd7add am: ↵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-releaseBob Badour
18c7fc61c2 am: 627a090373 am: 59dce02f28 Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/1588525 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1dcefe2084dd58a5c990cc90a091906c961ecce2
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iputils" am: 1f54dd7add am: ↵Bob Badour
18c7fc61c2 am: 627a090373 am: 59dce02f28 Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/1588525 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0dce6a36f1f5d9f26990aa127a5d5ecaf3548ef3
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iputils" am: 1f54dd7add am: ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-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-s-v2-preview-1Bob Badour
18c7fc61c2 am: 627a090373 Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/1588525 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1ff777ef2101732699e5b0ce522112718f8b3c85
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iputils" am: 1f54dd7add am: ↵Bob Badour
18c7fc61c2 Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/1588525 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I24910e5c8f28a4d30728ff4a4176ef9e465fc792
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iputils" am: 1f54dd7addandroid-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/iputils/+/1588525 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I61701a637bd171e13be43cce07f69d2cebd4eddb
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iputils"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/iputilsBob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-ISC legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: If3d045df728d5ed62c4ab59bd8e74e7fb70bee45
2020-04-29Merge "Add METADATA to iputils: GPL=RESTRICTED" am: 9345797422 am: ↵Treehugger Robot
d5f5073532 am: 8fc24f1baa am: c479c0737d am: 351ff485c5 Change-Id: I26edb25bae83b6bc8f4f7b7a547be8a7e479c4f3
2020-04-29Merge "Add METADATA to iputils: GPL=RESTRICTED" am: 9345797422 am: ↵Treehugger Robot
d5f5073532 am: 8fc24f1baa am: c479c0737d Change-Id: Ia1c27da2d90f6a577001d72174ecea1d3d259b13
2020-04-29Merge "Add METADATA to iputils: GPL=RESTRICTED" am: 9345797422 am: ↵Treehugger Robot
d5f5073532 am: 8fc24f1baa Change-Id: I450fa49539ce51c9cb55ee48cc9d6c78abd16134
2020-04-29Merge "Add METADATA to iputils: GPL=RESTRICTED" am: 9345797422 am: d5f5073532Treehugger Robot
Change-Id: I3cf42b0e1be49c7b77c2c052321a118ad3355f86
2020-04-29Merge "Add METADATA to iputils: GPL=RESTRICTED" am: 9345797422android-r-beta-3android-r-beta-2Treehugger Robot
Change-Id: I1c13e4fadd3eb109a9c3c8cd9b00ce0f5c9657a6
2020-04-29Merge "Add METADATA to iputils: GPL=RESTRICTED"Treehugger Robot
2020-04-28Add METADATA to iputils: GPL=RESTRICTEDBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Exempt-From-Owner-Approval: janitorial work Change-Id: I34c671cb9259a73b7e5298a2e2e785dfb071ebbe
2019-11-26Merge changes I525bda55,Ie6445f00 am: 22fc95370c am: 7ff16b416cr_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseMaciej Żenczykowski
am: 579e2f654c Change-Id: I2cd3f05a5722e480eb723a7f42787b32f923ff96
2019-11-26Merge changes I525bda55,Ie6445f00 am: 22fc95370candroid-r-preview-4android-r-preview-3android-r-preview-2Maciej Żenczykowski
am: 7ff16b416c Change-Id: If6cb11ed3eb717634c782d5906313ad59419b277
2019-11-26Merge changes I525bda55,Ie6445f00android-r-preview-1Maciej Żenczykowski
am: 22fc95370c Change-Id: I89ee46468d999713d1a324461ad292c5a2f7e772
2019-11-26Merge changes I525bda55,Ie6445f00Treehugger Robot
* changes: iputils: revert changes that neutered in6_flowlabel.h iputils: remove comment-only Cleanspec.mk
2019-10-15iputils: revert changes that neutered in6_flowlabel.hMaciej Żenczykowski
and instead just make the one spot we include it a no-op $ git grep in6_flowlabel[.]h Makefile:158:ping6.o: ping_common.h in6_flowlabel.h ping6.c:84:/* The in6_flowlabel.h file in the iputils distribution exists to provide ping6.c:88: * #include "in6_flowlabel.h" Test: see above grep for proof of no other users Bug: 140825634 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I525bda558c8f118e31e1b5b1436d4c8d4ac85480
2019-10-15iputils: remove comment-only Cleanspec.mkMaciej Żenczykowski
The following: egrep -v '^#|^ *$' < CleanSpec.mk was empty. So just delete the pointless file, and thus reduce the diff versus upstream. Test: N/A Bug: 140825634 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ie6445f00ff8792ca15d85629b88147aac95ba641
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 14:50:58 +0000