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: I574a9b5a6e2aec6a2c6314eb22d3d395246e4f51 Change-Id: I76733a21c3bb44167641f80ad5b0bba5aeb85b5b
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: 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: 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 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 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 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 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 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 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 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
2020-03-26Remove redundant NOTICE symbolic link. am: 3df6589272 am: 7a890801dbBob Badour
Change-Id: I2ea72a7c4e4737c32d17ce519f53bfb9755f65ab
2020-03-26Remove redundant NOTICE symbolic link. am: 3df6589272Bob Badour
Change-Id: I86e6106d9a6cd706e2a817fc160483dadc08c822
2020-03-25Remove redundant NOTICE symbolic link.Bob Badour
Now that http://aosp/1235427 and http://aosp/1238719 are in, NOTICE symbolic links are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: I926ffe0480d6d546ba46f7d5d6956c9b1235d862
2019-11-05Merge pull request #211 from gurchetansingh/masterEric Anholt
Update OpenGL Registry
2019-10-30[automerger skipped] DO NOT MERGE - ↵r_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-releaseXin Li
qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: c62140bafd am: ff18e5a9be -s ours am skip reason: subject contains skip directive Change-Id: I2e2399a5f8ffa7526907129a400affa413c2dffa
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-4android-r-preview-3android-r-preview-2Xin Li
stage-aosp-master am: c62140bafd Change-Id: I68c876385825bb3f17895de794d9ab81fde66b63
2019-10-30DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into ↵android-r-preview-1Xin Li
stage-aosp-master Bug: 142003500 Change-Id: Ib8784c732586532890ed05a674c4986d2fe4f2dc
2019-09-23Merge branch 'khronos-registry' into HEADGurchetan Singh
2019-09-23Update OpenGL/EGL registriesGurchetan Singh
OpenGL: 253836ac53b2e248fa47d96cacc18a63ac27c703 EGL: a9bef577b041caab108257ea386d0302290d4361
2019-09-13Upgrade libepoxy to af38a466caf9c2ae49b8acda4ff842ae44d57f78 am: b51a87e313 ↵Haibo Huang
am: affffb66ec am: e8646ce325 am: 24a49e2f91 Change-Id: Iae410442a2371972d2eb3ccefc467c449d9a0544
2019-09-13Upgrade libepoxy to af38a466caf9c2ae49b8acda4ff842ae44d57f78 am: b51a87e313 ↵Haibo Huang
am: affffb66ec am: e8646ce325 Change-Id: I4f6e1d7bd101e13930feaf55b43d745499d34b95
2019-09-13Upgrade libepoxy to af38a466caf9c2ae49b8acda4ff842ae44d57f78 am: b51a87e313Haibo Huang
am: affffb66ec Change-Id: Ib9f90cc674c6ec42b5097b211803bf7d00464694
2019-09-13Upgrade libepoxy to af38a466caf9c2ae49b8acda4ff842ae44d57f78Haibo Huang
am: b51a87e313 Change-Id: Ia022b5aa2d606fb372695f38a6323bda15966c97
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-17 10:32:08 +0000