71563 2011-11-04 08:24:52 -0700 [chromium] Use Chromium's copy of libWebKitSystemInterfaceLeopard.a 2011-11-04 12:12:39 -0700 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Mac Unspecified RESOLVED FIXED http://code.google.com/p/chromium/issues/detail?id=101387 P2 Normal --- 0 rsesek webkit-unassigned abarth mark playmobil webkit.review.bot oldest_to_newest 496205 0 rsesek 2011-11-04 08:24:52 -0700 WebKit is going to remove it soon, and the chromium WebKit port should pull in Chromium's copy via DEPS and link against it rather than the one that will be removed. 496231 1 113668 rsesek 2011-11-04 09:37:46 -0700 Created attachment 113668 Patch 496253 2 113668 abarth 2011-11-04 10:05:47 -0700 Comment on attachment 113668 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113668&action=review > Source/WebCore/WebCore.gyp/WebCore.gyp:175 > + 'libjpeg_gyp_path': '../../WebKit/chromium/third_party/libjpeg_turbo/libjpeg.gyp', Why is this special cased? 496277 3 113668 rsesek 2011-11-04 10:35:58 -0700 Comment on attachment 113668 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113668&action=review >> Source/WebCore/WebCore.gyp/WebCore.gyp:175 >> + 'libjpeg_gyp_path': '../../WebKit/chromium/third_party/libjpeg_turbo/libjpeg.gyp', > > Why is this special cased? Mark says it's problematic to reference variables in the same scope in which they're defined. 496283 4 113668 abarth 2011-11-04 10:39:52 -0700 Comment on attachment 113668 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113668&action=review >>> Source/WebCore/WebCore.gyp/WebCore.gyp:175 >>> + 'libjpeg_gyp_path': '../../WebKit/chromium/third_party/libjpeg_turbo/libjpeg.gyp', >> >> Why is this special cased? > > Mark says it's problematic to reference variables in the same scope in which they're defined. My point is we have lots of dependencies on things in chromium/third_party, but we don't list them here. We just use the chromium_src_dir to find them. It's not clear to me why libjpeg_turbo is different that those other dependencies. 496285 5 113668 rsesek 2011-11-04 10:41:10 -0700 Comment on attachment 113668 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=113668&action=review >>>> Source/WebCore/WebCore.gyp/WebCore.gyp:175 >>>> + 'libjpeg_gyp_path': '../../WebKit/chromium/third_party/libjpeg_turbo/libjpeg.gyp', >>> >>> Why is this special cased? >> >> Mark says it's problematic to reference variables in the same scope in which they're defined. > > My point is we have lots of dependencies on things in chromium/third_party, but we don't list them here. We just use the chromium_src_dir to find them. It's not clear to me why libjpeg_turbo is different that those other dependencies. Oh, that I do not know. It was here originally and I'm not sure why it's only defined when not building inside Chromium. 496286 6 abarth 2011-11-04 10:42:38 -0700 Yeah, I see that you're just moving it. It just caught my eye reading through the patch. 496381 7 113668 webkit.review.bot 2011-11-04 12:12:34 -0700 Comment on attachment 113668 Patch Clearing flags on attachment: 113668 Committed r99308: <http://trac.webkit.org/changeset/99308> 496382 8 webkit.review.bot 2011-11-04 12:12:39 -0700 All reviewed patches have been landed. Closing bug. 113668 2011-11-04 09:37:46 -0700 2011-11-04 12:12:34 -0700 Patch bug-71563-20111104123744.patch text/plain 9941 rsesek U3VidmVyc2lvbiBSZXZpc2lvbjogOTkyMjEKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwppbmRleCBjYjE2ZTU4NWY1ZGU1MGE2 ZGE4NGU4NjgyNzdhODMxZDA4Mzc3Mjk5Li5jMDAwMWM2ZjE3NDZmNTBmMDEyMzhhMzlkMWIyM2M0 ZjZhY2ZmZjE2IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291 cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTUgQEAKKzIwMTEtMTEtMDQgIFJvYmVy dCBTZXNlayAgPHJzZXNla0BjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW2Nocm9taXVtXSBVc2Ug Q2hyb21pdW0ncyBjb3B5IG9mIGxpYldlYktpdFN5c3RlbUludGVyZmFjZUxlb3BhcmQuYQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzE1NjMKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBVc2UgbGliV2ViS2l0 U3lzdGVtSW50ZXJmYWNlTGVvcGFyZC5hIHRoYXQncyBpbiB0aGUgQ2hyb21pdW0gcG9ydCwKKyAg ICAgICAgcmF0aGVyIGluIFdlYktpdExpYnJhcmllcy8uCisKKyAgICAgICAgKiBXZWJDb3JlLmd5 cC9XZWJDb3JlLmd5cDoKKwogMjAxMS0xMS0wMyAgSm9zaHVhIEJlbGwgIDxqc2JlbGxAY2hyb21p dW0ub3JnPgogCiAgICAgICAgIEluZGV4ZWREQjogT2JqZWN0IHN0b3JlcyBub3QgcGVyc2lzdGlu ZyBiZXR3ZWVuIHNlc3Npb25zCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDAxYzYzODll ODU4NDUxNDZkNWZmYjlkY2Q5NTEyZjgyMDY5MjI5ZTAuLjEyMmE0NDU3N2E3Y2Y5ZjYzNWZmNzBk MjQ0MTdlMTQyM2RmZTgyNWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hh bmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEs MTUgQEAKKzIwMTEtMTEtMDQgIFJvYmVydCBTZXNlayAgPHJzZXNla0BjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgW2Nocm9taXVtXSBVc2UgQ2hyb21pdW0ncyBjb3B5IG9mIGxpYldlYktpdFN5c3Rl bUludGVyZmFjZUxlb3BhcmQuYQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93 X2J1Zy5jZ2k/aWQ9NzE1NjMKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICBSb2xsIENocm9taXVtIERFUFMgcjEwODEwNzoxMDg0NzYgdG8gcHVsbCBpbgor ICAgICAgICBsaWJXZWJLaXRTeXN0ZW1JbnRlcmZhY2VMZW9wYXJkLmEuCisKKyAgICAgICAgKiBE RVBTOgorCiAyMDExLTExLTAzICBGYWR5IFNhbXVlbCAgPGZzYW11ZWxAY2hyb21pdW0ub3JnPgog CiAgICAgICAgIFtDaHJvbWl1bV0gUmVmYWN0b3IgV2ViRnJhbWVJbXBsOjpjcmVhdGVGcmFtZVZp ZXcoKSB0byB1c2UgRnJhbWU6Y3JlYXRlVmlldwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv V2ViQ29yZS5neXAvV2ViQ29yZS5neXAgYi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJD b3JlLmd5cAppbmRleCAwOTc0M2Y5M2IyYzA3ZDUzMTQ2YjYwZjY1ZWVkY2Q3Mjk2ZGMzNWQzLi4x MGEwNDdkN2ZiYTIxMzJkMWZiZjgwMzMyOGE1NWZjNmQ5MDYyNGIzIDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLmd5cC9XZWJDb3JlLmd5cApAQCAtMzUsOTIgKzM1LDYgQEAKICAgICAnLi4vLi4vV2Vi S2l0L2Nocm9taXVtL2ZlYXR1cmVzLmd5cGknLAogICAgICcuLi9XZWJDb3JlLmd5cGknLAogICBd LAotICAjIExvY2F0aW9uIG9mIHRoZSBjaHJvbWl1bSBzcmMgZGlyZWN0b3J5LgotICAnY29uZGl0 aW9ucyc6IFsKLSAgICBbJ2luc2lkZV9jaHJvbWl1bV9idWlsZD09MCcsIHsKLSAgICAgICMgV2Vi a2l0IGlzIGJlaW5nIGJ1aWx0IG91dHNpZGUgb2YgdGhlIGZ1bGwgY2hyb21pdW0gcHJvamVjdC4K LSAgICAgICd2YXJpYWJsZXMnOiB7Ci0gICAgICAgICdjaHJvbWl1bV9zcmNfZGlyJzogJy4uLy4u L1dlYktpdC9jaHJvbWl1bScsCi0gICAgICAgICdsaWJqcGVnX2d5cF9wYXRoJzogJzwoY2hyb21p dW1fc3JjX2RpcikvdGhpcmRfcGFydHkvbGlianBlZ190dXJiby9saWJqcGVnLmd5cCcsCi0gICAg ICB9LAotICAgIH0sewotICAgICAgIyBXZWJLaXQgaXMgY2hlY2tlZCBvdXQgaW4gc3JjL2Nocm9t aXVtL3RoaXJkX3BhcnR5L1dlYktpdAotICAgICAgJ3ZhcmlhYmxlcyc6IHsKLSAgICAgICAgJ2No cm9taXVtX3NyY19kaXInOiAnLi4vLi4vLi4vLi4vLi4nLAotICAgICAgfSwKLSAgICB9XSwKLSAg ICBbJ09TID09ICJtYWMiJywgewotICAgICAgJ3RhcmdldHMnOiBbCi0gICAgICAgIHsKLSAgICAg ICAgICAjIE9uIHRoZSBNYWMsIGxpYldlYktpdFN5c3RlbUludGVyZmFjZSouYSBpcyB1c2VkIHRv IGhlbHAgV2ViQ29yZQotICAgICAgICAgICMgaW50ZXJmYWNlIHdpdGggdGhlIHN5c3RlbS4gIFRo aXMgbGlicmFyeSBpcyBzdXBwbGllZCBhcyBhIHN0YXRpYwotICAgICAgICAgICMgbGlicmFyeSBp biBiaW5hcnkgZm9ybWF0LiAgQXQgcHJlc2VudCwgaXQgY29udGFpbnMgbWFueSBnbG9iYWwKLSAg ICAgICAgICAjIHN5bWJvbHMgbm90IG1hcmtlZCBwcml2YXRlX2V4dGVybi4gIEl0IHNob3VsZCBi ZSBjb25zaWRlcmVkIGFuCi0gICAgICAgICAgIyBpbXBsZW1lbnRhdGlvbiBkZXRhaWwgb2YgV2Vi Q29yZSwgYW5kIGRvZXMgbm90IG5lZWQgdGhlc2Ugc3ltYm9scwotICAgICAgICAgICMgdG8gYmUg ZXhwb3NlZCBzbyB3aWRlbHkuCi0gICAgICAgICAgIwotICAgICAgICAgICMgVGhpcyB0YXJnZXQg Y29udGFpbnMgYW4gYWN0aW9uIHRoYXQgY3JhY2tzIG9wZW4gdGhlIGV4aXN0aW5nCi0gICAgICAg ICAgIyBzdGF0aWMgbGlicmFyeSBhbmQgcmVidWlsZHMgaXQgd2l0aCB0aGVzZSBnbG9iYWwgc3lt Ym9scwotICAgICAgICAgICMgdHJhbnNmb3JtZWQgdG8gcHJpdmF0ZV9leHRlcm4uCi0gICAgICAg ICAgJ3RhcmdldF9uYW1lJzogJ3dlYmtpdF9zeXN0ZW1faW50ZXJmYWNlJywKLSAgICAgICAgICAn dHlwZSc6ICdzdGF0aWNfbGlicmFyeScsCi0gICAgICAgICAgJ3ZhcmlhYmxlcyc6IHsKLSAgICAg ICAgICAgICdhZGp1c3RlZF9saWJyYXJ5X3BhdGgnOgotICAgICAgICAgICAgICAgICc8KFBST0RV Q1RfRElSKS9saWJXZWJLaXRTeXN0ZW1JbnRlcmZhY2VMZW9wYXJkUHJpdmF0ZUV4dGVybi5hJywK LSAgICAgICAgICB9LAotICAgICAgICAgICdzb3VyY2VzJzogWwotICAgICAgICAgICAgIyBBbiBl bXB0eSBzb3VyY2UgZmlsZSBpcyBuZWVkZWQgdG8gY29udmluY2UgWGNvZGUgdG8gcHJvZHVjZQot ICAgICAgICAgICAgIyBvdXRwdXQgZm9yIHRoaXMgdGFyZ2V0LiAgVGhlIHJlc3VsdGluZyBsaWJy YXJ5IHdvbid0IGFjdHVhbGx5Ci0gICAgICAgICAgICAjIGNvbnRhaW4gYW55dGhpbmcuICBUaGUg bGlicmFyeSBhdCBhZGp1c3RlZF9saWJyYXJ5X3BhdGggd2lsbCwKLSAgICAgICAgICAgICMgYW5k IHRoYXQgbGlicmFyeSBpcyBwdXNoZWQgdG8gZGVwZW5kZW50cyBvZiB0aGlzIHRhcmdldCBiZWxv dy4KLSAgICAgICAgICAgICdtYWMvRW1wdHkuY3BwJywKLSAgICAgICAgICBdLAotICAgICAgICAg ICdhY3Rpb25zJzogWwotICAgICAgICAgICAgewotICAgICAgICAgICAgICAnYWN0aW9uX25hbWUn OiAnQWRqdXN0IFZpc2liaWxpdHknLAotICAgICAgICAgICAgICAnaW5wdXRzJzogWwotICAgICAg ICAgICAgICAgICdtYWMvYWRqdXN0X3Zpc2liaWxpdHkuc2gnLAotICAgICAgICAgICAgICAgICcu Li8uLi8uLi9XZWJLaXRMaWJyYXJpZXMvbGliV2ViS2l0U3lzdGVtSW50ZXJmYWNlTGVvcGFyZC5h JywKLSAgICAgICAgICAgICAgXSwKLSAgICAgICAgICAgICAgJ291dHB1dHMnOiBbCi0gICAgICAg ICAgICAgICAgJzwoYWRqdXN0ZWRfbGlicmFyeV9wYXRoKScsCi0gICAgICAgICAgICAgIF0sCi0g ICAgICAgICAgICAgICdhY3Rpb24nOiBbCi0gICAgICAgICAgICAgICAgJzxAKF9pbnB1dHMpJywK LSAgICAgICAgICAgICAgICAnPEAoX291dHB1dHMpJywKLSAgICAgICAgICAgICAgICAnPChJTlRF Uk1FRElBVEVfRElSKS9hZGp1c3RfdmlzaWJpbGl0eScsICAjIHdvcmsgZGlyZWN0b3J5Ci0gICAg ICAgICAgICAgIF0sCi0gICAgICAgICAgICB9LAotICAgICAgICAgIF0sICAjIGFjdGlvbnMKLSAg ICAgICAgICAnbGlua19zZXR0aW5ncyc6IHsKLSAgICAgICAgICAgICdsaWJyYXJpZXMnOiBbCi0g ICAgICAgICAgICAgICc8KGFkanVzdGVkX2xpYnJhcnlfcGF0aCknLAotICAgICAgICAgICAgXSwK LSAgICAgICAgICB9LCAgIyBsaW5rX3NldHRpbmdzCi0gICAgICAgIH0sICAjIHRhcmdldCB3ZWJr aXRfc3lzdGVtX2ludGVyZmFjZQotICAgICAgXSwgICMgdGFyZ2V0cwotICAgIH1dLCAgIyBjb25k aXRpb24gT1MgPT0gIm1hYyIKLSAgICBbJ09TIT0id2luIiBhbmQgcmVtb3ZlX3dlYmNvcmVfZGVi dWdfc3ltYm9scz09MScsIHsKLSAgICAgICMgUmVtb3ZlIC1nIGZyb20gYWxsIHRhcmdldHMgZGVm aW5lZCBoZXJlLgotICAgICAgJ3RhcmdldF9kZWZhdWx0cyc6IHsKLSAgICAgICAgJ2NmbGFncyEn OiBbJy1nJ10sCi0gICAgICB9LAotICAgIH1dLAotICAgIFsnb3NfcG9zaXg9PTEgYW5kIE9TIT0i bWFjIiBhbmQgT1MhPSJhbmRyb2lkIiBhbmQgZ2NjX3ZlcnNpb249PTQ2JywgewotICAgICAgJ3Rh cmdldF9kZWZhdWx0cyc6IHsKLSAgICAgICAgIyBEaXNhYmxlIHdhcm5pbmdzIGFib3V0IGMrKzB4 IGNvbXBhdGliaWxpdHksIGFzIHNvbWUgbmFtZXMgKHN1Y2ggYXMgbnVsbHB0cikgY29uZmxpY3QK LSAgICAgICAgIyB3aXRoIHVwY29taW5nIGMrKzB4IHR5cGVzLgotICAgICAgICAnY2ZsYWdzX2Nj JzogWyctV25vLWMrKzB4LWNvbXBhdCddLAotICAgICAgfSwKLSAgICB9XSwKLSAgICBbJ09TPT0i bGludXgiIGFuZCB0YXJnZXRfYXJjaD09ImFybSInLCB7Ci0gICAgICAjIER1ZSB0byBhIGJ1ZyBp biBnY2MgYXJtLCB3ZSBnZXQgd2FybmluZ3MgYWJvdXQgdW5pbml0aWFsaXplZCB0aW1lc05ld1Jv bWFuLnVuc3RhdGljLjMyNTgKLSAgICAgICMgYW5kIGNvbG9yVHJhbnNwYXJlbnQudW5zdGF0aWMu NDg3OS4KLSAgICAgICd0YXJnZXRfZGVmYXVsdHMnOiB7Ci0gICAgICAgICdjZmxhZ3MnOiBbJy1X bm8tdW5pbml0aWFsaXplZCddLAotICAgICAgfSwKLSAgICB9XSwKLSAgXSwgICMgY29uZGl0aW9u cwogCiAgICd2YXJpYWJsZXMnOiB7CiAgICAgIyBJZiBzZXQgdG8gMSwgZG9lc24ndCBjb21waWxl IGRlYnVnIHN5bWJvbHMgaW50byB3ZWJjb3JlIHJlZHVjaW5nIHRoZQpAQCAtMjU0LDYgKzE2OCwx NSBAQAogICAgIF0sCiAKICAgICAnY29uZGl0aW9ucyc6IFsKKyAgICAgICMgTG9jYXRpb24gb2Yg dGhlIGNocm9taXVtIHNyYyBkaXJlY3RvcnkuCisgICAgICBbJ2luc2lkZV9jaHJvbWl1bV9idWls ZD09MCcsIHsKKyAgICAgICAgIyB3ZWJraXQgaXMgYmVpbmcgYnVpbHQgb3V0c2lkZSBvZiB0aGUg ZnVsbCBjaHJvbWl1bSBwcm9qZWN0LgorICAgICAgICAnY2hyb21pdW1fc3JjX2Rpcic6ICcuLi8u Li9XZWJLaXQvY2hyb21pdW0nLAorICAgICAgICAnbGlianBlZ19neXBfcGF0aCc6ICcuLi8uLi9X ZWJLaXQvY2hyb21pdW0vdGhpcmRfcGFydHkvbGlianBlZ190dXJiby9saWJqcGVnLmd5cCcsCisg ICAgICB9LHsKKyAgICAgICAgIyB3ZWJraXQgaXMgY2hlY2tlZCBvdXQgaW4gc3JjL2Nocm9taXVt L3RoaXJkX3BhcnR5L3dlYmtpdAorICAgICAgICAnY2hyb21pdW1fc3JjX2Rpcic6ICcuLi8uLi8u Li8uLi8uLicsCisgICAgICB9XSwKICAgICAgICMgVE9ETyhtYXJ1ZWwpOiBNb3ZlIGl0IGluIGl0 cyBvd24gcHJvamVjdCBvciBnZW5lcmF0ZSBpdCBhbnl3YXk/CiAgICAgICBbJ2VuYWJsZV9zdmch PTAnLCB7CiAgICAgICAgICdiaW5kaW5nc19pZGxfZmlsZXMnOiBbCkBAIC0zMzQsNyArMjU3LDgy IEBACiAgICAgICAgIF0sCiAgICAgICB9XSwKICAgICBdLAotICB9LAorICB9LCAgIyB2YXJpYWJs ZXMKKworICAnY29uZGl0aW9ucyc6IFsKKyAgICBbJ09TIT0id2luIiBhbmQgcmVtb3ZlX3dlYmNv cmVfZGVidWdfc3ltYm9scz09MScsIHsKKyAgICAgICMgUmVtb3ZlIC1nIGZyb20gYWxsIHRhcmdl dHMgZGVmaW5lZCBoZXJlLgorICAgICAgJ3RhcmdldF9kZWZhdWx0cyc6IHsKKyAgICAgICAgJ2Nm bGFncyEnOiBbJy1nJ10sCisgICAgICB9LAorICAgIH1dLAorICAgIFsnb3NfcG9zaXg9PTEgYW5k IE9TIT0ibWFjIiBhbmQgT1MhPSJhbmRyb2lkIiBhbmQgZ2NjX3ZlcnNpb249PTQ2JywgeworICAg ICAgJ3RhcmdldF9kZWZhdWx0cyc6IHsKKyAgICAgICAgIyBEaXNhYmxlIHdhcm5pbmdzIGFib3V0 IGMrKzB4IGNvbXBhdGliaWxpdHksIGFzIHNvbWUgbmFtZXMgKHN1Y2ggYXMgbnVsbHB0cikgY29u ZmxpY3QKKyAgICAgICAgIyB3aXRoIHVwY29taW5nIGMrKzB4IHR5cGVzLgorICAgICAgICAnY2Zs YWdzX2NjJzogWyctV25vLWMrKzB4LWNvbXBhdCddLAorICAgICAgfSwKKyAgICB9XSwKKyAgICBb J09TPT0ibGludXgiIGFuZCB0YXJnZXRfYXJjaD09ImFybSInLCB7CisgICAgICAjIER1ZSB0byBh IGJ1ZyBpbiBnY2MgYXJtLCB3ZSBnZXQgd2FybmluZ3MgYWJvdXQgdW5pbml0aWFsaXplZCB0aW1l c05ld1JvbWFuLnVuc3RhdGljLjMyNTgKKyAgICAgICMgYW5kIGNvbG9yVHJhbnNwYXJlbnQudW5z dGF0aWMuNDg3OS4KKyAgICAgICd0YXJnZXRfZGVmYXVsdHMnOiB7CisgICAgICAgICdjZmxhZ3Mn OiBbJy1Xbm8tdW5pbml0aWFsaXplZCddLAorICAgICAgfSwKKyAgICB9XSwKKyAgICBbJ09TID09 ICJtYWMiJywgeworICAgICAgJ3RhcmdldHMnOiBbCisgICAgICAgIHsKKyAgICAgICAgICAjIE9u IHRoZSBNYWMsIGxpYldlYktpdFN5c3RlbUludGVyZmFjZSouYSBpcyB1c2VkIHRvIGhlbHAgV2Vi Q29yZQorICAgICAgICAgICMgaW50ZXJmYWNlIHdpdGggdGhlIHN5c3RlbS4gIFRoaXMgbGlicmFy eSBpcyBzdXBwbGllZCBhcyBhIHN0YXRpYworICAgICAgICAgICMgbGlicmFyeSBpbiBiaW5hcnkg Zm9ybWF0LiAgQXQgcHJlc2VudCwgaXQgY29udGFpbnMgbWFueSBnbG9iYWwKKyAgICAgICAgICAj IHN5bWJvbHMgbm90IG1hcmtlZCBwcml2YXRlX2V4dGVybi4gIEl0IHNob3VsZCBiZSBjb25zaWRl cmVkIGFuCisgICAgICAgICAgIyBpbXBsZW1lbnRhdGlvbiBkZXRhaWwgb2YgV2ViQ29yZSwgYW5k IGRvZXMgbm90IG5lZWQgdGhlc2Ugc3ltYm9scworICAgICAgICAgICMgdG8gYmUgZXhwb3NlZCBz byB3aWRlbHkuCisgICAgICAgICAgIworICAgICAgICAgICMgVGhpcyB0YXJnZXQgY29udGFpbnMg YW4gYWN0aW9uIHRoYXQgY3JhY2tzIG9wZW4gdGhlIGV4aXN0aW5nCisgICAgICAgICAgIyBzdGF0 aWMgbGlicmFyeSBhbmQgcmVidWlsZHMgaXQgd2l0aCB0aGVzZSBnbG9iYWwgc3ltYm9scworICAg ICAgICAgICMgdHJhbnNmb3JtZWQgdG8gcHJpdmF0ZV9leHRlcm4uCisgICAgICAgICAgJ3Rhcmdl dF9uYW1lJzogJ3dlYmtpdF9zeXN0ZW1faW50ZXJmYWNlJywKKyAgICAgICAgICAndHlwZSc6ICdz dGF0aWNfbGlicmFyeScsCisgICAgICAgICAgJ3ZhcmlhYmxlcyc6IHsKKyAgICAgICAgICAgICdh ZGp1c3RlZF9saWJyYXJ5X3BhdGgnOgorICAgICAgICAgICAgICAgICc8KFBST0RVQ1RfRElSKS9s aWJXZWJLaXRTeXN0ZW1JbnRlcmZhY2VMZW9wYXJkUHJpdmF0ZUV4dGVybi5hJywKKyAgICAgICAg ICB9LAorICAgICAgICAgICdzb3VyY2VzJzogWworICAgICAgICAgICAgIyBBbiBlbXB0eSBzb3Vy Y2UgZmlsZSBpcyBuZWVkZWQgdG8gY29udmluY2UgWGNvZGUgdG8gcHJvZHVjZQorICAgICAgICAg ICAgIyBvdXRwdXQgZm9yIHRoaXMgdGFyZ2V0LiAgVGhlIHJlc3VsdGluZyBsaWJyYXJ5IHdvbid0 IGFjdHVhbGx5CisgICAgICAgICAgICAjIGNvbnRhaW4gYW55dGhpbmcuICBUaGUgbGlicmFyeSBh dCBhZGp1c3RlZF9saWJyYXJ5X3BhdGggd2lsbCwKKyAgICAgICAgICAgICMgYW5kIHRoYXQgbGli cmFyeSBpcyBwdXNoZWQgdG8gZGVwZW5kZW50cyBvZiB0aGlzIHRhcmdldCBiZWxvdy4KKyAgICAg ICAgICAgICdtYWMvRW1wdHkuY3BwJywKKyAgICAgICAgICBdLAorICAgICAgICAgICdhY3Rpb25z JzogWworICAgICAgICAgICAgeworICAgICAgICAgICAgICAnYWN0aW9uX25hbWUnOiAnQWRqdXN0 IFZpc2liaWxpdHknLAorICAgICAgICAgICAgICAnaW5wdXRzJzogWworICAgICAgICAgICAgICAg ICdtYWMvYWRqdXN0X3Zpc2liaWxpdHkuc2gnLAorICAgICAgICAgICAgICAgICc8KGNocm9taXVt X3NyY19kaXIpL3RoaXJkX3BhcnR5L2FwcGxlX3dlYmtpdC9saWJXZWJLaXRTeXN0ZW1JbnRlcmZh Y2VMZW9wYXJkLmEnLAorICAgICAgICAgICAgICBdLAorICAgICAgICAgICAgICAnb3V0cHV0cyc6 IFsKKyAgICAgICAgICAgICAgICAnPChhZGp1c3RlZF9saWJyYXJ5X3BhdGgpJywKKyAgICAgICAg ICAgICAgXSwKKyAgICAgICAgICAgICAgJ2FjdGlvbic6IFsKKyAgICAgICAgICAgICAgICAnPEAo X2lucHV0cyknLAorICAgICAgICAgICAgICAgICc8QChfb3V0cHV0cyknLAorICAgICAgICAgICAg ICAgICc8KElOVEVSTUVESUFURV9ESVIpL2FkanVzdF92aXNpYmlsaXR5JywgICMgd29yayBkaXJl Y3RvcnkKKyAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgXSwgICMg YWN0aW9ucworICAgICAgICAgICdsaW5rX3NldHRpbmdzJzogeworICAgICAgICAgICAgJ2xpYnJh cmllcyc6IFsKKyAgICAgICAgICAgICAgJzwoYWRqdXN0ZWRfbGlicmFyeV9wYXRoKScsCisgICAg ICAgICAgICBdLAorICAgICAgICAgIH0sICAjIGxpbmtfc2V0dGluZ3MKKyAgICAgICAgfSwgICMg dGFyZ2V0IHdlYmtpdF9zeXN0ZW1faW50ZXJmYWNlCisgICAgICBdLCAgIyB0YXJnZXRzCisgICAg fV0sICAjIGNvbmRpdGlvbiBPUyA9PSAibWFjIgorICBdLCAgIyBjb25kaXRpb25zCisKICAgJ3Rh cmdldHMnOiBbCiAgICAgewogICAgICAgJ3RhcmdldF9uYW1lJzogJ2luc3BlY3Rvcl9wcm90b2Nv bF9zb3VyY2VzJywKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vREVQUyBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vREVQUwppbmRleCBiMGYwMjkzZDNhYTEyN2U4Njg2MzcwMzY5 NWM2MzFkYTNkODlkYzZkLi41YWM1MjZjN2RmNTlmZGJiNmJhNjBmNTY1OWJkY2JiMWJjNWFjNThj IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0RFUFMKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9ERVBTCkBAIC0zMiw3ICszMiw3IEBACiAKIHZhcnMgPSB7CiAgICdjaHJv bWl1bV9zdm4nOiAnaHR0cDovL3NyYy5jaHJvbWl1bS5vcmcvc3ZuL3RydW5rL3NyYycsCi0gICdj aHJvbWl1bV9yZXYnOiAnMTA4MTA3JworICAnY2hyb21pdW1fcmV2JzogJzEwODQ3NicKIH0KIAog ZGVwcyA9IHsKQEAgLTE1Niw2ICsxNTYsMTAgQEAgZGVwc19vcyA9IHsKICAgICAgIEZyb20oJ2No cm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L3lhc20vYmluYXJpZXMnKSwKICAgfSwKICAg J21hYyc6IHsKKyAgICAndGhpcmRfcGFydHkvYXBwbGVfYXBzbCc6CisgICAgICBWYXIoJ2Nocm9t aXVtX3N2bicpKycvdGhpcmRfcGFydHkvYXBwbGVfYXBzbEAnK1ZhcignY2hyb21pdW1fcmV2Jyks CisgICAgJ3RoaXJkX3BhcnR5L2FwcGxlX3dlYmtpdCc6CisgICAgICBWYXIoJ2Nocm9taXVtX3N2 bicpKycvdGhpcmRfcGFydHkvYXBwbGVfd2Via2l0QCcrVmFyKCdjaHJvbWl1bV9yZXYnKSwKICAg ICAndGhpcmRfcGFydHkvbnNzJzoKICAgICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3Ro aXJkX3BhcnR5L25zcycpLAogICB9LAo=