208247 2020-02-26 09:44:22 -0800 [LFC][BFC][MarginCollapsing] Decouple regular and pre-computed margin collapsing logic 2020-03-01 20:29:16 -0800 1 1 1 Unclassified WebKit Layout and Rendering WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zalan zalan bfulgham commit-queue fujii koivisto simon.fraser webkit-bug-importer zalan oldest_to_newest 1623035 0 zalan 2020-02-26 09:44:22 -0800 pre-computed is so peculiar it deserves a dedicated file. 1623037 1 webkit-bug-importer 2020-02-26 09:44:40 -0800 <rdar://problem/59808951> 1623042 2 391752 zalan 2020-02-26 09:50:47 -0800 Created attachment 391752 Patch 1623143 3 391752 commit-queue 2020-02-26 13:31:04 -0800 Comment on attachment 391752 Patch Clearing flags on attachment: 391752 Committed r257507: <https://trac.webkit.org/changeset/257507> 1623144 4 commit-queue 2020-02-26 13:31:05 -0800 All reviewed patches have been landed. Closing bug. 1623378 5 391752 fujii 2020-02-26 23:22:47 -0800 Comment on attachment 391752 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391752&action=review > Source/WebCore/layout/blockformatting/PrecomputedBlockMarginCollapse.cpp:66 > + auto collapsedMarginBefore = computedPositiveAndNegativeMargin(firstChildCollapsedMarginBefore(), previouSiblingCollapsedMarginAfter()); computedPositiveAndNegativeMargin is defined in BlockFormattingContext.cpp. It can't be used in --no-unified-builds. I don't know how to fix. Please fix it. 1623459 6 391862 zalan 2020-02-27 07:27:56 -0800 Created attachment 391862 Build fix 1623461 7 zalan 2020-02-27 07:33:41 -0800 fix non-unified builds 1623464 8 391865 zalan 2020-02-27 07:34:50 -0800 Created attachment 391865 Non-unified build fix 1623469 9 391865 commit-queue 2020-02-27 07:43:15 -0800 Comment on attachment 391865 Non-unified build fix Rejecting attachment 391865 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'validate-changelog', '--check-oops', '--non-interactive', 391865, '--port=mac']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit /Volumes/Data/EWS/WebKit/Source/WebCore/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: https://webkit-queues.webkit.org/results/13329925 1623471 10 391867 zalan 2020-02-27 07:46:15 -0800 Created attachment 391867 Non-unified build fix 1623510 11 commit-queue 2020-02-27 08:52:12 -0800 The commit-queue encountered the following flaky tests while processing attachment 391867: imported/w3c/web-platform-tests/xhr/open-after-stop.window.html bug 208320 (author: cdumez@apple.com) The commit-queue is continuing to process your patch. 1623511 12 391867 commit-queue 2020-02-27 08:52:52 -0800 Comment on attachment 391867 Non-unified build fix Clearing flags on attachment: 391867 Committed r257568: <https://trac.webkit.org/changeset/257568> 1623512 13 commit-queue 2020-02-27 08:52:54 -0800 All reviewed patches have been landed. Closing bug. 1624447 14 392112 zalan 2020-03-01 18:12:33 -0800 Created attachment 392112 Non-unified build fix#2 1624448 15 zalan 2020-03-01 18:21:59 -0800 fix non-unified builds 1624449 16 392113 zalan 2020-03-01 18:22:46 -0800 Created attachment 392113 Non-unified build fix#2 1624458 17 392113 commit-queue 2020-03-01 20:29:14 -0800 Comment on attachment 392113 Non-unified build fix#2 Clearing flags on attachment: 392113 Committed r257701: <https://trac.webkit.org/changeset/257701> 1624459 18 commit-queue 2020-03-01 20:29:16 -0800 All reviewed patches have been landed. Closing bug. 391752 2020-02-26 09:50:47 -0800 2020-02-26 13:31:04 -0800 Patch bug-208247-20200226095047.patch text/plain 15900 zalan U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3Mzc1CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZWI3YzNiNGM2NmU2OGMx NzdkZmFkY2Q4ZWIyODY3ODA4YTlmNzllNS4uMmE1YzVkMGNjMmRkZDRhZGUwYmMyZTdlMGQxYTk0 ZGQ3NTBiNjAyNiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI4IEBACisyMDIwLTAyLTI2ICBaYWxh biBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CisKKyAgICAgICAgW0xGQ11bQkZDXVtNYXJnaW5D b2xsYXBzaW5nXSBEZWNvdXBsZSByZWd1bGFyIGFuZCBwcmUtY29tcHV0ZWQgbWFyZ2luIGNvbGxh cHNpbmcgbG9naWMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIwODI0NworICAgICAgICA8cmRhcjovL3Byb2JsZW0vNTk4MDg5NTE+CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHByZS1jb21wdXRlZCBw YXRoIGlzIHNvIHBlY3VsaWFyIGl0IGRlc2VydmVzIGEgZGVkaWNhdGVkIGZpbGUuCisKKyAgICAg ICAgVGhpcyBpcyBpbiBwcmVwYXJhdGlvbiBmb3IgZml4aW5nIGEgZmxhdyBpbiB0aGUgcHJlLWNv bXB1dGVkIGxvZ2ljIHdoZXJlIHdlIGVuZCB1cAorICAgICAgICBhY2Nlc3NpbmcgYSBub3QteWV0 LWNvbXB1dGVkIGhvcml6b250YWwgY29uc3RyYWludC4gTm8gY2hhbmdlIGluIGZ1bmN0aW9uYWxp dHkgYXQgdGhpcyBwb2ludC4KKworICAgICAgICAqIFNvdXJjZXMudHh0OgorICAgICAgICAqIFdl YkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBsYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaDoKKyAgICAgICAgKiBsYXlvdXQvYmxv Y2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwOgorICAgICAgICAoV2ViQ29yZTo6 TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6cG9zaXRpdmVO ZWdhdGl2ZVZhbHVlcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9y bWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjpwcmVjb21wdXRlZE1hcmdpbkJlZm9yZSk6 IERlbGV0ZWQuCisgICAgICAgICogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9QcmVjb21wdXRlZEJs b2NrTWFyZ2luQ29sbGFwc2UuY3BwOiBBZGRlZC4KKyAgICAgICAgKFdlYkNvcmU6OkxheW91dDo6 QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OnByZWNvbXB1dGVkUG9zaXRp dmVOZWdhdGl2ZVZhbHVlcyBjb25zdCk6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjpwcmVjb21wdXRlZFBvc2l0aXZlTmVn YXRpdmVNYXJnaW5CZWZvcmUgY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9j a0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6cHJlY29tcHV0ZWRNYXJnaW5CZWZv cmUpOgorICAgICAgICAqIGxheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRlZ3JhdGlvbkJveFRy ZWUuY3BwOgorCiAyMDIwLTAyLTI1ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0xGQ11bSUZDXVtGbG9hdHNdIEFTU0VSVChjb21taXR0ZWRJbmxpbmVJdGVtQ291 bnQgfHwgbGluZS5oYXNJbnRydXNpdmVGbG9hdCgpKSBpbiBMaW5lTGF5b3V0Q29udGV4dDo6Y2xv c2UKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1NvdXJjZXMudHh0IGIvU291cmNlL1dlYkNv cmUvU291cmNlcy50eHQKaW5kZXggYWZjYWFiM2ExZDNlNTMwODE3ZGIwZmM0YzM0NWZiMTk0ODgx MDNjMC4uYWY0NWM1MTk3MTViNWJmODhhMzExMzIzMTc5ZmMzYTRiZTZlYWIwNiAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvU291cmNlcy50eHQKKysrIGIvU291cmNlL1dlYkNvcmUvU291cmNl cy50eHQKQEAgLTE0MzAsNiArMTQzMCw3IEBAIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tG b3JtYXR0aW5nQ29udGV4dEdlb21ldHJ5LmNwcAogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9j a0Zvcm1hdHRpbmdDb250ZXh0UXVpcmtzLmNwcAogbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9j a0Zvcm1hdHRpbmdTdGF0ZS5jcHAKIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5D b2xsYXBzZS5jcHAKK2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvUHJlY29tcHV0ZWRCbG9ja01hcmdp bkNvbGxhcHNlLmNwcAogbGF5b3V0L2Rpc3BsYXl0cmVlL0Rpc3BsYXlCb3guY3BwCiBsYXlvdXQv ZGlzcGxheXRyZWUvRGlzcGxheUlubGluZUNvbnRlbnQuY3BwCiBsYXlvdXQvZGlzcGxheXRyZWUv RGlzcGxheVBhaW50ZXIuY3BwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhj b2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJv ai9wcm9qZWN0LnBieHByb2oKaW5kZXggZGRiYTk0OGMyYTA4ZjRhMzc4OTc3M2M3Y2U2YzFjMWYx NmQ1ZjExZS4uYmRiOTk3ZTJkMzIxMTU3Mzc5MDdmZmEwMjg0YmFiZjZhNDQ1MWVkOSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisr KyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagpAQCAt OTMyOCw2ICs5MzI4LDcgQEAKIAkJNkY5OTVBMkUxQTcwODMzNzAwQTczNUY0IC8qIEpTV2ViR0xU cmFuc2Zvcm1GZWVkYmFjay5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7IHBhdGggPSBKU1dl YkdMVHJhbnNmb3JtRmVlZGJhY2suaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJNkY5 OTVBMkYxQTcwODMzNzAwQTczNUY0IC8qIEpTV2ViR0xWZXJ0ZXhBcnJheU9iamVjdC5jcHAgKi8g PSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmls ZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBKU1dlYkdMVmVydGV4QXJyYXlPYmpl Y3QuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk2Rjk5NUEzMDFBNzA4MzM3MDBB NzM1RjQgLyogSlNXZWJHTFZlcnRleEFycmF5T2JqZWN0LmggKi8gPSB7aXNhID0gUEJYRmlsZVJl ZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2Rl LmMuaDsgcGF0aCA9IEpTV2ViR0xWZXJ0ZXhBcnJheU9iamVjdC5oOyBzb3VyY2VUcmVlID0gIjxn cm91cD4iOyB9OworCQk2RkFFMTZCQTI0MDZERTdFMDBBNDg0MTQgLyogUHJlY29tcHV0ZWRCbG9j a01hcmdpbkNvbGxhcHNlLmNwcCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBsYXN0S25v d25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuY3BwLmNwcDsgcGF0aCA9IFByZWNvbXB1dGVkQmxvY2tN YXJnaW5Db2xsYXBzZS5jcHA7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CiAJCTZGQjExQjU5 MjE3ODNGQ0YwMEUyQTU3NCAvKiBUZXh0VXRpbC5oICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVu Y2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jLmg7 IHBhdGggPSBUZXh0VXRpbC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk2RkIxMUI1 QjIxNzgzRkNGMDBFMkE1NzQgLyogVGV4dFV0aWwuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZl cmVuY2U7IGZpbGVFbmNvZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5j cHAuY3BwOyBwYXRoID0gVGV4dFV0aWwuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owog CQk2RkIyMkUzMDIzMDA5N0UzMDBDMjA4NjYgLyogVGFibGVHcmlkLmggKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IFRhYmxlR3JpZC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwpAQCAtMTY3NjksNiArMTY3 NzAsNyBAQAogCQkJCTExNUNGQTc5MjA4QjhEOUQwMDFFNjk5MSAvKiBCbG9ja0Zvcm1hdHRpbmdT dGF0ZS5jcHAgKi8sCiAJCQkJMTE1Q0ZBNzgyMDhCOEQ5RDAwMUU2OTkxIC8qIEJsb2NrRm9ybWF0 dGluZ1N0YXRlLmggKi8sCiAJCQkJMTE1Q0ZBODkyMDhCOTIxQTAwMUU2OTkxIC8qIEJsb2NrTWFy Z2luQ29sbGFwc2UuY3BwICovLAorCQkJCTZGQUUxNkJBMjQwNkRFN0UwMEE0ODQxNCAvKiBQcmVj b21wdXRlZEJsb2NrTWFyZ2luQ29sbGFwc2UuY3BwICovLAogCQkJKTsKIAkJCXBhdGggPSBibG9j a2Zvcm1hdHRpbmc7CiAJCQlzb3VyY2VUcmVlID0gIjxncm91cD4iOwpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0 LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGlu Z0NvbnRleHQuaAppbmRleCA1MmYxZTVmYWRlY2IyYWU5NjYwMzdmZmVjYmUzMjIxNjRmYjYxZDU5 Li4xMGZhNWMxMTg5ODAxMjRkMDlkYTM5MzcwNjllODM0NWJjOTBhNzM2IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRl eHQuaAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9y bWF0dGluZ0NvbnRleHQuaApAQCAtMTMwLDYgKzEzMCwxMCBAQCBwcml2YXRlOgogICAgICAgICBQ b3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVlcyBwb3NpdGl2ZU5lZ2F0aXZl VmFsdWVzKGNvbnN0IEJveCYsIE1hcmdpblR5cGUpIGNvbnN0OwogICAgICAgICBQb3NpdGl2ZUFu ZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVlcyBwb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luQmVm b3JlKGNvbnN0IEJveCYsIFVzZWRWZXJ0aWNhbE1hcmdpbjo6Tm9uQ29sbGFwc2VkVmFsdWVzKSBj b25zdDsKICAgICAgICAgUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMg cG9zaXRpdmVOZWdhdGl2ZU1hcmdpbkFmdGVyKGNvbnN0IEJveCYsIFVzZWRWZXJ0aWNhbE1hcmdp bjo6Tm9uQ29sbGFwc2VkVmFsdWVzKSBjb25zdDsKKworICAgICAgICBQb3NpdGl2ZUFuZE5lZ2F0 aXZlVmVydGljYWxNYXJnaW46OlZhbHVlcyBwcmVjb21wdXRlZFBvc2l0aXZlTmVnYXRpdmVNYXJn aW5CZWZvcmUoY29uc3QgQm94JiwgVXNlZFZlcnRpY2FsTWFyZ2luOjpOb25Db2xsYXBzZWRWYWx1 ZXMpIGNvbnN0OworICAgICAgICBQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZh bHVlcyBwcmVjb21wdXRlZFBvc2l0aXZlTmVnYXRpdmVWYWx1ZXMoY29uc3QgQm94JiwgTWFyZ2lu VHlwZSkgY29uc3Q7CisKICAgICAgICAgYm9vbCBoYXNDbGVhcmFuY2UoY29uc3QgQm94JikgY29u c3Q7CiAKICAgICAgICAgTGF5b3V0U3RhdGUmIGxheW91dFN0YXRlKCkgeyByZXR1cm4gbV9ibG9j a0Zvcm1hdHRpbmdDb250ZXh0LmxheW91dFN0YXRlKCk7IH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAgYi9T b3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2Uu Y3BwCmluZGV4IDZlM2I2ZmUxODgzZWZhMjVkMTI5ZDUwZjdlMjgxYTFiZjViOGQ4MWQuLmE1ZTcw YjYwYmZmNDgwODNkYjVhYjU3ODBhOWRjNjVlNjlmMjdjNGMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxh cHNlLmNwcApAQCAtNTA3LDE5ICs1MDcsMTIgQEAgdm9pZCBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0 OjpNYXJnaW5Db2xsYXBzZTo6dXBkYXRlTWFyZ2luQWZ0ZXJGb3JQcmV2aW91c1NpYmxpbmcKIAog UG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgQmxvY2tGb3JtYXR0aW5n Q29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OnBvc2l0aXZlTmVnYXRpdmVWYWx1ZXMoY29uc3QgQm94 JiBsYXlvdXRCb3gsIE1hcmdpblR5cGUgbWFyZ2luVHlwZSkgY29uc3QKIHsKLSAgICBhdXRvJiBs YXlvdXRTdGF0ZSA9IHRoaXMtPmxheW91dFN0YXRlKCk7Ci0gICAgYXV0byYgYmxvY2tGb3JtYXR0 aW5nU3RhdGUgPSBkb3duY2FzdDxCbG9ja0Zvcm1hdHRpbmdTdGF0ZT4obGF5b3V0U3RhdGUuZm9y bWF0dGluZ1N0YXRlRm9yQm94KGxheW91dEJveCkpOwotICAgIGlmIChibG9ja0Zvcm1hdHRpbmdT dGF0ZS5oYXNQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW4obGF5b3V0Qm94KSkgewot ICAgICAgICBhdXRvIHBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbiA9IGJsb2NrRm9y bWF0dGluZ1N0YXRlLnBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbihsYXlvdXRCb3gp OwotICAgICAgICByZXR1cm4gbWFyZ2luVHlwZSA9PSBNYXJnaW5UeXBlOjpCZWZvcmUgPyBwb3Np dGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW4uYmVmb3JlIDogcG9zaXRpdmVBbmROZWdhdGl2 ZVZlcnRpY2FsTWFyZ2luLmFmdGVyOyAKLSAgICB9Ci0gICAgLy8gVGhpcyBpcyB0aGUgcHJlLWNv bXB1dGVkIHBhdGguIFdlIGRvbid0IHlldCBoYXZlIHBvc2l0aXZlL25lZ2F0aXZlIG1hcmdpbiBj b21wdXRlZC4KLSAgICBhdXRvIGNvbXB1dGVkVmVydGljYWxNYXJnaW4gPSBmb3JtYXR0aW5nQ29u dGV4dCgpLmdlb21ldHJ5KCkuY29tcHV0ZWRWZXJ0aWNhbE1hcmdpbihsYXlvdXRCb3gsIEdlb21l dHJ5Ojpob3Jpem9udGFsQ29uc3RyYWludHNGb3JJbkZsb3coZm9ybWF0dGluZ0NvbnRleHQoKS5n ZW9tZXRyeUZvckJveCgqbGF5b3V0Qm94LmNvbnRhaW5pbmdCbG9jaygpKSkpOwotICAgIGF1dG8g bm9uQ29sbGFwc2VkTWFyZ2luID0gVXNlZFZlcnRpY2FsTWFyZ2luOjpOb25Db2xsYXBzZWRWYWx1 ZXMgeyBjb21wdXRlZFZlcnRpY2FsTWFyZ2luLmJlZm9yZS52YWx1ZU9yKDApLCBjb21wdXRlZFZl cnRpY2FsTWFyZ2luLmFmdGVyLnZhbHVlT3IoMCkgfTsgCi0KLSAgICBpZiAobWFyZ2luVHlwZSA9 PSBNYXJnaW5UeXBlOjpCZWZvcmUpCi0gICAgICAgIHJldHVybiBwb3NpdGl2ZU5lZ2F0aXZlTWFy Z2luQmVmb3JlKGxheW91dEJveCwgbm9uQ29sbGFwc2VkTWFyZ2luKTsKLSAgICByZXR1cm4gcG9z aXRpdmVOZWdhdGl2ZU1hcmdpbkFmdGVyKGxheW91dEJveCwgbm9uQ29sbGFwc2VkTWFyZ2luKTsK KyAgICBhdXRvJiBibG9ja0Zvcm1hdHRpbmdTdGF0ZSA9IGRvd25jYXN0PEJsb2NrRm9ybWF0dGlu Z1N0YXRlPihsYXlvdXRTdGF0ZSgpLmZvcm1hdHRpbmdTdGF0ZUZvckJveChsYXlvdXRCb3gpKTsK KyAgICAvLyBCeSB0aGUgdGltZSB3ZSBnZXQgaGVyZSBpbiBCRkMgbGF5b3V0IHRvIGdhdGhlciBw b3NpdGl2ZSBhbmQgbmVnYXRpdmUgbWFyZ2luIHZhbHVlcyBmb3IgYSBlaXRoZXIgYSBwcmV2aW91 cyBzaWJsaW5nIG9yIGEgY2hpbGQgYm94LAorICAgIC8vIHdlIG11c2ggaGF2ZSBjb21wdXRlZCBh bmQgY2FjaGVkIHRob3NlIHZhbHVlZC4KKyAgICBBU1NFUlQoYmxvY2tGb3JtYXR0aW5nU3RhdGUu aGFzUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luKGxheW91dEJveCkpOworICAgIGF1 dG8gcG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luID0gYmxvY2tGb3JtYXR0aW5nU3Rh dGUucG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luKGxheW91dEJveCk7CisgICAgcmV0 dXJuIG1hcmdpblR5cGUgPT0gTWFyZ2luVHlwZTo6QmVmb3JlID8gcG9zaXRpdmVBbmROZWdhdGl2 ZVZlcnRpY2FsTWFyZ2luLmJlZm9yZSA6IHBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdp bi5hZnRlcjsgCiB9CiAKIFBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbjo6VmFsdWVz IEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjpwb3NpdGl2ZU5lZ2F0aXZl TWFyZ2luQmVmb3JlKGNvbnN0IEJveCYgbGF5b3V0Qm94LCBVc2VkVmVydGljYWxNYXJnaW46Ok5v bkNvbGxhcHNlZFZhbHVlcyBub25Db2xsYXBzZWRWYWx1ZXMpIGNvbnN0CkBAIC01NzEsMjIgKzU2 NCw2IEBAIFBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbjo6VmFsdWVzIEJsb2NrRm9y bWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlCiAgICAgcmV0dXJuIGNvbXB1dGVkUG9zaXRp dmVBbmROZWdhdGl2ZU1hcmdpbihsYXN0Q2hpbGRDb2xsYXBzZWRNYXJnaW5BZnRlcigpLCBub25D b2xsYXBzZWRBZnRlcik7CiB9CiAKLVByZWNvbXB1dGVkTWFyZ2luQmVmb3JlIEJsb2NrRm9ybWF0 dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjpwcmVjb21wdXRlZE1hcmdpbkJlZm9yZShjb25z dCBCb3gmIGxheW91dEJveCwgVXNlZFZlcnRpY2FsTWFyZ2luOjpOb25Db2xsYXBzZWRWYWx1ZXMg dXNlZE5vbkNvbGxhcHNlZE1hcmdpbikKLXsKLSAgICBBU1NFUlQobGF5b3V0Qm94LmlzQmxvY2tM ZXZlbEJveCgpKTsKLSAgICAvLyBEb24ndCBwcmUtY29tcHV0ZSB2ZXJ0aWNhbCBtYXJnaW5zIGZv ciBvdXQgb2YgZmxvdyBib3hlcy4KLSAgICBBU1NFUlQobGF5b3V0Qm94LmlzSW5GbG93KCkgfHwg bGF5b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkpOwotICAgIEFTU0VSVCghbGF5b3V0Qm94 LmlzUmVwbGFjZWRCb3goKSk7Ci0KLSAgICBhdXRvIG1hcmdpbnNDb2xsYXBzZVRocm91Z2ggPSB0 aGlzLT5tYXJnaW5zQ29sbGFwc2VUaHJvdWdoKGxheW91dEJveCk7Ci0gICAgYXV0byBwb3NpdGl2 ZU5lZ2F0aXZlTWFyZ2luQmVmb3JlID0gdGhpcy0+cG9zaXRpdmVOZWdhdGl2ZU1hcmdpbkJlZm9y ZShsYXlvdXRCb3gsIHVzZWROb25Db2xsYXBzZWRNYXJnaW4pOwotCi0gICAgYXV0byBjb2xsYXBz ZWRNYXJnaW5CZWZvcmUgPSBtYXJnaW5WYWx1ZSghbWFyZ2luc0NvbGxhcHNlVGhyb3VnaCA/IHBv c2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUKLSAgICAgICAgOiBjb21wdXRlZFBvc2l0aXZlQW5k TmVnYXRpdmVNYXJnaW4ocG9zaXRpdmVOZWdhdGl2ZU1hcmdpbkJlZm9yZSwgcG9zaXRpdmVOZWdh dGl2ZU1hcmdpbkFmdGVyKGxheW91dEJveCwgdXNlZE5vbkNvbGxhcHNlZE1hcmdpbikpKTsKLQot ICAgIHJldHVybiB7IHVzZWROb25Db2xsYXBzZWRNYXJnaW4uYmVmb3JlLCBjb2xsYXBzZWRNYXJn aW5CZWZvcmUsIG1hcmdpbnNDb2xsYXBzZVRocm91Z2ggfTsKLX0KLQogTGF5b3V0VW5pdCBCbG9j a0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luQmVmb3JlSWdub3JpbmdD b2xsYXBzaW5nVGhyb3VnaChjb25zdCBCb3gmIGxheW91dEJveCwgVXNlZFZlcnRpY2FsTWFyZ2lu OjpOb25Db2xsYXBzZWRWYWx1ZXMgbm9uQ29sbGFwc2VkVmFsdWVzKQogewogICAgIEFTU0VSVChs YXlvdXRCb3guaXNCbG9ja0xldmVsQm94KCkpOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv bGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9QcmVjb21wdXRlZEJsb2NrTWFyZ2luQ29sbGFwc2UuY3Bw IGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9QcmVjb21wdXRlZEJsb2Nr TWFyZ2luQ29sbGFwc2UuY3BwCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjE1MDkwZDMwNGQ1ZDY1NDczNDYxYmY2NWYz NWY4NDE5ZGM1NzY3ZGEKLS0tIC9kZXYvbnVsbAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQv YmxvY2tmb3JtYXR0aW5nL1ByZWNvbXB1dGVkQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKQEAgLTAs MCArMSw5NyBAQAorLyoKKyAqIENvcHlyaWdodCAoQykgMjAyMCBBcHBsZSBJbmMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCisgKgorICogUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5k IGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisgKiBtb2RpZmljYXRpb24sIGFyZSBwZXJt aXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKKyAqIGFyZSBtZXQ6 CisgKiAxLiBSZWRpc3RyaWJ1dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFi b3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQg dGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyLgorICogMi4gUmVkaXN0cmlidXRpb25zIGluIGJpbmFy eSBmb3JtIG11c3QgcmVwcm9kdWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwg dGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0 aGUKKyAqICAgIGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3 aXRoIHRoZSBkaXN0cmlidXRpb24uCisgKgorICogVEhJUyBTT0ZUV0FSRSBJUyBQUk9WSURFRCBC WSBBUFBMRSBJTkMuIEFORCBJVFMgQ09OVFJJQlVUT1JTIGBgQVMgSVMnJworICogQU5EIEFOWSBF WFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQg VE8sCisgKiBUSEUgSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklU TkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiBJTiBOTyBF VkVOVCBTSEFMTCBBUFBMRSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMKKyAqIEJFIExJQUJMRSBG T1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsIEVYRU1QTEFSWSwg T1IKKyAqIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQg VE8sIFBST0NVUkVNRU5UIE9GCisgKiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NT IE9GIFVTRSwgREFUQSwgT1IgUFJPRklUUzsgT1IgQlVTSU5FU1MKKyAqIElOVEVSUlVQVElPTikg SE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkgT0YgTElBQklMSVRZLCBXSEVUSEVSIElO CisgKiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJ R0VOQ0UgT1IgT1RIRVJXSVNFKQorICogQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNF IE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRgorICogVEhFIFBPU1NJQklMSVRZ IE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpbmNsdWRlICJjb25maWcuaCIKKyNpbmNsdWRlICJC bG9ja0Zvcm1hdHRpbmdDb250ZXh0LmgiCisKKyNpZiBFTkFCTEUoTEFZT1VUX0ZPUk1BVFRJTkdf Q09OVEVYVCkKKworI2luY2x1ZGUgIkxheW91dEJveC5oIgorI2luY2x1ZGUgIkxheW91dENvbnRh aW5lckJveC5oIgorI2luY2x1ZGUgIkxheW91dFVuaXQuaCIKKyNpbmNsdWRlICJSZW5kZXJTdHls ZS5oIgorCituYW1lc3BhY2UgV2ViQ29yZSB7CituYW1lc3BhY2UgTGF5b3V0IHsKKworUG9zaXRp dmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgQmxvY2tGb3JtYXR0aW5nQ29udGV4 dDo6TWFyZ2luQ29sbGFwc2U6OnByZWNvbXB1dGVkUG9zaXRpdmVOZWdhdGl2ZVZhbHVlcyhjb25z dCBCb3gmIGxheW91dEJveCwgTWFyZ2luVHlwZSBtYXJnaW5UeXBlKSBjb25zdAoreworICAgIGF1 dG8gY29tcHV0ZWRWZXJ0aWNhbE1hcmdpbiA9IGZvcm1hdHRpbmdDb250ZXh0KCkuZ2VvbWV0cnko KS5jb21wdXRlZFZlcnRpY2FsTWFyZ2luKGxheW91dEJveCwgR2VvbWV0cnk6Omhvcml6b250YWxD b25zdHJhaW50c0ZvckluRmxvdyhmb3JtYXR0aW5nQ29udGV4dCgpLmdlb21ldHJ5Rm9yQm94KCps YXlvdXRCb3guY29udGFpbmluZ0Jsb2NrKCkpKSk7CisgICAgYXV0byBub25Db2xsYXBzZWRNYXJn aW4gPSBVc2VkVmVydGljYWxNYXJnaW46Ok5vbkNvbGxhcHNlZFZhbHVlcyB7IGNvbXB1dGVkVmVy dGljYWxNYXJnaW4uYmVmb3JlLnZhbHVlT3IoMCksIGNvbXB1dGVkVmVydGljYWxNYXJnaW4uYWZ0 ZXIudmFsdWVPcigwKSB9OyAKKworICAgIGlmIChtYXJnaW5UeXBlID09IE1hcmdpblR5cGU6OkJl Zm9yZSkKKyAgICAgICAgcmV0dXJuIHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUobGF5b3V0 Qm94LCBub25Db2xsYXBzZWRNYXJnaW4pOworICAgIHJldHVybiBwb3NpdGl2ZU5lZ2F0aXZlTWFy Z2luQWZ0ZXIobGF5b3V0Qm94LCBub25Db2xsYXBzZWRNYXJnaW4pOworfQorCitQb3NpdGl2ZUFu ZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVlcyBCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpN YXJnaW5Db2xsYXBzZTo6cHJlY29tcHV0ZWRQb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luQmVmb3JlKGNv bnN0IEJveCYgbGF5b3V0Qm94LCBVc2VkVmVydGljYWxNYXJnaW46Ok5vbkNvbGxhcHNlZFZhbHVl cyBub25Db2xsYXBzZWRWYWx1ZXMpIGNvbnN0Cit7CisgICAgYXV0byBmaXJzdENoaWxkQ29sbGFw c2VkTWFyZ2luQmVmb3JlID0gWyZdKCkgLT4gUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFy Z2luOjpWYWx1ZXMgeworICAgICAgICBpZiAoIW1hcmdpbkJlZm9yZUNvbGxhcHNlc1dpdGhGaXJz dEluRmxvd0NoaWxkTWFyZ2luQmVmb3JlKGxheW91dEJveCkpCisgICAgICAgICAgICByZXR1cm4g eyB9OworICAgICAgICByZXR1cm4gcHJlY29tcHV0ZWRQb3NpdGl2ZU5lZ2F0aXZlVmFsdWVzKCpk b3duY2FzdDxDb250YWluZXJCb3g+KGxheW91dEJveCkuZmlyc3RJbkZsb3dDaGlsZCgpLCBNYXJn aW5UeXBlOjpCZWZvcmUpOworICAgIH07CisKKyAgICBhdXRvIHByZXZpb3VTaWJsaW5nQ29sbGFw c2VkTWFyZ2luQWZ0ZXIgPSBbJl0oKSAtPiBQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJn aW46OlZhbHVlcyB7CisgICAgICAgIGlmICghbWFyZ2luQmVmb3JlQ29sbGFwc2VzV2l0aFByZXZp b3VzU2libGluZ01hcmdpbkFmdGVyKGxheW91dEJveCkpCisgICAgICAgICAgICByZXR1cm4geyB9 OworICAgICAgICByZXR1cm4gcHJlY29tcHV0ZWRQb3NpdGl2ZU5lZ2F0aXZlVmFsdWVzKCpsYXlv dXRCb3gucHJldmlvdXNJbkZsb3dTaWJsaW5nKCksIE1hcmdpblR5cGU6OkFmdGVyKTsKKyAgICB9 OworCisgICAgLy8gMS4gR2F0aGVyIHBvc2l0aXZlIGFuZCBuZWdhdGl2ZSBtYXJnaW4gdmFsdWVz IGZyb20gZmlyc3QgY2hpbGQgaWYgbWFyZ2lucyBhcmUgYWRqb2luaW5nLgorICAgIC8vIDIuIEdh dGhlciBwb3NpdGl2ZSBhbmQgbmVnYXRpdmUgbWFyZ2luIHZhbHVlcyBmcm9tIHByZXZpb3VzIGlu ZmxvdyBzaWJsaW5nIGlmIG1hcmdpbnMgYXJlIGFkam9pbmluZy4KKyAgICAvLyAzLiBDb21wdXRl IG1pbi9tYXggcG9zaXRpdmUgYW5kIG5lZ2F0aXZlIGNvbGxhcHNlZCBtYXJnaW4gdmFsdWVzIHVz aW5nIG5vbi1jb2xscGFzZWQgY29tcHV0ZWQgbWFyZ2luIGJlZm9yZS4KKyAgICBhdXRvIGNvbGxh cHNlZE1hcmdpbkJlZm9yZSA9IGNvbXB1dGVkUG9zaXRpdmVBbmROZWdhdGl2ZU1hcmdpbihmaXJz dENoaWxkQ29sbGFwc2VkTWFyZ2luQmVmb3JlKCksIHByZXZpb3VTaWJsaW5nQ29sbGFwc2VkTWFy Z2luQWZ0ZXIoKSk7CisgICAgaWYgKGNvbGxhcHNlZE1hcmdpbkJlZm9yZS5pc1F1aXJrICYmIGZv cm1hdHRpbmdDb250ZXh0KCkucXVpcmtzKCkuc2hvdWxkSWdub3JlQ29sbGFwc2VkUXVpcmtNYXJn aW4obGF5b3V0Qm94KSkKKyAgICAgICAgY29sbGFwc2VkTWFyZ2luQmVmb3JlID0geyB9OworCisg ICAgYXV0byBub25Db2xsYXBzZWRCZWZvcmUgPSBQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxN YXJnaW46OlZhbHVlcyB7IH07CisgICAgaWYgKG5vbkNvbGxhcHNlZFZhbHVlcy5iZWZvcmUgPiAw KQorICAgICAgICBub25Db2xsYXBzZWRCZWZvcmUgPSB7IG5vbkNvbGxhcHNlZFZhbHVlcy5iZWZv cmUsIHsgfSwgbGF5b3V0Qm94LnN0eWxlKCkuaGFzTWFyZ2luQmVmb3JlUXVpcmsoKSB9OworICAg IGVsc2UgaWYgKG5vbkNvbGxhcHNlZFZhbHVlcy5iZWZvcmUgPCAwKQorICAgICAgICBub25Db2xs YXBzZWRCZWZvcmUgPSB7IHsgfSwgbm9uQ29sbGFwc2VkVmFsdWVzLmJlZm9yZSwgbGF5b3V0Qm94 LnN0eWxlKCkuaGFzTWFyZ2luQmVmb3JlUXVpcmsoKSB9OworCisgICAgcmV0dXJuIGNvbXB1dGVk UG9zaXRpdmVBbmROZWdhdGl2ZU1hcmdpbihjb2xsYXBzZWRNYXJnaW5CZWZvcmUsIG5vbkNvbGxh cHNlZEJlZm9yZSk7Cit9CisKK1ByZWNvbXB1dGVkTWFyZ2luQmVmb3JlIEJsb2NrRm9ybWF0dGlu Z0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjpwcmVjb21wdXRlZE1hcmdpbkJlZm9yZShjb25zdCBC b3gmIGxheW91dEJveCwgVXNlZFZlcnRpY2FsTWFyZ2luOjpOb25Db2xsYXBzZWRWYWx1ZXMgdXNl ZE5vbkNvbGxhcHNlZE1hcmdpbikKK3sKKyAgICBBU1NFUlQobGF5b3V0Qm94LmlzQmxvY2tMZXZl bEJveCgpKTsKKyAgICAvLyBEb24ndCBwcmUtY29tcHV0ZSB2ZXJ0aWNhbCBtYXJnaW5zIGZvciBv dXQgb2YgZmxvdyBib3hlcy4KKyAgICBBU1NFUlQobGF5b3V0Qm94LmlzSW5GbG93KCkgfHwgbGF5 b3V0Qm94LmlzRmxvYXRpbmdQb3NpdGlvbmVkKCkpOworICAgIEFTU0VSVCghbGF5b3V0Qm94Lmlz UmVwbGFjZWRCb3goKSk7CisKKyAgICBhdXRvIG1hcmdpbnNDb2xsYXBzZVRocm91Z2ggPSB0aGlz LT5tYXJnaW5zQ29sbGFwc2VUaHJvdWdoKGxheW91dEJveCk7CisgICAgYXV0byBwb3NpdGl2ZU5l Z2F0aXZlTWFyZ2luQmVmb3JlID0gcHJlY29tcHV0ZWRQb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luQmVm b3JlKGxheW91dEJveCwgdXNlZE5vbkNvbGxhcHNlZE1hcmdpbik7CisKKyAgICBhdXRvIGNvbGxh cHNlZE1hcmdpbkJlZm9yZSA9IG1hcmdpblZhbHVlKCFtYXJnaW5zQ29sbGFwc2VUaHJvdWdoID8g cG9zaXRpdmVOZWdhdGl2ZU1hcmdpbkJlZm9yZQorICAgICAgICA6IGNvbXB1dGVkUG9zaXRpdmVB bmROZWdhdGl2ZU1hcmdpbihwb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luQmVmb3JlLCBwb3NpdGl2ZU5l Z2F0aXZlTWFyZ2luQWZ0ZXIobGF5b3V0Qm94LCB1c2VkTm9uQ29sbGFwc2VkTWFyZ2luKSkpOwor CisgICAgcmV0dXJuIHsgdXNlZE5vbkNvbGxhcHNlZE1hcmdpbi5iZWZvcmUsIGNvbGxhcHNlZE1h cmdpbkJlZm9yZSwgbWFyZ2luc0NvbGxhcHNlVGhyb3VnaCB9OworfQorCit9Cit9CisjZW5kaWYK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9pbnRlZ3JhdGlvbi9MYXlvdXRJbnRl Z3JhdGlvbkJveFRyZWUuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xh eW91dEludGVncmF0aW9uQm94VHJlZS5jcHAKaW5kZXggNzZmNTNmMzRlZjNiZmViMDlkODEzODA2 NzEzMTZjODZmOTA1MmQ3OC4uNjJjZTFlMGVhYjMwNzAwNzcxMzE1N2JlZTc5MTA2Y2Y5NGM4YzNl NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0aW9uL0xheW91dElu dGVncmF0aW9uQm94VHJlZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2ludGVncmF0 aW9uL0xheW91dEludGVncmF0aW9uQm94VHJlZS5jcHAKQEAgLTI4LDYgKzI4LDcgQEAKIAogI2lm IEVOQUJMRShMQVlPVVRfRk9STUFUVElOR19DT05URVhUKQogCisjaW5jbHVkZSAiTGF5b3V0SW5s aW5lVGV4dEJveC5oIgogI2luY2x1ZGUgIkxheW91dExpbmVCcmVha0JveC5oIgogI2luY2x1ZGUg IlJlbmRlckJsb2NrRmxvdy5oIgogI2luY2x1ZGUgIlJlbmRlckNoaWxkSXRlcmF0b3IuaCIK 391862 2020-02-27 07:27:56 -0800 2020-02-27 07:34:50 -0800 Build fix Patch.txt text/plain 4001 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxYzZkYWNmNmZlYS4uZTBmM2JkMGE5MWQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAyMC0wMi0yNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIEZpeCAtLW5vLXVuaWZpZWQtYnVpbGQgYWZ0ZXIgcjI1NzUwNy4KKworICAgICAg ICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oOgorICAg ICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNv bGxhcHNlOjpjb21wdXRlZFBvc2l0aXZlQW5kTmVnYXRpdmVNYXJnaW4gY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBz ZTo6dXBkYXRlTWFyZ2luQWZ0ZXJGb3JQcmV2aW91c1NpYmxpbmcpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0Ojpjb21wdXRlZFBvc2l0aXZlQW5kTmVnYXRpdmVNYXJnaW4pOiBEZWxldGVkLgor CiAyMDIwLTAyLTI2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAg IENyZWF0ZSBBdWRpb0Rlc3RpbmF0aW9uIGluIHRoZSBHUFUgcHJvY2VzcwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250 ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0 dGluZ0NvbnRleHQuaAppbmRleCAxMGZhNWMxMTg5OC4uNjcxYTg4ODFlYTggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29u dGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tG b3JtYXR0aW5nQ29udGV4dC5oCkBAIC0xMzQsNiArMTM0LDggQEAgcHJpdmF0ZToKICAgICAgICAg UG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgcHJlY29tcHV0ZWRQb3Np dGl2ZU5lZ2F0aXZlTWFyZ2luQmVmb3JlKGNvbnN0IEJveCYsIFVzZWRWZXJ0aWNhbE1hcmdpbjo6 Tm9uQ29sbGFwc2VkVmFsdWVzKSBjb25zdDsKICAgICAgICAgUG9zaXRpdmVBbmROZWdhdGl2ZVZl cnRpY2FsTWFyZ2luOjpWYWx1ZXMgcHJlY29tcHV0ZWRQb3NpdGl2ZU5lZ2F0aXZlVmFsdWVzKGNv bnN0IEJveCYsIE1hcmdpblR5cGUpIGNvbnN0OwogCisgICAgICAgIFBvc2l0aXZlQW5kTmVnYXRp dmVWZXJ0aWNhbE1hcmdpbjo6VmFsdWVzIGNvbXB1dGVkUG9zaXRpdmVBbmROZWdhdGl2ZU1hcmdp bihQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVlcywgUG9zaXRpdmVBbmRO ZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMpIGNvbnN0OworCiAgICAgICAgIGJvb2wgaGFz Q2xlYXJhbmNlKGNvbnN0IEJveCYpIGNvbnN0OwogCiAgICAgICAgIExheW91dFN0YXRlJiBsYXlv dXRTdGF0ZSgpIHsgcmV0dXJuIG1fYmxvY2tGb3JtYXR0aW5nQ29udGV4dC5sYXlvdXRTdGF0ZSgp OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrTWFyZ2luQ29sbGFwc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcAppbmRleCBhNWU3MGI2MGJmZi4uNjhkNjNhZDQ1 YmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxv Y2tNYXJnaW5Db2xsYXBzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcApAQCAtNDI3LDcgKzQyNyw3IEBAIGJvb2wg QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbnNDb2xsYXBzZVRo cm91Z2goY29uc3QgQm94JiBsCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXN0YXRpYyBQb3NpdGl2 ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVlcyBjb21wdXRlZFBvc2l0aXZlQW5kTmVn YXRpdmVNYXJnaW4oUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgYSwg UG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgYikKK1Bvc2l0aXZlQW5k TmVnYXRpdmVWZXJ0aWNhbE1hcmdpbjo6VmFsdWVzIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1h cmdpbkNvbGxhcHNlOjpjb21wdXRlZFBvc2l0aXZlQW5kTmVnYXRpdmVNYXJnaW4oUG9zaXRpdmVB bmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgYSwgUG9zaXRpdmVBbmROZWdhdGl2ZVZl cnRpY2FsTWFyZ2luOjpWYWx1ZXMgYikgY29uc3QKIHsKICAgICBQb3NpdGl2ZUFuZE5lZ2F0aXZl VmVydGljYWxNYXJnaW46OlZhbHVlcyBjb21wdXRlZFZhbHVlczsKICAgICBpZiAoYS5wb3NpdGl2 ZSAmJiBiLnBvc2l0aXZlKQpAQCAtNDkxLDkgKzQ5MSw5IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5n Q29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OnVwZGF0ZU1hcmdpbkFmdGVyRm9yUHJldmlvdXNTaWJs aW5nCiAgICAgICAgIGF1dG8gcHJldmlvdXNTaWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdpbiA9 IGJsb2NrRm9ybWF0dGluZ1N0YXRlLnBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbihw cmV2aW91c1NpYmxpbmcpOwogICAgICAgICBhdXRvIHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZv cmUgPSBibG9ja0Zvcm1hdHRpbmdTdGF0ZS5wb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJn aW4oKmN1cnJlbnRCb3gpLmJlZm9yZTsKIAotICAgICAgICBwcmV2aW91c1NpYmxpbmdQb3NpdGl2 ZU5lZ2F0aXZlTWFyZ2luLmFmdGVyID0gY29tcHV0ZWRQb3NpdGl2ZUFuZE5lZ2F0aXZlTWFyZ2lu KHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUsIHByZXZpb3VzU2libGluZ1Bvc2l0aXZlTmVn YXRpdmVNYXJnaW4uYWZ0ZXIpOworICAgICAgICBwcmV2aW91c1NpYmxpbmdQb3NpdGl2ZU5lZ2F0 aXZlTWFyZ2luLmFmdGVyID0gbWFyZ2luQ29sbGFwc2UuY29tcHV0ZWRQb3NpdGl2ZUFuZE5lZ2F0 aXZlTWFyZ2luKHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUsIHByZXZpb3VzU2libGluZ1Bv c2l0aXZlTmVnYXRpdmVNYXJnaW4uYWZ0ZXIpOwogICAgICAgICBpZiAobWFyZ2luc0NvbGxhcHNl VGhyb3VnaCkgewotICAgICAgICAgICAgcHJldmlvdXNTaWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1h cmdpbi5iZWZvcmUgPSBjb21wdXRlZFBvc2l0aXZlQW5kTmVnYXRpdmVNYXJnaW4ocHJldmlvdXNT aWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdpbi5iZWZvcmUsIHByZXZpb3VzU2libGluZ1Bvc2l0 aXZlTmVnYXRpdmVNYXJnaW4uYWZ0ZXIpOworICAgICAgICAgICAgcHJldmlvdXNTaWJsaW5nUG9z aXRpdmVOZWdhdGl2ZU1hcmdpbi5iZWZvcmUgPSBtYXJnaW5Db2xsYXBzZS5jb21wdXRlZFBvc2l0 aXZlQW5kTmVnYXRpdmVNYXJnaW4ocHJldmlvdXNTaWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdp bi5iZWZvcmUsIHByZXZpb3VzU2libGluZ1Bvc2l0aXZlTmVnYXRpdmVNYXJnaW4uYWZ0ZXIpOwog ICAgICAgICAgICAgcHJldmlvdXNTaWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdpbi5hZnRlciA9 IHByZXZpb3VzU2libGluZ1Bvc2l0aXZlTmVnYXRpdmVNYXJnaW4uYmVmb3JlOwogICAgICAgICB9 CiAgICAgICAgIGJsb2NrRm9ybWF0dGluZ1N0YXRlLnNldFBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0 aWNhbE1hcmdpbihwcmV2aW91c1NpYmxpbmcsIHByZXZpb3VzU2libGluZ1Bvc2l0aXZlTmVnYXRp dmVNYXJnaW4pOwo= 391865 2020-02-27 07:34:50 -0800 2020-02-27 07:46:15 -0800 Non-unified build fix Patch.txt text/plain 4001 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxYzZkYWNmNmZlYS4uZTBmM2JkMGE5MWQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAyMC0wMi0yNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIEZpeCAtLW5vLXVuaWZpZWQtYnVpbGQgYWZ0ZXIgcjI1NzUwNy4KKworICAgICAg ICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oOgorICAg ICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNv bGxhcHNlOjpjb21wdXRlZFBvc2l0aXZlQW5kTmVnYXRpdmVNYXJnaW4gY29uc3QpOgorICAgICAg ICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBz ZTo6dXBkYXRlTWFyZ2luQWZ0ZXJGb3JQcmV2aW91c1NpYmxpbmcpOgorICAgICAgICAoV2ViQ29y ZTo6TGF5b3V0Ojpjb21wdXRlZFBvc2l0aXZlQW5kTmVnYXRpdmVNYXJnaW4pOiBEZWxldGVkLgor CiAyMDIwLTAyLTI2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgogCiAgICAgICAg IENyZWF0ZSBBdWRpb0Rlc3RpbmF0aW9uIGluIHRoZSBHUFUgcHJvY2VzcwpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250 ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0 dGluZ0NvbnRleHQuaAppbmRleCAxMGZhNWMxMTg5OC4uNjcxYTg4ODFlYTggMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29u dGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tG b3JtYXR0aW5nQ29udGV4dC5oCkBAIC0xMzQsNiArMTM0LDggQEAgcHJpdmF0ZToKICAgICAgICAg UG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgcHJlY29tcHV0ZWRQb3Np dGl2ZU5lZ2F0aXZlTWFyZ2luQmVmb3JlKGNvbnN0IEJveCYsIFVzZWRWZXJ0aWNhbE1hcmdpbjo6 Tm9uQ29sbGFwc2VkVmFsdWVzKSBjb25zdDsKICAgICAgICAgUG9zaXRpdmVBbmROZWdhdGl2ZVZl cnRpY2FsTWFyZ2luOjpWYWx1ZXMgcHJlY29tcHV0ZWRQb3NpdGl2ZU5lZ2F0aXZlVmFsdWVzKGNv bnN0IEJveCYsIE1hcmdpblR5cGUpIGNvbnN0OwogCisgICAgICAgIFBvc2l0aXZlQW5kTmVnYXRp dmVWZXJ0aWNhbE1hcmdpbjo6VmFsdWVzIGNvbXB1dGVkUG9zaXRpdmVBbmROZWdhdGl2ZU1hcmdp bihQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVlcywgUG9zaXRpdmVBbmRO ZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMpIGNvbnN0OworCiAgICAgICAgIGJvb2wgaGFz Q2xlYXJhbmNlKGNvbnN0IEJveCYpIGNvbnN0OwogCiAgICAgICAgIExheW91dFN0YXRlJiBsYXlv dXRTdGF0ZSgpIHsgcmV0dXJuIG1fYmxvY2tGb3JtYXR0aW5nQ29udGV4dC5sYXlvdXRTdGF0ZSgp OyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0aW5nL0Js b2NrTWFyZ2luQ29sbGFwc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0 dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcAppbmRleCBhNWU3MGI2MGJmZi4uNjhkNjNhZDQ1 YmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxv Y2tNYXJnaW5Db2xsYXBzZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9y bWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcApAQCAtNDI3LDcgKzQyNyw3IEBAIGJvb2wg QmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6Om1hcmdpbnNDb2xsYXBzZVRo cm91Z2goY29uc3QgQm94JiBsCiAgICAgcmV0dXJuIHRydWU7CiB9CiAKLXN0YXRpYyBQb3NpdGl2 ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVlcyBjb21wdXRlZFBvc2l0aXZlQW5kTmVn YXRpdmVNYXJnaW4oUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgYSwg UG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgYikKK1Bvc2l0aXZlQW5k TmVnYXRpdmVWZXJ0aWNhbE1hcmdpbjo6VmFsdWVzIEJsb2NrRm9ybWF0dGluZ0NvbnRleHQ6Ok1h cmdpbkNvbGxhcHNlOjpjb21wdXRlZFBvc2l0aXZlQW5kTmVnYXRpdmVNYXJnaW4oUG9zaXRpdmVB bmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgYSwgUG9zaXRpdmVBbmROZWdhdGl2ZVZl cnRpY2FsTWFyZ2luOjpWYWx1ZXMgYikgY29uc3QKIHsKICAgICBQb3NpdGl2ZUFuZE5lZ2F0aXZl VmVydGljYWxNYXJnaW46OlZhbHVlcyBjb21wdXRlZFZhbHVlczsKICAgICBpZiAoYS5wb3NpdGl2 ZSAmJiBiLnBvc2l0aXZlKQpAQCAtNDkxLDkgKzQ5MSw5IEBAIHZvaWQgQmxvY2tGb3JtYXR0aW5n Q29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OnVwZGF0ZU1hcmdpbkFmdGVyRm9yUHJldmlvdXNTaWJs aW5nCiAgICAgICAgIGF1dG8gcHJldmlvdXNTaWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdpbiA9 IGJsb2NrRm9ybWF0dGluZ1N0YXRlLnBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbihw cmV2aW91c1NpYmxpbmcpOwogICAgICAgICBhdXRvIHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZv cmUgPSBibG9ja0Zvcm1hdHRpbmdTdGF0ZS5wb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJn aW4oKmN1cnJlbnRCb3gpLmJlZm9yZTsKIAotICAgICAgICBwcmV2aW91c1NpYmxpbmdQb3NpdGl2 ZU5lZ2F0aXZlTWFyZ2luLmFmdGVyID0gY29tcHV0ZWRQb3NpdGl2ZUFuZE5lZ2F0aXZlTWFyZ2lu KHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUsIHByZXZpb3VzU2libGluZ1Bvc2l0aXZlTmVn YXRpdmVNYXJnaW4uYWZ0ZXIpOworICAgICAgICBwcmV2aW91c1NpYmxpbmdQb3NpdGl2ZU5lZ2F0 aXZlTWFyZ2luLmFmdGVyID0gbWFyZ2luQ29sbGFwc2UuY29tcHV0ZWRQb3NpdGl2ZUFuZE5lZ2F0 aXZlTWFyZ2luKHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUsIHByZXZpb3VzU2libGluZ1Bv c2l0aXZlTmVnYXRpdmVNYXJnaW4uYWZ0ZXIpOwogICAgICAgICBpZiAobWFyZ2luc0NvbGxhcHNl VGhyb3VnaCkgewotICAgICAgICAgICAgcHJldmlvdXNTaWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1h cmdpbi5iZWZvcmUgPSBjb21wdXRlZFBvc2l0aXZlQW5kTmVnYXRpdmVNYXJnaW4ocHJldmlvdXNT aWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdpbi5iZWZvcmUsIHByZXZpb3VzU2libGluZ1Bvc2l0 aXZlTmVnYXRpdmVNYXJnaW4uYWZ0ZXIpOworICAgICAgICAgICAgcHJldmlvdXNTaWJsaW5nUG9z aXRpdmVOZWdhdGl2ZU1hcmdpbi5iZWZvcmUgPSBtYXJnaW5Db2xsYXBzZS5jb21wdXRlZFBvc2l0 aXZlQW5kTmVnYXRpdmVNYXJnaW4ocHJldmlvdXNTaWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdp bi5iZWZvcmUsIHByZXZpb3VzU2libGluZ1Bvc2l0aXZlTmVnYXRpdmVNYXJnaW4uYWZ0ZXIpOwog ICAgICAgICAgICAgcHJldmlvdXNTaWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdpbi5hZnRlciA9 IHByZXZpb3VzU2libGluZ1Bvc2l0aXZlTmVnYXRpdmVNYXJnaW4uYmVmb3JlOwogICAgICAgICB9 CiAgICAgICAgIGJsb2NrRm9ybWF0dGluZ1N0YXRlLnNldFBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0 aWNhbE1hcmdpbihwcmV2aW91c1NpYmxpbmcsIHByZXZpb3VzU2libGluZ1Bvc2l0aXZlTmVnYXRp dmVNYXJnaW4pOwo= 391867 2020-02-27 07:46:15 -0800 2020-02-27 08:52:52 -0800 Non-unified build fix Patch.txt text/plain 4022 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCAxYzZkYWNmNmZlYS4uYjBkYjc5M2Q2MWEgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMyBAQAorMjAyMC0wMi0yNyAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IGZvciBub24tdW5pZmllZCBidWlsZHMgYWZ0 ZXIgcjI1NzUwNy4KKworICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tN YXJnaW5Db2xsYXBzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0 dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjpjb21wdXRlZFBvc2l0aXZlQW5kTmVnYXRpdmVN YXJnaW4gY29uc3QpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0OjpCbG9ja0Zvcm1hdHRpbmdD b250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6dXBkYXRlTWFyZ2luQWZ0ZXJGb3JQcmV2aW91c1NpYmxp bmcpOgorICAgICAgICAoV2ViQ29yZTo6TGF5b3V0Ojpjb21wdXRlZFBvc2l0aXZlQW5kTmVnYXRp dmVNYXJnaW4pOiBEZWxldGVkLgorCiAyMDIwLTAyLTI2ICBSeW9zdWtlIE5pd2EgIDxybml3YUB3 ZWJraXQub3JnPgogCiAgICAgICAgIENyZWF0ZSBBdWRpb0Rlc3RpbmF0aW9uIGluIHRoZSBHUFUg cHJvY2VzcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGlu Zy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tm b3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCAxMGZhNWMxMTg5OC4uNjcx YTg4ODFlYTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRp bmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2xheW91dC9i bG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC0xMzQsNiArMTM0LDgg QEAgcHJpdmF0ZToKICAgICAgICAgUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpW YWx1ZXMgcHJlY29tcHV0ZWRQb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luQmVmb3JlKGNvbnN0IEJveCYs IFVzZWRWZXJ0aWNhbE1hcmdpbjo6Tm9uQ29sbGFwc2VkVmFsdWVzKSBjb25zdDsKICAgICAgICAg UG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgcHJlY29tcHV0ZWRQb3Np dGl2ZU5lZ2F0aXZlVmFsdWVzKGNvbnN0IEJveCYsIE1hcmdpblR5cGUpIGNvbnN0OwogCisgICAg ICAgIFBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbjo6VmFsdWVzIGNvbXB1dGVkUG9z aXRpdmVBbmROZWdhdGl2ZU1hcmdpbihQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46 OlZhbHVlcywgUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMpIGNvbnN0 OworCiAgICAgICAgIGJvb2wgaGFzQ2xlYXJhbmNlKGNvbnN0IEJveCYpIGNvbnN0OwogCiAgICAg ICAgIExheW91dFN0YXRlJiBsYXlvdXRTdGF0ZSgpIHsgcmV0dXJuIG1fYmxvY2tGb3JtYXR0aW5n Q29udGV4dC5sYXlvdXRTdGF0ZSgpOyB9CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwIGIvU291cmNlL1dlYkNv cmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcAppbmRleCBh NWU3MGI2MGJmZi4uNjhkNjNhZDQ1YmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91 dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tNYXJnaW5Db2xsYXBzZS5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9ja01hcmdpbkNvbGxhcHNlLmNwcApAQCAt NDI3LDcgKzQyNyw3IEBAIGJvb2wgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFw c2U6Om1hcmdpbnNDb2xsYXBzZVRocm91Z2goY29uc3QgQm94JiBsCiAgICAgcmV0dXJuIHRydWU7 CiB9CiAKLXN0YXRpYyBQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVlcyBj b21wdXRlZFBvc2l0aXZlQW5kTmVnYXRpdmVNYXJnaW4oUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRp Y2FsTWFyZ2luOjpWYWx1ZXMgYSwgUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpW YWx1ZXMgYikKK1Bvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbjo6VmFsdWVzIEJsb2Nr Rm9ybWF0dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjpjb21wdXRlZFBvc2l0aXZlQW5kTmVn YXRpdmVNYXJnaW4oUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgYSwg UG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgYikgY29uc3QKIHsKICAg ICBQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVlcyBjb21wdXRlZFZhbHVl czsKICAgICBpZiAoYS5wb3NpdGl2ZSAmJiBiLnBvc2l0aXZlKQpAQCAtNDkxLDkgKzQ5MSw5IEBA IHZvaWQgQmxvY2tGb3JtYXR0aW5nQ29udGV4dDo6TWFyZ2luQ29sbGFwc2U6OnVwZGF0ZU1hcmdp bkFmdGVyRm9yUHJldmlvdXNTaWJsaW5nCiAgICAgICAgIGF1dG8gcHJldmlvdXNTaWJsaW5nUG9z aXRpdmVOZWdhdGl2ZU1hcmdpbiA9IGJsb2NrRm9ybWF0dGluZ1N0YXRlLnBvc2l0aXZlQW5kTmVn YXRpdmVWZXJ0aWNhbE1hcmdpbihwcmV2aW91c1NpYmxpbmcpOwogICAgICAgICBhdXRvIHBvc2l0 aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUgPSBibG9ja0Zvcm1hdHRpbmdTdGF0ZS5wb3NpdGl2ZUFu ZE5lZ2F0aXZlVmVydGljYWxNYXJnaW4oKmN1cnJlbnRCb3gpLmJlZm9yZTsKIAotICAgICAgICBw cmV2aW91c1NpYmxpbmdQb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luLmFmdGVyID0gY29tcHV0ZWRQb3Np dGl2ZUFuZE5lZ2F0aXZlTWFyZ2luKHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZvcmUsIHByZXZp b3VzU2libGluZ1Bvc2l0aXZlTmVnYXRpdmVNYXJnaW4uYWZ0ZXIpOworICAgICAgICBwcmV2aW91 c1NpYmxpbmdQb3NpdGl2ZU5lZ2F0aXZlTWFyZ2luLmFmdGVyID0gbWFyZ2luQ29sbGFwc2UuY29t cHV0ZWRQb3NpdGl2ZUFuZE5lZ2F0aXZlTWFyZ2luKHBvc2l0aXZlTmVnYXRpdmVNYXJnaW5CZWZv cmUsIHByZXZpb3VzU2libGluZ1Bvc2l0aXZlTmVnYXRpdmVNYXJnaW4uYWZ0ZXIpOwogICAgICAg ICBpZiAobWFyZ2luc0NvbGxhcHNlVGhyb3VnaCkgewotICAgICAgICAgICAgcHJldmlvdXNTaWJs aW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdpbi5iZWZvcmUgPSBjb21wdXRlZFBvc2l0aXZlQW5kTmVn YXRpdmVNYXJnaW4ocHJldmlvdXNTaWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdpbi5iZWZvcmUs IHByZXZpb3VzU2libGluZ1Bvc2l0aXZlTmVnYXRpdmVNYXJnaW4uYWZ0ZXIpOworICAgICAgICAg ICAgcHJldmlvdXNTaWJsaW5nUG9zaXRpdmVOZWdhdGl2ZU1hcmdpbi5iZWZvcmUgPSBtYXJnaW5D b2xsYXBzZS5jb21wdXRlZFBvc2l0aXZlQW5kTmVnYXRpdmVNYXJnaW4ocHJldmlvdXNTaWJsaW5n UG9zaXRpdmVOZWdhdGl2ZU1hcmdpbi5iZWZvcmUsIHByZXZpb3VzU2libGluZ1Bvc2l0aXZlTmVn YXRpdmVNYXJnaW4uYWZ0ZXIpOwogICAgICAgICAgICAgcHJldmlvdXNTaWJsaW5nUG9zaXRpdmVO ZWdhdGl2ZU1hcmdpbi5hZnRlciA9IHByZXZpb3VzU2libGluZ1Bvc2l0aXZlTmVnYXRpdmVNYXJn aW4uYmVmb3JlOwogICAgICAgICB9CiAgICAgICAgIGJsb2NrRm9ybWF0dGluZ1N0YXRlLnNldFBv c2l0aXZlQW5kTmVnYXRpdmVWZXJ0aWNhbE1hcmdpbihwcmV2aW91c1NpYmxpbmcsIHByZXZpb3Vz U2libGluZ1Bvc2l0aXZlTmVnYXRpdmVNYXJnaW4pOwo= 392112 2020-03-01 18:12:33 -0800 2020-03-01 18:22:46 -0800 Non-unified build fix#2 Patch.txt text/plain 2370 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1M2Q1NmY1MTUxNC4uM2M4MDRmOWUwMTQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAyMC0wMy0wMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IGZvciBub24tdW5pZmllZCBidWlsZHMgYWZ0 ZXIgcjI1NzUwNy4KKworICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tN YXJnaW5Db2xsYXBzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0 dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5WYWx1ZSBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6Om1hcmdpblZhbHVlKTogRGVsZXRlZC4KKwogMjAyMC0wMi0yOSAg RGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgU2xpbSBkb3duIHNvbWUg Q1NTIHBhcnNpbmcgY29kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2Nr Zm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCBiZTdmMjhm NjZmOC4uYzg0OGI1ZjIzZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9j a2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC0xMzcs NiArMTM3LDcgQEAgcHJpdmF0ZToKICAgICAgICAgUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2Fs TWFyZ2luOjpWYWx1ZXMgcHJlY29tcHV0ZWRQb3NpdGl2ZU5lZ2F0aXZlVmFsdWVzKGNvbnN0IEJv eCYsIE1hcmdpblR5cGUpIGNvbnN0OwogCiAgICAgICAgIFBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0 aWNhbE1hcmdpbjo6VmFsdWVzIGNvbXB1dGVkUG9zaXRpdmVBbmROZWdhdGl2ZU1hcmdpbihQb3Np dGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVlcywgUG9zaXRpdmVBbmROZWdhdGl2 ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMpIGNvbnN0OworICAgICAgICBPcHRpb25hbDxMYXlvdXRV bml0PiBtYXJnaW5WYWx1ZShQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVl cykgY29uc3Q7CiAKICAgICAgICAgYm9vbCBoYXNDbGVhcmFuY2UoY29uc3QgQm94JikgY29uc3Q7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxv Y2tNYXJnaW5Db2xsYXBzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCmluZGV4IDVjNDA1N2FhYzk2Li4xMzc0YTg3NzRk NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9j a01hcmdpbkNvbGxhcHNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3Jt YXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCkBAIC00NTAsNyArNDUwLDcgQEAgUG9zaXRp dmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgQmxvY2tGb3JtYXR0aW5nQ29udGV4 dDo6TWFyZ2luQ29sbGFwc2UKICAgICByZXR1cm4gY29tcHV0ZWRWYWx1ZXM7CiB9CiAKLXN0YXRp YyBPcHRpb25hbDxMYXlvdXRVbml0PiBtYXJnaW5WYWx1ZShQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVy dGljYWxNYXJnaW46OlZhbHVlcyBtYXJnaW5WYWx1ZXMpCitPcHRpb25hbDxMYXlvdXRVbml0PiBC bG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luVmFsdWUoUG9zaXRp dmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgbWFyZ2luVmFsdWVzKSBjb25zdAog ewogICAgIC8vIFdoZW4gdHdvIG9yIG1vcmUgbWFyZ2lucyBjb2xsYXBzZSwgdGhlIHJlc3VsdGlu ZyBtYXJnaW4gd2lkdGggaXMgdGhlIG1heGltdW0gb2YgdGhlIGNvbGxhcHNpbmcgbWFyZ2lucycg d2lkdGhzLgogICAgIC8vIEluIHRoZSBjYXNlIG9mIG5lZ2F0aXZlIG1hcmdpbnMsIHRoZSBtYXhp bXVtIG9mIHRoZSBhYnNvbHV0ZSB2YWx1ZXMgb2YgdGhlIG5lZ2F0aXZlIGFkam9pbmluZyBtYXJn aW5zIGlzIGRlZHVjdGVkIGZyb20gdGhlIG1heGltdW0K 392113 2020-03-01 18:22:46 -0800 2020-03-01 20:29:14 -0800 Non-unified build fix#2 Patch.txt text/plain 2370 zalan ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZwppbmRleCA1M2Q1NmY1MTUxNC4uM2M4MDRmOWUwMTQgMTAwNjQ0Ci0tLSBhL1NvdXJj ZS9XZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxMiBAQAorMjAyMC0wMy0wMSAgWmFsYW4gQnVqdGFzICA8emFsYW5AYXBwbGUuY29tPgor CisgICAgICAgIFVucmV2aWV3ZWQgYnVpbGQgZml4IGZvciBub24tdW5pZmllZCBidWlsZHMgYWZ0 ZXIgcjI1NzUwNy4KKworICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3Jt YXR0aW5nQ29udGV4dC5oOgorICAgICAgICAqIGxheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tN YXJnaW5Db2xsYXBzZS5jcHA6CisgICAgICAgIChXZWJDb3JlOjpMYXlvdXQ6OkJsb2NrRm9ybWF0 dGluZ0NvbnRleHQ6Ok1hcmdpbkNvbGxhcHNlOjptYXJnaW5WYWx1ZSBjb25zdCk6CisgICAgICAg IChXZWJDb3JlOjpMYXlvdXQ6Om1hcmdpblZhbHVlKTogRGVsZXRlZC4KKwogMjAyMC0wMi0yOSAg RGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+CiAKICAgICAgICAgU2xpbSBkb3duIHNvbWUg Q1NTIHBhcnNpbmcgY29kZQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2Nr Zm9ybWF0dGluZy9CbG9ja0Zvcm1hdHRpbmdDb250ZXh0LmggYi9Tb3VyY2UvV2ViQ29yZS9sYXlv dXQvYmxvY2tmb3JtYXR0aW5nL0Jsb2NrRm9ybWF0dGluZ0NvbnRleHQuaAppbmRleCBiZTdmMjhm NjZmOC4uYzg0OGI1ZjIzZTcgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9j a2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCisrKyBiL1NvdXJjZS9XZWJDb3Jl L2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxvY2tGb3JtYXR0aW5nQ29udGV4dC5oCkBAIC0xMzcs NiArMTM3LDcgQEAgcHJpdmF0ZToKICAgICAgICAgUG9zaXRpdmVBbmROZWdhdGl2ZVZlcnRpY2Fs TWFyZ2luOjpWYWx1ZXMgcHJlY29tcHV0ZWRQb3NpdGl2ZU5lZ2F0aXZlVmFsdWVzKGNvbnN0IEJv eCYsIE1hcmdpblR5cGUpIGNvbnN0OwogCiAgICAgICAgIFBvc2l0aXZlQW5kTmVnYXRpdmVWZXJ0 aWNhbE1hcmdpbjo6VmFsdWVzIGNvbXB1dGVkUG9zaXRpdmVBbmROZWdhdGl2ZU1hcmdpbihQb3Np dGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVlcywgUG9zaXRpdmVBbmROZWdhdGl2 ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMpIGNvbnN0OworICAgICAgICBPcHRpb25hbDxMYXlvdXRV bml0PiBtYXJnaW5WYWx1ZShQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVydGljYWxNYXJnaW46OlZhbHVl cykgY29uc3Q7CiAKICAgICAgICAgYm9vbCBoYXNDbGVhcmFuY2UoY29uc3QgQm94JikgY29uc3Q7 CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2xheW91dC9ibG9ja2Zvcm1hdHRpbmcvQmxv Y2tNYXJnaW5Db2xsYXBzZS5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3JtYXR0 aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCmluZGV4IDVjNDA1N2FhYzk2Li4xMzc0YTg3NzRk NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvbGF5b3V0L2Jsb2NrZm9ybWF0dGluZy9CbG9j a01hcmdpbkNvbGxhcHNlLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9sYXlvdXQvYmxvY2tmb3Jt YXR0aW5nL0Jsb2NrTWFyZ2luQ29sbGFwc2UuY3BwCkBAIC00NTAsNyArNDUwLDcgQEAgUG9zaXRp dmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgQmxvY2tGb3JtYXR0aW5nQ29udGV4 dDo6TWFyZ2luQ29sbGFwc2UKICAgICByZXR1cm4gY29tcHV0ZWRWYWx1ZXM7CiB9CiAKLXN0YXRp YyBPcHRpb25hbDxMYXlvdXRVbml0PiBtYXJnaW5WYWx1ZShQb3NpdGl2ZUFuZE5lZ2F0aXZlVmVy dGljYWxNYXJnaW46OlZhbHVlcyBtYXJnaW5WYWx1ZXMpCitPcHRpb25hbDxMYXlvdXRVbml0PiBC bG9ja0Zvcm1hdHRpbmdDb250ZXh0OjpNYXJnaW5Db2xsYXBzZTo6bWFyZ2luVmFsdWUoUG9zaXRp dmVBbmROZWdhdGl2ZVZlcnRpY2FsTWFyZ2luOjpWYWx1ZXMgbWFyZ2luVmFsdWVzKSBjb25zdAog ewogICAgIC8vIFdoZW4gdHdvIG9yIG1vcmUgbWFyZ2lucyBjb2xsYXBzZSwgdGhlIHJlc3VsdGlu ZyBtYXJnaW4gd2lkdGggaXMgdGhlIG1heGltdW0gb2YgdGhlIGNvbGxhcHNpbmcgbWFyZ2lucycg d2lkdGhzLgogICAgIC8vIEluIHRoZSBjYXNlIG9mIG5lZ2F0aXZlIG1hcmdpbnMsIHRoZSBtYXhp bXVtIG9mIHRoZSBhYnNvbHV0ZSB2YWx1ZXMgb2YgdGhlIG5lZ2F0aXZlIGFkam9pbmluZyBtYXJn aW5zIGlzIGRlZHVjdGVkIGZyb20gdGhlIG1heGltdW0K