aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: a37671cac0 -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: 6341c80521 -s ours am skip reason: Change-Id I639aa2533a3019e78b6afab848463120d2c72566 with SHA-1 a52760bf8a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia1d79107ecd0e7127fb458e51e5479a3ee6c51fe
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: a37671cac0 -s oursXin Li
am skip reason: Change-Id I639aa2533a3019e78b6afab848463120d2c72566 with SHA-1 a52760bf8a is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2902147ecc6462935a45addeeed6eed950446731
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: 9abe06e7dc am: ↵Bob Badour
3dcb7c37ab am: fe8a7d7eb3 Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/1588924 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I363e08a0e5dd2ec7a208664da6c822239ad2a00f
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/gflags am: 9abe06e7dc am: 3dcb7c37abBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/1588924 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2925c666ce66b87e3ea2e460a890564b59c110a9
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: 9cfee34507 am: dd7aa16ff7 am: ↵Jiyong Park
30045e6d76 Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/1538843 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I77cd66abceccb47c5ed8fb5f5e878351334afe10
2021-01-06Add assemble_cvd to com.android.virt am: 9cfee34507 am: dd7aa16ff7Jiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/1538843 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I734c4a1a168fe126ca21b60cdcfb1b647035bece
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 am: a52760bf8a Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/1527060 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5d2f7ce4f59d3a77e144c8a96e75bbf8bb540c5e
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: 87ccd9d86b am: c86c146701Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/gflags/+/13110974 Change-Id: I2ef6dbaf1222c4ab67926753255c208c1aba8133
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 am: 6ce82712af Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/1495580 Change-Id: Ic842c63c1740fe05cd1e96d6723296e274ba5a6c
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: 9e2feae1ba -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: I48072ed4ea9059c42d92c897f41de037d581c756
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: fccf6a3ddd -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: I964674da1df58922f2d2a0276255158cf652dfd6
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 am: 6b6b153224 Original change: https://android-review.googlesource.com/c/platform/external/gflags/+/1388377 Change-Id: I0d74ca72a760c60b6fa079e833f69004d0753a42
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 am: 36164d0ef6 Change-Id: I37746d1b1463c000c28b7eb02e26dca66125efda
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 am: 28777b7646 -s ours am skip reason: subject contains skip directive Change-Id: Ia4fb9e6a0c322fb4dcee46ed9c75e8bbe197a50a
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