aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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: I639aa2533a3019e78b6afab848463120d2c72566 Change-Id: I9aa3fad182f0bf18cc7d5f8fef80aa476629b1f2
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/gflags am: 9abe06e7dcBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/1588924 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I000527aca8a1f06fd691d0cb98ab893d0d84bc98
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/gflagsandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-BSD to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I215de6029094eb69ae8569671f8dee20687ebaa5
2021-01-06Add assemble_cvd to com.android.virt am: 9cfee34507Jiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/1538843 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If62bdd21c44a25c8e844ce68e68152136d3453fa
2021-01-05Add assemble_cvd to com.android.virtJiyong Park
assemble_cvd directly or indirectly depends on these modules. To add assemble_cvd to the com.anroid.virt APEX, these modules are marked as being available to the APEX. Bug: 174639526 Test: m com.android.virt Change-Id: I2c2cdd3e0873e3949ef3640aa6aaffe880a6f392
2020-12-15Merge "Make gflags ramdisk and vendor_ramdisk available." am: 2a947fcd77 am: ↵David Anderson
12ef08b11e Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/1527060 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I639aa2533a3019e78b6afab848463120d2c72566
2020-12-15Merge "Make gflags ramdisk and vendor_ramdisk available." am: 2a947fcd77David Anderson
Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/1527060 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I32f68d795d0c8c57a57f35b79009798682499701
2020-12-15Merge "Make gflags ramdisk and vendor_ramdisk available."David Anderson
2020-12-14Make gflags ramdisk and vendor_ramdisk available.David Anderson
Bug: 173476209 Test: VAB builds Change-Id: I0e57419da87df1a7ef09856efaf9bb65aba41abd
2020-11-24Mark ab/6881855 as merged am: 87ccd9d86bXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gflags/+/13110974 Change-Id: I1497fcfd3effa40aa45037b3ecf467be105ef809
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I15e2e37702fe95250b4377e62d6686d89a723a03
2020-11-12Add "product_available" to product available modules am: 6fea601264 am: ↵Justin Yun
a4bdf8c239 am: 2c58474bd9 Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/1495580 Change-Id: I370146253642d1ce42809edd31338eb132675a31
2020-11-12Add "product_available" to product available modules am: 6fea601264 am: ↵Justin Yun
a4bdf8c239 Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/1495580 Change-Id: I9b9e73ba464f42ad596720f69ed3dda832c4b95c
2020-11-12Add "product_available" to product available modules am: 6fea601264Justin Yun
Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/1495580 Change-Id: Ifee91ebab036f7c83f3a77c1ef353657fc37da87
2020-11-11Add "product_available" to product available modulesJustin Yun
"vendor_available" modules were available to product modules. However, not all "vendor_available" modules are required to be available to product modules. Some modules want to be available only to product modules but not vendor modules. To cover the requirement, we separate "product_available" from "vendor_available". "vendor_available" will not provide product available module. Bug: 150902910 Test: build Change-Id: I85f78a96a9fb1c885ad5e7a45ef8d776a62921d7
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 00016103ea -s ours am: ↵Xin Li
b0236fc76b -s ours am skip reason: Change-Id Ia02e01d3eb2fb7d6598af88bb93d4ac256ab3b0b with SHA-1 03e85f071d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gflags/+/12796945 Change-Id: If3747332704e8c5ecb19446e6a33cb922ef077e6
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 00016103ea -s oursXin Li
am skip reason: Change-Id Ia02e01d3eb2fb7d6598af88bb93d4ac256ab3b0b with SHA-1 03e85f071d is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gflags/+/12796945 Change-Id: I489b891df56e8af1c925e9fc75a57fc291396933
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ia02e01d3eb2fb7d6598af88bb93d4ac256ab3b0b Change-Id: Iab86e8ebb370a9069855a91db3549fe6c69f240c
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: f3c8cc25b5 -s ours am: b5317fc94b -s ours am: 43677daecb -s ours am skip reason: Change-Id I25cb03cfe4204defb18e6ef7501fde01a196a39d with SHA-1 089cb9ca53 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gflags/+/12469869 Change-Id: I4f0da1b842eda268d98448d523b56d176d2f5250
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: f3c8cc25b5 -s ours am: b5317fc94b -s ours am skip reason: Change-Id I25cb03cfe4204defb18e6ef7501fde01a196a39d with SHA-1 089cb9ca53 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gflags/+/12469869 Change-Id: Ib16c5114f3b4a7bb91eee8041a816af9f6fb5ddb
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: f3c8cc25b5 -s ours am skip reason: Change-Id I25cb03cfe4204defb18e6ef7501fde01a196a39d with SHA-1 089cb9ca53 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gflags/+/12469869 Change-Id: I091f7494dbf2af71d021c7faf974fb9c4cf0d331
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I25cb03cfe4204defb18e6ef7501fde01a196a39d Change-Id: Idf10bab00c263b988265dd44f536817da3824e58
2020-08-11Make libgflags available to GKI APEX. am: 457196a6b8 am: ce7cf23aa3 am: ↵Yifan Hong
acebac1728 am: 6a928f5a9b Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/1388377 Change-Id: I0a728218f03fc5e1f77ea9e743d8a443ca4b5d06
2020-08-11Make libgflags available to GKI APEX. am: 457196a6b8 am: ce7cf23aa3 am: ↵Yifan Hong
acebac1728 Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/1388377 Change-Id: I26c089698eef7a88e055412ffeac98f79ec832ae
2020-08-10Make libgflags available to GKI APEX. am: 457196a6b8 am: ce7cf23aa3Yifan Hong
Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/1388377 Change-Id: Idc3088e3bdc851391203e73bd11660f85c6a6119
2020-08-10Make libgflags available to GKI APEX. am: 457196a6b8Yifan Hong
Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/1388377 Change-Id: I32a5b31792c277e36ccfefc95bc42c12526a7cf9
2020-08-07Make libgflags available to GKI APEX.Yifan Hong
Test: pass Bug: 161563386 Change-Id: I734bda0eeb11806a79874df9f8b02ef0a7aed1a9
2020-04-24Add license type: BSD is a NOTICE license am: 01a8902949 am: 6827298aee am: ↵Bob Badour
089cb9ca53 am: 03e85f071d Change-Id: Id010b4eb4bb8cb1711315105a2ede8b267254f48
2020-04-24Add license type: BSD is a NOTICE license am: 01a8902949 am: 6827298aee am: ↵Bob Badour
089cb9ca53 Change-Id: Ia02e01d3eb2fb7d6598af88bb93d4ac256ab3b0b
2020-04-24Add license type: BSD is a NOTICE license am: 01a8902949 am: 6827298aeeBob Badour
Change-Id: I25cb03cfe4204defb18e6ef7501fde01a196a39d
2020-04-24Add license type: BSD is a NOTICE license am: 01a8902949android-r-beta-3android-r-beta-2Bob Badour
Change-Id: Ib7f55fbc62637b158c953593884c72860ffc1e52
2020-04-23Add license type: BSD is a NOTICE licenseBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: I4c77bd8722eb7ca70f76902e26539ec0e50b1aaa
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 31fba9677a -s ours am: c0b71967a4 am: 408da7c64a Change-Id: I75566eb005d4c911b2862e7bf61dcf5bc3b9c8c8
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 31fba9677a -s ours am: c0b71967a4 Change-Id: I0e332d2d27fedd40f89ef6bfbddc8c0ce64f047f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 31fba9677a -s ours am skip reason: subject contains skip directive Change-Id: Iaa11879f5e54058b067b1f22269698d6ec9b5955
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I502bea7dd885d370f5758eb294f12f7cb1596785
2020-03-26Remove redundant NOTICE copied from LICENSE. am: ccbe78bf3c am: 2647a12e5a ↵Bob Badour
am: 4dd9ac7ff8 am: 4dd2449ff3 Change-Id: I83a26190e40e3f05621f7dae438d31cfb45adb5b
2020-03-26Remove redundant NOTICE copied from LICENSE. am: ccbe78bf3c am: 2647a12e5a ↵Bob Badour
am: 4dd9ac7ff8 Change-Id: I8e149e2a4a9139301e207d76b630f086a6383095
2020-03-26Remove redundant NOTICE copied from LICENSE. am: ccbe78bf3c am: 2647a12e5aBob Badour
Change-Id: I684bb5cb21182287ae2c489a72a0743946cf06bb
2020-03-26Remove redundant NOTICE copied from LICENSE. am: ccbe78bf3c am: 2647a12e5aBob Badour
Change-Id: I5ce8da8354ecdbefdceba637b08a5b08a96196a2
2020-03-26Remove redundant NOTICE copied from LICENSE. am: ccbe78bf3cBob Badour
Change-Id: Ide7968bc6745c811d57de1895fdaaf7b63ea1c5a
2020-03-25Remove redundant NOTICE copied from LICENSE.Bob Badour
Identified using the below shell script: $ find -H . -name LICENSE -type f -print0 | xargs -0 dirname \ | while read dir; do \ if [ -f "${dir}/NOTICE" ] \ && diff "${dir}/LICENSE" "${dir}/NOTICE" >/dev/null; then \ echo "${dir}/NOTICE"; \ fi; \ done Now that http://r.android.com/r/1235427 and http://r.android.com/r/1238719 are merged, LICENSE files copied into NOTICE files are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: Ifb50d39eb23c202a9c7fc1529be2fd48ea03e195
2019-12-12Remove ghartman@ from OWNERS am: ab750f5fe5 am: c82dc1873c am: f155738676r_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-releaseAutomerger Merge Worker
Change-Id: Ief0acafb91569019f16ff0c6d3d902c9af4399fc
2019-12-12Remove ghartman@ from OWNERS am: ab750f5fe5 am: c82dc1873candroid-r-preview-4android-r-preview-3android-r-preview-2Automerger Merge Worker
Change-Id: Ic1d1a24c554dd280932b1e23991be460af2efdc2
2019-12-12Remove ghartman@ from OWNERSGreg Hartman
am: ab750f5fe5 Change-Id: I21d62e7acaa02b89c8a90d09a6c766438f315bc4
2019-12-11Remove ghartman@ from OWNERSandroid-r-preview-1Greg Hartman
Test: gerrit Change-Id: I5018068d5482dbca59189fb33ac8e09ae5d008eb
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospq_tzdata_aml_297100400q_tzdata_aml_297100300q_tzdata_aml_297100000q_tzdata_aml_296200000q_tzdata_aml_295600118q_tzdata_aml_295600110q_tzdata_aml_295500002q_tzdata_aml_295500001q_tzdata_aml_294400310android-mainline-12.0.0_r54android-mainline-12.0.0_r111android-mainline-10.0.0_r9android-mainline-10.0.0_r8android-mainline-10.0.0_r7android-mainline-10.0.0_r6android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r13android-mainline-10.0.0_r12android-mainline-10.0.0_r11android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12q_tzdata_aml_297100000ndk-sysroot-r21android12-mainline-tzdata-releaseandroid10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-tzdata-releaseandroid10-mainline-resolv-releaseandroid10-mainline-networking-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseandroid10-android13-mainline-tzdata-releaseXin Li
am: 40a5dc7c6c Change-Id: I34093e0096610ca7b8232eacf7e3026dea80165f
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: Ibff3fdafa40470783b2b76cbbad8faaab64485cd
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: If13e29150cf6a3358d82bdb1fad0101639869f41
2019-02-01Upgrade gflags to v2.2.2 am: 3c6da7f2a8 am: aeddde15bbHaibo Huang
am: 72581e574d Change-Id: I40977bcabd72bc642484b1f308630e79ef5bcf3c
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-29 17:44:01 +0000