aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-03-05Update to Wayland 1.19.0 am: b53eb39185 am: 204cce5a64 am: a51a73e0e3android-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-1Lloyd Pique
Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1619581 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4c6f691615f5a0ee88d54da54339850515d7e214
2021-03-05Update to Wayland 1.19.0 am: b53eb39185 am: 204cce5a64Lloyd Pique
Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1619581 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I625cc8039cb1b5dd399c43b8a18da191c6327276
2021-03-05Update to Wayland 1.19.0 am: b53eb39185android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-5android-s-beta-4Lloyd Pique
Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1619581 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8313769689c48610c6841d6a163c90fb39578eac
2021-03-03Update to Wayland 1.19.0android-s-beta-2android-s-beta-1Lloyd Pique
Automatic import using "./import_official_snapshot.py 1.19.0", with minor adjustments to config.h and Android.bp Bug: 174823478 Test: Builds Change-Id: I781e5c16c49a8c6eaca27042466913719a6df9bd
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d31e1e5594 -s ↵Xin Li
ours am: 0613875b77 -s ours am skip reason: Change-Id I5b5abaa267515d5c92a51a0a5e2ad51bd7a4675c with SHA-1 4ba8bb3651 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I689d5fe433b942e8e50823517d89dd4443479bd5
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d31e1e5594 -s oursXin Li
am skip reason: Change-Id I5b5abaa267515d5c92a51a0a5e2ad51bd7a4675c with SHA-1 4ba8bb3651 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I72071760b437f089ab93b7722aebc8352b5bf10a
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I5b5abaa267515d5c92a51a0a5e2ad51bd7a4675c Change-Id: I00ac5c52e2325089c26822ce7c593389e2a95bfe
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/wayland am: b1990866a0 am: ↵Bob Badour
f8cc2611af am: d11bf5e978 Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1588613 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9840bfe21bfb784dc21704179141eac30beb65dc
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/wayland am: b1990866a0 am: f8cc2611afBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1588613 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I50f0fd7620b06e4f743a13369a5f888fc8b7daf8
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/wayland am: b1990866a0Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1588613 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id02f527b37a731b29a76b20fc3348e8cfeec8fc8
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/waylandandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ibf4ab1ae0d4743db5d87d5894069d2e6754f49fc
2021-02-09[automerger skipped] Clean reimport of Wayland core sources 1.17.0 am: ↵Lloyd Pique
049d87ca33 am: bcdc69d383 -s ours am: 6b57da736a -s ours am skip reason: Change-Id Iee8152f1a730230d1b7c06261a00719a9e55fec6 with SHA-1 449f5b9ced is in history Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1578863 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibd65c0b3fb0cc0141f31bf08197fdf28ea78264d
2021-02-09[automerger skipped] Clean reimport of Wayland core sources 1.17.0 am: ↵Lloyd Pique
049d87ca33 am: bcdc69d383 -s ours am skip reason: Change-Id Iee8152f1a730230d1b7c06261a00719a9e55fec6 with SHA-1 449f5b9ced is in history Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1578863 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib4a3a4e1c24a2aefdb4cbd825fc21db369deaae6
2021-02-09Clean reimport of Wayland core sources 1.17.0 am: 049d87ca33Lloyd Pique
Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1578863 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iea386b014d813291a329d8956e0e1b310384abaf
2021-02-09[automerger skipped] Clean reimport of Wayland core sources 1.17.0 am: ↵Lloyd Pique
449f5b9ced -s ours am skip reason: Change-Id Iee8152f1a730230d1b7c06261a00719a9e55fec6 with SHA-1 dede1aadac is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wayland/+/13521802 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1b3a589573ad0cd834417ed73026014d4c5e9621
2021-02-08Clean reimport of Wayland core sources 1.17.0Lloyd Pique
1. Updates the Wayland official source code location to its new GitLab location. 2. Cleans up the Android metadata around the import 3. Sets up a patches/ subdirectory to record all differences from upstream. 4. Adds two initial patches useful for clients, for logging all message traffic. 5. Adds a helper script import_official_snapshot.py which automates the process of importing new versions and maintaining the patch files, as well as ensuring the timestamp in METADATA is up to date. 6. Updates README.android.md with instructions for using the script. Bug: 174823478 Test: Builds Test: import_official_snapshot.py 1.17.0 # Creates a near-empty commit Change-Id: Iee8152f1a730230d1b7c06261a00719a9e55fec6 Merged-In: Iee8152f1a730230d1b7c06261a00719a9e55fec6
2021-02-05Clean reimport of Wayland core sources 1.17.0Lloyd Pique
1. Updates the Wayland official source code location to its new GitLab location. 2. Cleans up the Android metadata around the import 3. Sets up a patches/ subdirectory to record all differences from upstream. 4. Adds two initial patches useful for clients, for logging all message traffic. 5. Adds a helper script import_official_snapshot.py which automates the process of importing new versions and maintaining the patch files, as well as ensuring the timestamp in METADATA is up to date. 6. Updates README.android.md with instructions for using the script. Bug: 174823478 Test: Builds Test: import_official_snapshot.py 1.17.0 # Creates a near-empty commit Change-Id: Iee8152f1a730230d1b7c06261a00719a9e55fec6 Merged-In: Iee8152f1a730230d1b7c06261a00719a9e55fec6
2021-02-04Clean reimport of Wayland core sources 1.17.0Lloyd Pique
1. Updates the Wayland official source code location to its new GitLab location. 2. Cleans up the Android metadata around the import 3. Sets up a patches/ subdirectory to record all differences from upstream. 4. Adds two initial patches useful for clients, for logging all message traffic. 5. Adds a helper script import_official_snapshot.py which automates the process of importing new versions and maintaining the patch files, as well as ensuring the timestamp in METADATA is up to date. 6. Updates README.android.md with instructions for using the script. Bug: 174823478 Test: Builds Test: import_official_snapshot.py 1.17.0 # Creates a near-empty commit Change-Id: Iee8152f1a730230d1b7c06261a00719a9e55fec6
2020-12-16add crosvm to com.android.virt am: 657f503fad am: 179340eac5 am: 4ba8bb3651Jiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1527725 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6eb09fcc5ae736fcaee77f81f0da659beca4882f
2020-12-16add crosvm to com.android.virt am: 657f503fad am: 179340eac5Jiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1527725 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5b5abaa267515d5c92a51a0a5e2ad51bd7a4675c
2020-12-15add crosvm to com.android.virt am: 657f503fadJiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1527725 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib56c29549b0deb84774aa8a671460badd5c37cb4
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: Id14bcb6fa149446e652f7449e52b9eed1ffba119
2020-11-25Mark ab/6881855 as merged am: 237e1496c1 am: ce4ae28502Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wayland/+/13110690 Change-Id: I8a02b90b71f6796cba0822136d0d91067e7b236c
2020-11-25Mark ab/6881855 as merged am: 237e1496c1Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wayland/+/13110690 Change-Id: I4af9c92bcf4abd30a2835ab883bacee2e8ce8a41
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I2a7b66ea494e6e4c8d34ce3117ddb5cab532f906
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: eecd8d75dc -s ours am: ↵Xin Li
49d1c0eb46 -s ours am: aa1787c564 -s ours am skip reason: Change-Id I6a415b3d680c6a79e84e5e0ad965dfe4d77afeac with SHA-1 9c007ec4f0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wayland/+/12796485 Change-Id: I4c1bebca623d2d3b7c66b21e471ba8846c995f34
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: eecd8d75dc -s ours am: ↵Xin Li
49d1c0eb46 -s ours am skip reason: Change-Id I6a415b3d680c6a79e84e5e0ad965dfe4d77afeac with SHA-1 9c007ec4f0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wayland/+/12796485 Change-Id: I43d4d4698bdc5f287926536def4a58c334299f89
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: eecd8d75dc -s oursXin Li
am skip reason: Change-Id I6a415b3d680c6a79e84e5e0ad965dfe4d77afeac with SHA-1 9c007ec4f0 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wayland/+/12796485 Change-Id: Ib2f514533cc63f92aeed9c95ae11f9ce65484ff6
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I6a415b3d680c6a79e84e5e0ad965dfe4d77afeac Change-Id: I1820d520eedc9f24a51e60ce8cb2f3ac18350990
2020-09-11[automerger skipped] Merge Android R am: 2bf304cfd2 -s ours am: 5db5d7bf02 ↵Xin Li
-s ours am: efed65cd60 -s ours am: a8371cf224 -s ours am: af6a34fcd3 -s ours am skip reason: Change-Id I88973ad95767b663396ee6a7e7f586ce6fa9b123 with SHA-1 ea1ae97779 is in history Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1422393 Change-Id: Icde5b0bec4e5d4d9359973de3b537001268d2e1c
2020-09-11[automerger skipped] Merge Android R am: 2bf304cfd2 -s ours am: 5db5d7bf02 ↵Xin Li
-s ours am: efed65cd60 -s ours am: a8371cf224 -s ours am skip reason: Change-Id I88973ad95767b663396ee6a7e7f586ce6fa9b123 with SHA-1 ea1ae97779 is in history Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1422393 Change-Id: I96d2f7ed38f089c71119b9ab69b0e6e62967416c
2020-09-11[automerger skipped] Merge Android R am: 2bf304cfd2 -s ours am: 5db5d7bf02 ↵Xin Li
-s ours am: efed65cd60 -s ours am skip reason: Change-Id I88973ad95767b663396ee6a7e7f586ce6fa9b123 with SHA-1 ea1ae97779 is in history Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1422393 Change-Id: I2be5deee57b86db86aee6ffda076ea091ab97edb
2020-09-11[automerger skipped] Merge Android R am: 2bf304cfd2 -s ours am: 5db5d7bf02 ↵Xin Li
-s ours am skip reason: Change-Id I88973ad95767b663396ee6a7e7f586ce6fa9b123 with SHA-1 ea1ae97779 is in history Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1422393 Change-Id: I70b82debddff9a0448734d346e8fbad4e4e822aa
2020-09-11[automerger skipped] Merge Android R am: 2bf304cfd2 -s oursXin Li
am skip reason: Change-Id I88973ad95767b663396ee6a7e7f586ce6fa9b123 with SHA-1 ea1ae97779 is in history Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1422393 Change-Id: Ie43af376ead977aad7942af421eea8c3bc28f53e
2020-09-08Merge Android RXin Li
Bug: 168057903 Merged-In: I88973ad95767b663396ee6a7e7f586ce6fa9b123 Change-Id: I9167f3736d096cfebc5b67a56524c3899f0a3caf
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: ea1ae97779 -s ours am: 941a26d0b8 -s ours am: 9a567a6b24 -s ours am: deb58633be -s ours am skip reason: Change-Id I6d44eff89315b9fb0a032d9127c57e400f730305 with SHA-1 af6849b794 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wayland/+/12470121 Change-Id: If2b567c210920dc68e76b92dbe2ab88df5e3e4bd
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: ea1ae97779 -s ours am: 941a26d0b8 -s ours am: 9a567a6b24 -s ours am skip reason: Change-Id I6d44eff89315b9fb0a032d9127c57e400f730305 with SHA-1 af6849b794 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wayland/+/12470121 Change-Id: I7bc7094e375bc94cab950e823fd3a46a1255596e
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: ea1ae97779 -s ours am: 941a26d0b8 -s ours am skip reason: Change-Id I6d44eff89315b9fb0a032d9127c57e400f730305 with SHA-1 af6849b794 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wayland/+/12470121 Change-Id: I0351a6eb44d4e36a11f984578da01768b68af3c4
2020-08-31[automerger skipped] Merge Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) am: ea1ae97779 -s ours am skip reason: Change-Id I6d44eff89315b9fb0a032d9127c57e400f730305 with SHA-1 af6849b794 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wayland/+/12470121 Change-Id: I3ed19c0a6a2334b98c9903e32d35a83d4dd141d9
2020-08-27Merge Android R (rvc-dev-plus-aosp-without-vendor@6692709)temp_sam_168057903Xin Li
Bug: 166295507 Merged-In: I6d44eff89315b9fb0a032d9127c57e400f730305 Change-Id: I88973ad95767b663396ee6a7e7f586ce6fa9b123
2020-08-03[automerger skipped] Merge "Add host shared library target" am: cd6809020d ↵Treehugger Robot
am: 10e5d0d6f0 -s ours am: 9aa9d8f64a -s ours am: 9c007ec4f0 -s ours am: 8d888a932f -s ours am skip reason: Change-Id I6e6b0f154ce9e45830ed42d23847b23e0761ddc5 with SHA-1 19375e79fe is in history Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1382612 Change-Id: Ic2800d6f221ede0d5a1ee1b8a0c5a1d9be28302e
2020-08-03[automerger skipped] Merge "Add host shared library target" am: cd6809020d ↵Treehugger Robot
am: 10e5d0d6f0 -s ours am: 9aa9d8f64a -s ours am: 9c007ec4f0 -s ours am skip reason: Change-Id I6e6b0f154ce9e45830ed42d23847b23e0761ddc5 with SHA-1 19375e79fe is in history Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1382612 Change-Id: Ie22ace5b6219765ba920373dc15d9ee03e740667
2020-08-03[automerger skipped] Merge "Add host shared library target" am: cd6809020d ↵Treehugger Robot
am: 10e5d0d6f0 -s ours am: 9aa9d8f64a -s ours am skip reason: Change-Id I6e6b0f154ce9e45830ed42d23847b23e0761ddc5 with SHA-1 19375e79fe is in history Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1382612 Change-Id: I6a415b3d680c6a79e84e5e0ad965dfe4d77afeac
2020-08-03[automerger skipped] Merge "Add host shared library target" am: cd6809020d ↵Treehugger Robot
am: 10e5d0d6f0 -s ours am skip reason: Change-Id I6e6b0f154ce9e45830ed42d23847b23e0761ddc5 with SHA-1 19375e79fe is in history Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1382612 Change-Id: Id1ad3aa71b3e4381e02c12968916fb1398bee860
2020-08-03Merge "Add host shared library target" am: cd6809020dTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/wayland/+/1382612 Change-Id: I8655334caeae9ce63cc43549708770b6f9e3afa3
2020-08-03Merge "Add host shared library target"Treehugger Robot
2020-08-03Add host shared library target am: 19375e79fe am: 69b3dea223 am: 53f9f565b0Alistair Delva
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wayland/+/12286435 Change-Id: I556f532b650261d98a55ced7ed8936adf3b1c626
2020-08-03Add host shared library target am: 19375e79fe am: 69b3dea223Alistair Delva
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wayland/+/12286435 Change-Id: Iff44440f966b4f069141976299c75347fad10bbc
2020-08-03Add host shared library target am: 19375e79feAlistair Delva
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/wayland/+/12286435 Change-Id: I70398ebb1a55aa32ec35d3f81cb7be73d0895eb4
2020-08-01Add host shared library targetAlistair Delva
Add generated versions of the protocol as 'public-code' instead of 'private-code' so that various symbols are exported from the shared library and can be used downstream by e.g. crosvm. This change includes a workaround to suppress the generation of 32-bit x86 host shared libraries, as these are currently broken due to libffi not compiling correctly for 32-bit x86. We don't need them and thus can safely disable. Due to the split between shared and static, this change also renames the static version to "_static" so that the host shared library on disk has the same name as upstream. Change-Id: I6e6b0f154ce9e45830ed42d23847b23e0761ddc5 Merged-In: I6e6b0f154ce9e45830ed42d23847b23e0761ddc5