74472 2011-12-13 17:57:56 -0800 [chromium] Remove redundant third_party entries from chromium DEPS 2012-01-03 10:15:58 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 kbr tony abarth dglazkov dpranke jamesr jochen maruel tony webkit.review.bot oldest_to_newest 520541 0 kbr 2011-12-13 17:57:56 -0800 Currently Source/WebKit/chromium/DEPS contains an entry for 'third_party' as well as several directories under there. The entry is currently needed in order to create the third_party directory, but the redundancy is causing two sets of problems. First, it is causing intermittent gclient failures on the Windows builders due to gclient's parallelization and the fact that the top-level directory is locked by Subversion while gclient is attempting to populate subdirectories. See http://build.webkit.org/builders/Chromium%20Win%20Release/builds/36771 for an example of such a failure. Second, all of Chromium's directories in third_party are being pulled in via this rule. This makes the explicit listing of the dependencies under that directory meaningless -- and, in fact, it seems that several additional dependencies have crept in unnoticed. update-webkit-chromium should be updated to manually create the third_party directory before running gclient, and all of the needed third_party dependencies should be enumerated in the DEPS file. 520574 1 tony 2011-12-13 18:29:51 -0800 The entry isn't needed to create the directory. I think gclient is smart enough to create the necessary directories. It was added because every week or two, someone would add something to src/third_party that webkit needed. It mades rolling a lot harder when you need to add an entry to DEPS. I thought gclient was smart enough to not start on a subdir until directories above it were finished. We could also just turn parallel syncs off on the bot. 520582 2 maruel 2011-12-13 18:33:41 -0800 - gclient won't sync a subdirectory before the parent directory is done. e.g. if you have dependencies src and src/third_party/foo, src/third_party/foo won't be synced until src is completely done. - gclient will create the directories itself up to the parent directory of the solution. So if you have src but no src/third_party and sync src/third_party/foo, gclient will first mkdir src/third_party, once src is completely synced. 520587 3 kbr 2011-12-13 18:37:07 -0800 I see. As I'm struggling to get this change to actually work and adding in the required dependencies one by one I see what you mean. Another solution, I'm pretty sure, would be to just remove the explicit checkouts of the third_party directories coming from Var('chromium_svn')+'/third_party/...'. They're useless given that we're already checking out the parent directory. Any objection to my making this change? 520609 4 119138 kbr 2011-12-13 19:25:37 -0800 Created attachment 119138 Patch 520610 5 kbr 2011-12-13 19:26:16 -0800 What do you think about this? It seems safe, correct and should clear up these intermittent Windows gclient failures. 520628 6 119138 webkit.review.bot 2011-12-13 20:21:46 -0800 Comment on attachment 119138 Patch Attachment 119138 did not pass chromium-ews (chromium-xvfb): Output: http://queues.webkit.org/results/10873072 520637 7 kbr 2011-12-13 20:29:52 -0800 Hmm. That built locallly. 521019 8 tony 2011-12-14 10:04:12 -0800 This patch looks correct to me. I think gclient is getting confused because it thinks that third_party/libwebp is safe to delete. Maybe there's some way to get it to update without having to clobber the bots. I'll try a few things locally. 521456 9 119328 tony 2011-12-14 16:41:59 -0800 Created attachment 119328 Patch 521458 10 tony 2011-12-14 16:42:35 -0800 After the bots cycle, we can revert the change to update-webkit-chromium. 521469 11 119328 kbr 2011-12-14 16:50:20 -0800 Comment on attachment 119328 Patch Thanks, looks good; r=me. Do you want to file a follow-on bug about the cleanup and reference it in the comment? 521484 12 119336 tony 2011-12-14 17:00:13 -0800 Created attachment 119336 Patch for landing 521573 13 kbr 2011-12-14 18:59:25 -0800 Another instance of the same problem, this time on Linux: http://build.webkit.org/builders/Chromium%20Linux%20Release%20%28Tests%29/builds/27157 521669 14 119336 webkit.review.bot 2011-12-14 22:34:39 -0800 Comment on attachment 119336 Patch for landing Clearing flags on attachment: 119336 Committed r102891: <http://trac.webkit.org/changeset/102891> 521670 15 webkit.review.bot 2011-12-14 22:34:44 -0800 All reviewed patches have been landed. Closing bug. 528505 16 jochen 2012-01-02 07:29:15 -0800 With this patch, update-webkit --chromium asks you to remove those directories, and if you fall for this trap, your checkout is broken :-/ 528837 17 tony 2012-01-03 10:15:58 -0800 (In reply to comment #16) > With this patch, update-webkit --chromium asks you to remove those directories, and if you fall for this trap, your checkout is broken :-/ That's true, we should have sent a note to chromium-dev about this. 119138 2011-12-13 19:25:37 -0800 2011-12-14 16:41:56 -0800 Patch bug-74472-20111213192536.patch text/plain 1988 kbr SW5kZXg6IFNvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCShyZXZpc2lvbiAxMDI3MzApCisrKyBTb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIw IEBACisyMDExLTEyLTEzICBLZW5uZXRoIFJ1c3NlbGwgIDxrYnJAZ29vZ2xlLmNvbT4KKworICAg ICAgICBbY2hyb21pdW1dIFJlbW92ZSByZWR1bmRhbnQgdGhpcmRfcGFydHkgZW50cmllcyBmcm9t IGNocm9taXVtIERFUFMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTc0NDcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgUmVtb3ZlZCByZWR1bmRhbnQgREVQUyBlbnRyaWVzIGZvciB0aGlyZF9wYXJ0eSBzdWJk aXJlY3RvcmllcworICAgICAgICBjb21pbmcgZnJvbSBjaHJvbWl1bV9zdm4sIHdoaWNoIHdlcmUg Y2F1c2luZyBpbnRlcm1pdHRlbnQgZ2NsaWVudAorICAgICAgICBmYWlsdXJlcyBvbiB0aGUgYm90 cy4gQnVpbHQgb24gTGludXggdG8gdmVyaWZ5LgorCisgICAgICAgIE5vdGUgdGhhdCB0aGlzIGNo YW5nZSBpcyBiYWNrd2FyZCBjb21wYXRpYmxlIHdpdGggZXhpc3RpbmcKKyAgICAgICAgY2hlY2tv dXRzIG9uIHRoZSBib3RzLiBnY2xpZW50IHdpbGwgd2FybiBhYm91dCBkaXJlY3RvcmllcyB0aGF0 CisgICAgICAgIGFyZSBubyBsb25nZXIgcGFydCBvZiB0aGUgY2xpZW50LCBidXQgY2xvYmJlciBi dWlsZHMgYXJlbid0IG5lZWRlZC4KKworICAgICAgICAqIERFUFM6CisKIDIwMTEtMTItMTMgIERp cmsgUHJhbmtlICA8ZHByYW5rZUBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgY2hyb21pdW0gcG9y dCAtIHJlbW92ZSBuYWNsIGhhY2sgaW4gREVQUy9neXBfd2Via2l0CkluZGV4OiBTb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0RFUFMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9jaHJvbWl1bS9E RVBTCShyZXZpc2lvbiAxMDI3MjcpCisrKyBTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0RFUFMJKHdv cmtpbmcgY29weSkKQEAgLTEwOSw4ICsxMDksNiBAQCBkZXBzID0gewogICAgIEZyb20oJ2Nocm9t aXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2ZmbXBlZycpLAogICAndGhpcmRfcGFydHkvbGli amluZ2xlL3NvdXJjZSc6CiAgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvdGhpcmRfcGFy dHkvbGliamluZ2xlL3NvdXJjZScpLAotICAndGhpcmRfcGFydHkvbGlid2VicCc6Ci0gICAgVmFy KCdjaHJvbWl1bV9zdm4nKSsnL3RoaXJkX3BhcnR5L2xpYndlYnBAJytWYXIoJ2Nocm9taXVtX3Jl dicpLAogICAndG9vbHMvZ3JpdCc6CiAgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvdG9v bHMvZ3JpdCcpLAogICAndG9vbHMvZ3JpdHNldHRpbmdzJzoKQEAgLTE1OCwxMCArMTU2LDYgQEAg ZGVwc19vcyA9IHsKICAgICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5 L3lhc20vYmluYXJpZXMnKSwKICAgfSwKICAgJ21hYyc6IHsKLSAgICAndGhpcmRfcGFydHkvYXBw bGVfYXBzbCc6Ci0gICAgICBWYXIoJ2Nocm9taXVtX3N2bicpKycvdGhpcmRfcGFydHkvYXBwbGVf YXBzbEAnK1ZhcignY2hyb21pdW1fcmV2JyksCi0gICAgJ3RoaXJkX3BhcnR5L2FwcGxlX3dlYmtp dCc6Ci0gICAgICBWYXIoJ2Nocm9taXVtX3N2bicpKycvdGhpcmRfcGFydHkvYXBwbGVfd2Via2l0 QCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwKICAgICAndGhpcmRfcGFydHkvbnNzJzoKICAgICAgIEZy b20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L25zcycpLAogICB9LAo= 119328 2011-12-14 16:41:59 -0800 2011-12-14 17:00:09 -0800 Patch bug-74472-20111214164213.patch text/plain 3051 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyODM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGQ5NjRjMzFjYWE5YmZiMGI2YWQ3OTM1NWRlZDFmOTdhNzVlYmRmYTYuLjZjMDBmMDE2MWI2ZWNh Y2E3YmMzM2M4MDQ0NzczYTkxOGU5NWJkODMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTIgQEAKKzIwMTEtMTItMTQgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9y Zz4KKworICAgICAgICBbY2hyb21pdW1dIFJlbW92ZSByZWR1bmRhbnQgdGhpcmRfcGFydHkgZW50 cmllcyBmcm9tIGNocm9taXVtIERFUFMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTc0NDcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBERVBTOgorCiAyMDExLTEyLTE0ICBKb25hdGhhbiBCYWNrZXIgIDxi YWNrZXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gUGx1bWIgdGhyb3VnaCBm bGFnIGZvciBlbmFibGluZyBwYXJ0aWFsIHN3YXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vREVQUyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vREVQUwppbmRleCAxNWMzNzg3 MTBjMzQzN2U2NmYwMDczNDE3YzVlYWMzZmE1OTg3N2MyLi40MzRmZmM2NDk3OTRkZDQzMTlmNjM1 MTRmMTA3MTE4MWQyOGY0M2E2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0RF UFMKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9ERVBTCkBAIC0xMDksOCArMTA5LDYgQEAg ZGVwcyA9IHsKICAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS9mZm1w ZWcnKSwKICAgJ3RoaXJkX3BhcnR5L2xpYmppbmdsZS9zb3VyY2UnOgogICAgIEZyb20oJ2Nocm9t aXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2xpYmppbmdsZS9zb3VyY2UnKSwKLSAgJ3RoaXJk X3BhcnR5L2xpYndlYnAnOgotICAgIFZhcignY2hyb21pdW1fc3ZuJykrJy90aGlyZF9wYXJ0eS9s aWJ3ZWJwQCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwKICAgJ3Rvb2xzL2dyaXQnOgogICAgIEZyb20o J2Nocm9taXVtX2RlcHMnLCAnc3JjL3Rvb2xzL2dyaXQnKSwKICAgJ3Rvb2xzL2dyaXRzZXR0aW5n cyc6CkBAIC0xNTgsMTAgKzE1Niw2IEBAIGRlcHNfb3MgPSB7CiAgICAgICBGcm9tKCdjaHJvbWl1 bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS95YXNtL2JpbmFyaWVzJyksCiAgIH0sCiAgICdtYWMn OiB7Ci0gICAgJ3RoaXJkX3BhcnR5L2FwcGxlX2Fwc2wnOgotICAgICAgVmFyKCdjaHJvbWl1bV9z dm4nKSsnL3RoaXJkX3BhcnR5L2FwcGxlX2Fwc2xAJytWYXIoJ2Nocm9taXVtX3JldicpLAotICAg ICd0aGlyZF9wYXJ0eS9hcHBsZV93ZWJraXQnOgotICAgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSsn L3RoaXJkX3BhcnR5L2FwcGxlX3dlYmtpdEAnK1ZhcignY2hyb21pdW1fcmV2JyksCiAgICAgJ3Ro aXJkX3BhcnR5L25zcyc6CiAgICAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9w YXJ0eS9uc3MnKSwKICAgfSwKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCAwZjMxMTBlZmJhMWEwZDUwZDVjMjQ2MjIzNzUzYWJhODJmNWYwYjE2Li4y MzkxOWY0ODVhNWRmYmUyNTAyYTAyNTY5ZWUzZDk0Y2Y4YzFjMzNmIDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTEt MTItMTQgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAgICBbY2hyb21p dW1dIFJlbW92ZSByZWR1bmRhbnQgdGhpcmRfcGFydHkgZW50cmllcyBmcm9tIGNocm9taXVtIERF UFMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0NDcy CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3Jp cHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW06IFRlbXBvcmFyaWx5IGtlZXAgdW52ZXJzaW9uZWQg dHJlZXMuCisKIDIwMTEtMTItMTQgIENzYWJhIE9zenRyb2dvbsOhYyAgPG9zc3lAd2Via2l0Lm9y Zz4KIAogICAgICAgICBbUXRdIFRlc3QgZm9udHMgYXJlIG5vdCB1c2VkIHdpdGggUXQ1CmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW0gYi9Ub29scy9TY3Jp cHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW0KaW5kZXggODQwNmIxZDAxODA3NGVjNTM1ZmRhZDI3 MGVhYTRmNmJmOTE1MDJlYy4uNzZkOWRlMjc1YjE1NTRjMmNjYjhhYzk4MWI3MzUzMmJhZTkyMDcw MCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtCisrKyBi L1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bQpAQCAtODYsNyArODYsOCBAQCBt eSBAZ2NsaWVudEFyZ3MgPSAoJGdjbGllbnRQYXRoLCAic3luYyIpOwogcHVzaCBAZ2NsaWVudEFy Z3MsICItLWZvcmNlIiBpZiAkZm9yY2U7CiAjIC0tcmVzZXQgY291bGQgZGVsZXRlIG1vZGlmaWVk IGZpbGVzIGlmIG5lY2Vzc2FyeSB0byBzeW5jLgogcHVzaCBAZ2NsaWVudEFyZ3MsICItLXJlc2V0 IiBpZiAkZm9yY2U7Ci1wdXNoIEBnY2xpZW50QXJncywgIi0tZGVsZXRlX3VudmVyc2lvbmVkX3Ry ZWVzIiBpZiAkZm9yY2U7CisjIFRlbXBvcmFyaWx5IGtlZXAgdW52ZXJzaW9uZWQgdHJlZXMgc28g d2UgZG9uJ3QgZGVsZXRlIHRoaXJkX3BhcnR5L2xpYndlYnAuCisjcHVzaCBAZ2NsaWVudEFyZ3Ms ICItLWRlbGV0ZV91bnZlcnNpb25lZF90cmVlcyIgaWYgJGZvcmNlOwogcHVzaCBAZ2NsaWVudEFy Z3MsICItLWRlcHM9dW5peCxhbmRyb2lkIiBpZiBpc0Nocm9taXVtQW5kcm9pZCgpOwogCiBteSAk Y21kID0gam9pbigiICIsQGdjbGllbnRBcmdzKTsK 119336 2011-12-14 17:00:13 -0800 2011-12-14 22:34:39 -0800 Patch for landing bug-74472-20111214170027.patch text/plain 3287 tony U3VidmVyc2lvbiBSZXZpc2lvbjogMTAyODM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGQ5NjRjMzFjYWE5YmZiMGI2YWQ3OTM1NWRlZDFmOTdhNzVlYmRmYTYuLmExZjY1ZjdkMjRmZTMz MDY2MjFmNWYzMGRhNGY2ZmVjNzRkMmM0Y2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTEtMTItMTQgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9y Zz4KKworICAgICAgICBbY2hyb21pdW1dIFJlbW92ZSByZWR1bmRhbnQgdGhpcmRfcGFydHkgZW50 cmllcyBmcm9tIGNocm9taXVtIERFUFMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTc0NDcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSdXNz ZWxsLgorCisgICAgICAgIFJlbW92ZWQgcmVkdW5kYW50IERFUFMgZW50cmllcyBmb3IgdGhpcmRf cGFydHkgc3ViZGlyZWN0b3JpZXMKKyAgICAgICAgY29taW5nIGZyb20gY2hyb21pdW1fc3ZuLCB3 aGljaCB3ZXJlIGNhdXNpbmcgaW50ZXJtaXR0ZW50IGdjbGllbnQKKyAgICAgICAgZmFpbHVyZXMg b24gdGhlIGJvdHMuCisKKyAgICAgICAgKiBERVBTOgorCiAyMDExLTEyLTE0ICBKb25hdGhhbiBC YWNrZXIgIDxiYWNrZXJAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJvbWl1bV0gUGx1bWIg dGhyb3VnaCBmbGFnIGZvciBlbmFibGluZyBwYXJ0aWFsIHN3YXAKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vREVQUyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vREVQUwppbmRl eCAxNWMzNzg3MTBjMzQzN2U2NmYwMDczNDE3YzVlYWMzZmE1OTg3N2MyLi40MzRmZmM2NDk3OTRk ZDQzMTlmNjM1MTRmMTA3MTE4MWQyOGY0M2E2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0RFUFMKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9ERVBTCkBAIC0xMDksOCAr MTA5LDYgQEAgZGVwcyA9IHsKICAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9w YXJ0eS9mZm1wZWcnKSwKICAgJ3RoaXJkX3BhcnR5L2xpYmppbmdsZS9zb3VyY2UnOgogICAgIEZy b20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2xpYmppbmdsZS9zb3VyY2UnKSwK LSAgJ3RoaXJkX3BhcnR5L2xpYndlYnAnOgotICAgIFZhcignY2hyb21pdW1fc3ZuJykrJy90aGly ZF9wYXJ0eS9saWJ3ZWJwQCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwKICAgJ3Rvb2xzL2dyaXQnOgog ICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3Rvb2xzL2dyaXQnKSwKICAgJ3Rvb2xzL2dy aXRzZXR0aW5ncyc6CkBAIC0xNTgsMTAgKzE1Niw2IEBAIGRlcHNfb3MgPSB7CiAgICAgICBGcm9t KCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS95YXNtL2JpbmFyaWVzJyksCiAgIH0s CiAgICdtYWMnOiB7Ci0gICAgJ3RoaXJkX3BhcnR5L2FwcGxlX2Fwc2wnOgotICAgICAgVmFyKCdj aHJvbWl1bV9zdm4nKSsnL3RoaXJkX3BhcnR5L2FwcGxlX2Fwc2xAJytWYXIoJ2Nocm9taXVtX3Jl dicpLAotICAgICd0aGlyZF9wYXJ0eS9hcHBsZV93ZWJraXQnOgotICAgICAgVmFyKCdjaHJvbWl1 bV9zdm4nKSsnL3RoaXJkX3BhcnR5L2FwcGxlX3dlYmtpdEAnK1ZhcignY2hyb21pdW1fcmV2Jyks CiAgICAgJ3RoaXJkX3BhcnR5L25zcyc6CiAgICAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3Ny Yy90aGlyZF9wYXJ0eS9uc3MnKSwKICAgfSwKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCAwZjMxMTBlZmJhMWEwZDUwZDVjMjQ2MjIzNzUzYWJhODJm NWYwYjE2Li4wN2QzM2Q3ZGE5OGE0MmQzNTU3YmM5YmMzMWE3NWZjZWM5Y2IwNDA1IDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTIg QEAKKzIwMTEtMTItMTQgIFRvbnkgQ2hhbmcgIDx0b255QGNocm9taXVtLm9yZz4KKworICAgICAg ICBbY2hyb21pdW1dIFJlbW92ZSByZWR1bmRhbnQgdGhpcmRfcGFydHkgZW50cmllcyBmcm9tIGNo cm9taXVtIERFUFMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTc0NDcyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgS2VubmV0aCBSdXNzZWxsLgorCisgICAg ICAgICogU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtOiBUZW1wb3JhcmlseSBrZWVwIHVu dmVyc2lvbmVkIHRyZWVzLgorCiAyMDExLTEyLTE0ICBDc2FiYSBPc3p0cm9nb27DoWMgIDxvc3N5 QHdlYmtpdC5vcmc+CiAKICAgICAgICAgW1F0XSBUZXN0IGZvbnRzIGFyZSBub3QgdXNlZCB3aXRo IFF0NQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtIGIv VG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtCmluZGV4IDg0MDZiMWQwMTgwNzRl YzUzNWZkYWQyNzBlYWE0ZjZiZjkxNTAyZWMuLjQ5NzhkMGY2MDU2NTQ2NjIzNTA0MDYxYTdmNzg4 NmMxZTg3Yjc1YWUgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJv bWl1bQorKysgYi9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW0KQEAgLTg2LDcg Kzg2LDkgQEAgbXkgQGdjbGllbnRBcmdzID0gKCRnY2xpZW50UGF0aCwgInN5bmMiKTsKIHB1c2gg QGdjbGllbnRBcmdzLCAiLS1mb3JjZSIgaWYgJGZvcmNlOwogIyAtLXJlc2V0IGNvdWxkIGRlbGV0 ZSBtb2RpZmllZCBmaWxlcyBpZiBuZWNlc3NhcnkgdG8gc3luYy4KIHB1c2ggQGdjbGllbnRBcmdz LCAiLS1yZXNldCIgaWYgJGZvcmNlOwotcHVzaCBAZ2NsaWVudEFyZ3MsICItLWRlbGV0ZV91bnZl cnNpb25lZF90cmVlcyIgaWYgJGZvcmNlOworIyBUZW1wb3JhcmlseSBrZWVwIHVudmVyc2lvbmVk IHRyZWVzIHNvIHdlIGRvbid0IGRlbGV0ZSB0aGlyZF9wYXJ0eS9saWJ3ZWJwLgorIyBTZWUgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc0NTY1IC4KKyNwdXNoIEBnY2xp ZW50QXJncywgIi0tZGVsZXRlX3VudmVyc2lvbmVkX3RyZWVzIiBpZiAkZm9yY2U7CiBwdXNoIEBn Y2xpZW50QXJncywgIi0tZGVwcz11bml4LGFuZHJvaWQiIGlmIGlzQ2hyb21pdW1BbmRyb2lkKCk7 CiAKIG15ICRjbWQgPSBqb2luKCIgIixAZ2NsaWVudEFyZ3MpOwo=