aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 93c71b4f52 -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: f982739ffc -s ours am skip reason: Change-Id I574a9b5a6e2aec6a2c6314eb22d3d395246e4f51 with SHA-1 1c4e8768d1 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0449500e54fc65974cb46b77656562ea45597b95
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 93c71b4f52 -s oursXin Li
am skip reason: Change-Id I574a9b5a6e2aec6a2c6314eb22d3d395246e4f51 with SHA-1 1c4e8768d1 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4105983678f21f26cc108e5d4f9e006b4e98c40d
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: I574a9b5a6e2aec6a2c6314eb22d3d395246e4f51 Change-Id: I76733a21c3bb44167641f80ad5b0bba5aeb85b5b
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libepoxy am: f777564138 am: ↵Bob Badour
ab4fab6d9f am: a3222c0eb2 Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1588917 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iae3173e9875fb2e7852c6fb8bf53042b852c885e
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libepoxy am: f777564138 am: ab4fab6d9fBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1588917 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3a04fc879b801ed0933e165a5391df1d595b52fe
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/libepoxy am: f777564138Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1588917 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I36a55d247705eeca4a3efe40735885102fe00d0e
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/libepoxyandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD SPDX-license-identifier-MIT to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ifbb72fa9f9b57a77763bc89c6a533aef14cb54cf
2020-12-15add crosvm to com.android.virt am: 891be28da6 am: 006e3bcf38 am: 1c4e8768d1Jiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1527780 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I951996d6526b3d76d14c5b359367a909edd937ae
2020-12-15add crosvm to com.android.virt am: 891be28da6 am: 006e3bcf38Jiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1527780 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I574a9b5a6e2aec6a2c6314eb22d3d395246e4f51
2020-12-15add crosvm to com.android.virt am: 891be28da6Jiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1527780 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie83e6e60eb7b5a4d5263bc456898d9f4576110b7
2020-12-14add crosvm to com.android.virtJiyong Park
To do so, crosvm and its dependencies have the apex_available property set to "//apex_available:platform", "com.android.virt" to explicitly acknowledge the joining. Bug: 174639241 Test: m com.android.virt Change-Id: I516a4f1b847f558fad347552678e597da3b9baab
2020-11-24Mark ab/6881855 as merged am: 1caece3f9f am: 3e9fd8de95Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libepoxy/+/13110947 Change-Id: I0af2bd1a28352220ecab002c0385fa0a62304de2
2020-11-24Mark ab/6881855 as merged am: 1caece3f9fXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libepoxy/+/13110947 Change-Id: I2211e6f4383efc703ba139b5f1cf1bf118128e9c
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Iad718cd25139f9dcbdde14cfbcd6224ea8d9548f
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: b56c7afa10 -s ours am: ↵Xin Li
57c502756c -s ours am: 78821f5ce6 -s ours am skip reason: Change-Id Ie54bb05e9e5513065fe731ffccedb0bbcf602d91 with SHA-1 c48a6e9f8f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libepoxy/+/12797162 Change-Id: Ibfca1bc148159b56c270c8c6e3765fca99ac2d07
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: b56c7afa10 -s ours am: ↵Xin Li
57c502756c -s ours am skip reason: Change-Id Ie54bb05e9e5513065fe731ffccedb0bbcf602d91 with SHA-1 c48a6e9f8f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libepoxy/+/12797162 Change-Id: I742c8e0ee57694432e7512e4bb887e667d2b6905
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: b56c7afa10 -s oursXin Li
am skip reason: Change-Id Ie54bb05e9e5513065fe731ffccedb0bbcf602d91 with SHA-1 c48a6e9f8f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libepoxy/+/12797162 Change-Id: I2c61c088482a889791926175c57ce7d479e712ca
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ie54bb05e9e5513065fe731ffccedb0bbcf602d91 Change-Id: Ifb36deef8e50cd23739f59f09bc3b02e510ede39
2020-09-01ANDROID: Add target/device support am: 3189a094b2 am: 826b368df6 am: ↵Alistair Delva
e8248eb7f7 am: f9494e30af am: 4bec3ff108 Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1414889 Change-Id: I657c773cbbc22857e848a34caa7b900c58ba948e
2020-09-01ANDROID: Add target/device support am: 3189a094b2 am: 826b368df6 am: ↵Alistair Delva
e8248eb7f7 am: f9494e30af Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1414889 Change-Id: Icf63772363264177daf7d4b2f2bf6ada9feb6185
2020-09-01ANDROID: Add target/device support am: 3189a094b2 am: 826b368df6 am: e8248eb7f7Alistair Delva
Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1414889 Change-Id: I4f0c6584cd67bafdcb9c0534371dfa92d9f70885
2020-09-01ANDROID: Add target/device support am: 3189a094b2 am: 826b368df6Alistair Delva
Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1414889 Change-Id: Ia403ad62d7c1a5f82e882ea60e70df109f06a82a
2020-09-01ANDROID: Add target/device support am: 3189a094b2Alistair Delva
Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1414889 Change-Id: If0c9303ae2bdf51c0c474711dc14d97f446a4ea1
2020-08-31ANDROID: Add target/device supportAlistair Delva
Support building libepoxy.so for an Android guest. Change-Id: I4f2348b55ffc0f7cf951b60ed7c3a1c4fc6fded5
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 92d49d13fd -s ours am: ada6547d20 -s ours am: f25de6fb26 -s ours am: 7fd998dbcd -s ours am skip reason: Change-Id If8f89ebea88d06db85aac49600fdadad6ad1be49 with SHA-1 1c524efcbe is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libepoxy/+/12469351 Change-Id: I7e847a20687f6909c638179d07ee1b9fb1e3d6a0
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 92d49d13fd -s ours am: ada6547d20 -s ours am: f25de6fb26 -s ours am skip reason: Change-Id If8f89ebea88d06db85aac49600fdadad6ad1be49 with SHA-1 1c524efcbe is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libepoxy/+/12469351 Change-Id: If8ce4b75f75572b4020d809f7d52f1b239e0fe33
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 92d49d13fd -s ours am: ada6547d20 -s ours am skip reason: Change-Id If8f89ebea88d06db85aac49600fdadad6ad1be49 with SHA-1 1c524efcbe is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libepoxy/+/12469351 Change-Id: I9a108c0392a35ea546e0690c093283ca585ae86c
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 92d49d13fd -s ours am skip reason: Change-Id If8f89ebea88d06db85aac49600fdadad6ad1be49 with SHA-1 1c524efcbe is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libepoxy/+/12469351 Change-Id: I270b012b7986b604d6313de73fb135ac22c07a93
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: If8f89ebea88d06db85aac49600fdadad6ad1be49 Change-Id: I9a7ab238279f7462db1f9e4f8106d68691335fcf
2020-07-26Add Android host build for libepoxy am: a428139a81 am: 97d96203c4 am: ↵Alistair Delva
a5b7500dae am: c48a6e9f8f am: b076aa0321 Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1368776 Change-Id: I13884068a39c81187122b1bfefed0221569056b7
2020-07-26Add Android host build for libepoxy am: a428139a81 am: 97d96203c4 am: ↵Alistair Delva
a5b7500dae am: c48a6e9f8f Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1368776 Change-Id: I3f28007dc179068a79dca6cf7968b1b57658f1cf
2020-07-26Add Android host build for libepoxy am: a428139a81 am: 97d96203c4 am: a5b7500daeAlistair Delva
Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1368776 Change-Id: Ie54bb05e9e5513065fe731ffccedb0bbcf602d91
2020-07-26Add Android host build for libepoxy am: a428139a81 am: 97d96203c4Alistair Delva
Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1368776 Change-Id: I7fa1e2af847dfa694ed2096257bdbd87dd04f823
2020-07-26Add Android host build for libepoxy am: a428139a81Alistair Delva
Original change: https://android-review.googlesource.com/c/platform/external/libepoxy/+/1368776 Change-Id: I67d50cc69e3ce087ca0e131a7a045b7e00637ac8
2020-07-21Add Android host build for libepoxyAlistair Delva
This library is needed by virglrenderer. Bug: 161831173 Change-Id: I537e27a2e846c3c437afa2233a66ad9164e2905e
2020-04-10Upgrade libepoxy to 1.5.4 am: 4679a806bd am: 4b204d7bfe am: 1c524efcbe am: ↵Haibo Huang
3d8ec97cb8 am: b7733bc78d Change-Id: I79a597b9ffd18a355f1ce07b5aaeb630e631661e
2020-04-10Upgrade libepoxy to 1.5.4 am: 4679a806bd am: 4b204d7bfe am: 1c524efcbe am: ↵Haibo Huang
3d8ec97cb8 Change-Id: I017134c7bd559174d15f9e1448d2e1f3acd5a28e
2020-04-10Upgrade libepoxy to 1.5.4 am: 4679a806bd am: 4b204d7bfe am: 1c524efcbeHaibo Huang
Change-Id: If116276aa009183d47d126ff971bc1c5669b7124
2020-04-10Upgrade libepoxy to 1.5.4 am: 4679a806bd am: 4b204d7bfeHaibo Huang
Change-Id: If8f89ebea88d06db85aac49600fdadad6ad1be49
2020-04-10Upgrade libepoxy to 1.5.4 am: 4679a806bdandroid-r-beta-3android-r-beta-2Haibo Huang
Change-Id: I0b58f3d15e5a40ad87ca62fc6acd4048a8f82851
2020-04-10Upgrade libepoxy to 1.5.4Haibo Huang
Epoxy 1.5.4 Changes since 1.5.3 - Don't build GLX tests if X11 support is disabled [Nirbheek Chauhan] - Add unit tests for epoxy_gl_version() [Eric Anholt] - Reduce the size of the binary by reusing static strings [Eric Anholt] - Fix build on Solaris [Alan Coopersmith] - Update the GL registries [Guchetan Singh] Exempt-From-Owner-Approval: upgrade Change-Id: Ib3cc0a6867ed5aee06851175f01758d45227150a
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f26ced13c0 -s ours am: d6ac20f29f am: f50958452d am: 4b1ab4b475 -s ours am skip reason: subject contains skip directive Change-Id: Ic36acba38d876651fada8e8c387af13e7fbce92d
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f26ced13c0 -s ours am: d6ac20f29f am: f50958452d Change-Id: I449aab5abc4071c7ec9c8492af9af8c5af8a5da0
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f26ced13c0 -s ours am: d6ac20f29f Change-Id: Ib448f02588637e77e9e09580ef9fe1a1de801a49
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f26ced13c0 -s ours am skip reason: subject contains skip directive Change-Id: Ibc995a23384e90c2d974b53a19fced5180316bc3
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I794cb3827103e2d9cddd25b6a2c3cb2f365145b1
2020-03-26Remove redundant NOTICE symbolic link. am: 3df6589272 am: 7a890801db am: ↵Bob Badour
d7e67e078c am: 9513e8b2ee am: 8910d2a5a9 Change-Id: Idff2b5f178167d2e494cdbb4ea005efd4c3fdc73
2020-03-26Remove redundant NOTICE symbolic link. am: 3df6589272 am: 7a890801db am: ↵Bob Badour
d7e67e078c am: 9513e8b2ee Change-Id: I6b950981d125d562b86bcaa6786b6cec433b779a
2020-03-26Remove redundant NOTICE symbolic link. am: 3df6589272 am: 7a890801db am: ↵Bob Badour
d7e67e078c Change-Id: Iaf26a7c0fd50cf0f51ed9ecddeb018a627baee7c
2020-03-26Remove redundant NOTICE symbolic link. am: 3df6589272 am: 7a890801dbBob Badour
Change-Id: I8ddd67d02983627d0f2e231651cc198431d4cbad
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-20 05:38:40 +0000