82039 2012-03-23 03:11:31 -0700 [Chromium] ImageDiff should be build for host on Android 2012-05-14 11:26:06 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84843 1 peter james.wei abarth james.wei webkit.review.bot oldest_to_newest 586196 0 peter 2012-03-23 03:11:31 -0700 The Android bot runs ImageDiff on host rather than target as transferring the pixel results to a device is too expensive. Per the WTF move, the dependency tree got significantly more complicated and various other targets also have to be build for host. Provide a proper fix and re-enable building ImageDiff for host on Chromium-Android. 619173 1 abarth 2012-05-08 22:35:08 -0700 Is this still needed in light of https://bugs.webkit.org/show_bug.cgi?id=85897#c8 ? 622724 2 141658 james.wei 2012-05-14 00:12:43 -0700 Created attachment 141658 Patch 622730 3 141659 james.wei 2012-05-14 00:37:03 -0700 Created attachment 141659 Patch 622733 4 james.wei 2012-05-14 00:37:40 -0700 *** Bug 86342 has been marked as a duplicate of this bug. *** 622735 5 james.wei 2012-05-14 00:42:00 -0700 (In reply to comment #1) > Is this still needed in light of https://bugs.webkit.org/show_bug.cgi?id=85897#c8 ? adam, I tried to build the ImageDiff without WTF and got it. I did some modification for the DumpRenderTree.gyp to remove WTF dependency, include WTF header files and then enable ImageDiff build. could you help to review it? thanks 622821 6 141659 peter 2012-05-14 04:19:53 -0700 Comment on attachment 141659 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=141659&action=review Chromium r136197 rolled in ICU changes required for this, which also are available in WebKit now. Do you think that using Adam's patch from Bug 85897 with the addendum of re-enabling the ImageDiff target (the last two of your changes to DumpRenderTree.gyp) would be a better approach? > Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:62 > + '<(source_dir)/WTF', This is how ImageDiff previously worked, but just including WTF rather than depending on it does create a risk. If part of the functionality ImageDiff relies on moves out of a .h file to an actual implementation file, linking errors would occur. As such, I'd prefer to depend on WTF if ImageDiff uses anything from WTF. > Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:70 > + 'toolsets': ['host'], Should we add a comment here saying why Android only wants to build ImageDiff for host? Something like "The Chromium Android port will compare images on host rather than target (a device or emulator) for performance reasons" may work. 622874 7 141659 james.wei 2012-05-14 05:56:23 -0700 Comment on attachment 141659 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=141659&action=review >> Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:62 >> + '<(source_dir)/WTF', > > This is how ImageDiff previously worked, but just including WTF rather than depending on it does create a risk. If part of the functionality ImageDiff relies on moves out of a .h file to an actual implementation file, linking errors would occur. As such, I'd prefer to depend on WTF if ImageDiff uses anything from WTF. yes, I agreed with you. my previous patch workes in this way. But I found the comment on #85897 so replace the dependency with the header files. I will fix it with your suggestion. thanks >> Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:70 >> + 'toolsets': ['host'], > > Should we add a comment here saying why Android only wants to build ImageDiff for host? Something like "The Chromium Android port will compare images on host rather than target (a device or emulator) for performance reasons" may work. fixed. thanks 622880 8 141705 james.wei 2012-05-14 05:59:52 -0700 Created attachment 141705 Patch 622885 9 peter 2012-05-14 06:08:51 -0700 LGTM, thank you for doing this! Adam, could you take a look for a formal r+ please? 623118 10 141705 abarth 2012-05-14 11:06:48 -0700 Comment on attachment 141705 Patch My pleasure. Thanks for driving this to completion.! 623145 11 141705 webkit.review.bot 2012-05-14 11:25:57 -0700 Comment on attachment 141705 Patch Clearing flags on attachment: 141705 Committed r116973: <http://trac.webkit.org/changeset/116973> 623146 12 webkit.review.bot 2012-05-14 11:26:06 -0700 All reviewed patches have been landed. Closing bug. 141658 2012-05-14 00:12:43 -0700 2012-05-14 00:36:58 -0700 Patch bug-82039-20120514151248.patch text/plain 3436 james.wei U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2ODYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDQxNzQ4MTQxNThlMzE3YTRkNmYzZjY0 OGJmMDAwNTc2ZDdiNDYwMDIuLjc2MDNiYjNkZThlNzUxY2MzOTljMGVjN2QzMTI3MTcxNjM1NWIy NmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTItMDUtMTQgIFdlaSBKYW1lcyAgPGphbWVzLndl aUBpbnRlbC5jb20+CisKKyAgICAgICAgRW5hYmxlIGJ1aWxkaW5nIEltYWdlRGlmZiBvbiBBbmRy b2lkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04NjM0 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV1RG Lmd5cC9XVEYuZ3lwOgorCiAyMDEyLTA1LTEwICBNaWNoYcWCIFBha3XFgmEgdmVsIFJ1dGthICA8 bS5wYWt1bGFAc2Ftc3VuZy5jb20+CiAKICAgICAgICAgW0VGTF0gQWRkIE93blB0ciBzcGVjaWFs aXphdGlvbiBmb3IgRWluYV9IYXNoLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dURi9XVEYuZ3lwL1dU Ri5neXAgYi9Tb3VyY2UvV1RGL1dURi5neXAvV1RGLmd5cAppbmRleCA2NzY3ZGY2NTdmM2U3NGE0 ZDI0NTU1MTVkMTUxODBiNTZjYjk4Njc5Li5hMTcwNWJhYjQxMDdlYjI5OWMwYjUxYTdiZjU5Mzc5 NGY2YWI3MzUxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV1RGL1dURi5neXAvV1RGLmd5cAorKysgYi9T b3VyY2UvV1RGL1dURi5neXAvV1RGLmd5cApAQCAtOTMsNyArOTMsMTQgQEAKICAgICAgICAgICAg IF0sCiAgICAgICAgICAgfV0sCiAgICAgICAgIF0sCi0gICAgICB9CisgICAgICB9LAorICAgICAg J2NvbmRpdGlvbnMnOiBbCisgICAgICAgIFsnT1M9PSJhbmRyb2lkIiBhbmQgYW5kcm9pZF9idWls ZF90eXBlPT0wJywgeworICAgICAgICAgICMgQW5kcm9pZCBidWlsZHMgSW1hZ2VEaWZmIGZvciBo b3N0LCB3aGljaCBoYXMgYSBkZXBlbmRlbmN5IG9uIHd0Zi4KKyAgICAgICAgICAjIFRoYXQgbWVh bnMgd2UgbmVlZCB0byBidWlsZCB0aGlzIHRhcmdldCBmb3IgYm90aCBob3N0IGFuZCB0YXJnZXQu CisgICAgICAgICAgJ3Rvb2xzZXRzJzogWydob3N0JywgJ3RhcmdldCddLAorICAgICAgICB9XSwK KyAgICAgIF0KICAgICB9LAogICAgIHsKICAgICAgICd0YXJnZXRfbmFtZSc6ICd3dGYnLApAQCAt MTgyLDYgKzE4OSwxMSBAQAogICAgICAgICAgICAgfV0sCiAgICAgICAgICAgXSwKICAgICAgICAg fV0sCisgICAgICAgIFsnT1M9PSJhbmRyb2lkIiBhbmQgYW5kcm9pZF9idWlsZF90eXBlPT0wJywg eworICAgICAgICAgICMgQW5kcm9pZCBidWlsZHMgSW1hZ2VEaWZmIGZvciBob3N0LCB3aGljaCBo YXMgYSBkZXBlbmRlbmN5IG9uIHd0Zi4KKyAgICAgICAgICAjIFRoYXQgbWVhbnMgd2UgbmVlZCB0 byBidWlsZCB0aGlzIHRhcmdldCBmb3IgYm90aCBob3N0IGFuZCB0YXJnZXQuCisgICAgICAgICAg J3Rvb2xzZXRzJzogWydob3N0JywgJ3RhcmdldCddLAorICAgICAgICB9XSwKICAgICAgIF0sCiAg ICAgfSwKICAgXQpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9n CmluZGV4IGE3MTQ3NWRiMGNhNjUzZWQwYWU3ZDI0N2M3NzcxY2MzN2QxZTFjNzQuLjc0MDM4ZjY5 ODU2Y2IxOWU4NzU1ZmIzNWQ5MzlkZTFjYWZjMmE4MTAgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5n ZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAxMi0wNS0xNCAg V2VpIEphbWVzICA8amFtZXMud2VpQGludGVsLmNvbT4KKworICAgICAgICBFbmFibGUgYnVpbGRp bmcgSW1hZ2VEaWZmIG9uIEFuZHJvaWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTg2MzQyCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBEdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5neXAvRHVtcFJl bmRlclRyZWUuZ3lwOgorCiAyMDEyLTA1LTEyICBUaW0gSG9ydG9uICA8dGltb3RoeV9ob3J0b25A YXBwbGUuY29tPgogCiAgICAgICAgIHJ1bi1zYWZhcmkgYW5kIGNvLiBzaG91bGQgc3VwcG9ydCAt LWd1YXJkLW1hbGxvYyBjb21tYW5kIGxpbmUgYXJndW1lbnQKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1 bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLmd5cC9EdW1wUmVuZGVyVHJlZS5neXAgYi9Ub29s cy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5neXAvRHVtcFJlbmRlclRyZWUuZ3lwCmlu ZGV4IDUyMGUzODkwMTRhM2E4MDlmZTE5OTRjZDNmYjQ4MjQxMzA0YTc3ZTUuLmJmYzgzYWFiM2Jk NjAxZTY5ZmYyYTljOWFlYjQyZTZjNDhkMjhkZmUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5k ZXJUcmVlL0R1bXBSZW5kZXJUcmVlLmd5cC9EdW1wUmVuZGVyVHJlZS5neXAKKysrIGIvVG9vbHMv RHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUuZ3lwL0R1bXBSZW5kZXJUcmVlLmd5cApAQCAt NjcsOSArNjcsNyBAQAogICAgICAgICAgICAgXSwKICAgICAgICAgICAgICdjb25kaXRpb25zJzog WwogICAgICAgICAgICAgICAgIFsnT1M9PSJhbmRyb2lkIicsIHsKLSAgICAgICAgICAgICAgICAg ICAgIyBGSVhNRTogUmUtZW5hYmxlIGJ1aWxkaW5nIEltYWdlRGlmZiBhZnRlciB0aGUgZGVwZW5k ZW5jaWVzCi0gICAgICAgICAgICAgICAgICAgICMgZm9yIGhvc3QgaGF2ZSBiZWVuIGZpeGVkLCBh cyB0aGlzIGJyb2tlIHBlciB0aGUgV1RGIG1vdmUuCi0gICAgICAgICAgICAgICAgICAgICd0eXBl JzogJ25vbmUnLAorICAgICAgICAgICAgICAgICAgICAndG9vbHNldHMnOiBbJ2hvc3QnXSwKICAg ICAgICAgICAgICAgICB9XSwKICAgICAgICAgICAgIF0sCiAgICAgICAgIH0sCkBAIC0yMzIsOSAr MjMwLDcgQEAKICAgICAgICAgICAgICAgICB9XSwKICAgICAgICAgICAgICAgICBbJ09TPT0iYW5k cm9pZCInLCB7CiAgICAgICAgICAgICAgICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCi0gICAgICAg ICAgICAgICAgICAgICAgICAjIEZJWE1FOiBSZS1lbmFibGUgYnVpbGRpbmcgSW1hZ2VEaWZmIG9u IEFuZHJvaWQuCi0gICAgICAgICAgICAgICAgICAgICAgICAjIGh0dHBzOi8vYnVncy53ZWJraXQu b3JnL3Nob3dfYnVnLmNnaT9pZD04MjAzOQotICAgICAgICAgICAgICAgICAgICAgICAgIydJbWFn ZURpZmYjaG9zdCcsCisgICAgICAgICAgICAgICAgICAgICAgICAnSW1hZ2VEaWZmI2hvc3QnLAog ICAgICAgICAgICAgICAgICAgICBdLAogICAgICAgICAgICAgICAgICAgICAnc291cmNlcy8nOiBb CiAgICAgICAgICAgICAgICAgICAgICAgICBbJ2luY2x1ZGUnLCAnY2hyb21pdW0vVGVzdFNoZWxs TGludXhcXC5jcHAkJ10sCg== 141659 2012-05-14 00:37:03 -0700 2012-05-14 05:59:47 -0700 Patch bug-82039-20120514153707.patch text/plain 2319 james.wei U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2ODYwCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTcxNDc1ZGIwY2E2NTNlZDBhZTdkMjQ3Yzc3NzFjYzM3 ZDFlMWM3NC4uNWUwOWJmOTk4YTUyYWE4ZWRkODZiNWM5NmIxYjc0YTk2M2Y3OWYyZiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEy IEBACisyMDEyLTA1LTE0ICBXZWkgSmFtZXMgIDxqYW1lcy53ZWlAaW50ZWwuY29tPgorCisgICAg ICAgIFtDaHJvbWl1bV0gSW1hZ2VEaWZmIHNob3VsZCBiZSBidWlsZCBmb3IgaG9zdCBvbiBBbmRy b2lkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MjAz OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogRHVt cFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUuZ3lwL0R1bXBSZW5kZXJUcmVlLmd5cDoKKwogMjAx Mi0wNS0xMiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAg ICBydW4tc2FmYXJpIGFuZCBjby4gc2hvdWxkIHN1cHBvcnQgLS1ndWFyZC1tYWxsb2MgY29tbWFu ZCBsaW5lIGFyZ3VtZW50CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVu ZGVyVHJlZS5neXAvRHVtcFJlbmRlclRyZWUuZ3lwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvRHVt cFJlbmRlclRyZWUuZ3lwL0R1bXBSZW5kZXJUcmVlLmd5cAppbmRleCA1MjBlMzg5MDE0YTNhODA5 ZmUxOTk0Y2QzZmI0ODI0MTMwNGE3N2U1Li43OGI3YmQxYzg2NzhlZGZlOTc4MWQ4ZGZhYTU4OTU5 ODM3OWYzMGI2IDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJl ZS5neXAvRHVtcFJlbmRlclRyZWUuZ3lwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBS ZW5kZXJUcmVlLmd5cC9EdW1wUmVuZGVyVHJlZS5neXAKQEAgLTU2LDEwICs1NiwxMCBAQAogICAg ICAgICAgICAgJ3R5cGUnOiAnZXhlY3V0YWJsZScsCiAgICAgICAgICAgICAnZGVwZW5kZW5jaWVz JzogWwogICAgICAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL3dlYmtpdC9zdXBwb3J0 L3dlYmtpdF9zdXBwb3J0Lmd5cDp3ZWJraXRfc3VwcG9ydF9nZngnLAotICAgICAgICAgICAgICAg ICc8KHNvdXJjZV9kaXIpL1dURi9XVEYuZ3lwL1dURi5neXA6d3RmJywKICAgICAgICAgICAgIF0s CiAgICAgICAgICAgICAnaW5jbHVkZV9kaXJzJzogWwogICAgICAgICAgICAgICAgICc8KHNvdXJj ZV9kaXIpL0phdmFTY3JpcHRDb3JlJywKKyAgICAgICAgICAgICAgICAnPChzb3VyY2VfZGlyKS9X VEYnLAogICAgICAgICAgICAgICAgICc8KERFUFRIKScsCiAgICAgICAgICAgICBdLAogICAgICAg ICAgICAgJ3NvdXJjZXMnOiBbCkBAIC02Nyw5ICs2Nyw3IEBACiAgICAgICAgICAgICBdLAogICAg ICAgICAgICAgJ2NvbmRpdGlvbnMnOiBbCiAgICAgICAgICAgICAgICAgWydPUz09ImFuZHJvaWQi JywgewotICAgICAgICAgICAgICAgICAgICAjIEZJWE1FOiBSZS1lbmFibGUgYnVpbGRpbmcgSW1h Z2VEaWZmIGFmdGVyIHRoZSBkZXBlbmRlbmNpZXMKLSAgICAgICAgICAgICAgICAgICAgIyBmb3Ig aG9zdCBoYXZlIGJlZW4gZml4ZWQsIGFzIHRoaXMgYnJva2UgcGVyIHRoZSBXVEYgbW92ZS4KLSAg ICAgICAgICAgICAgICAgICAgJ3R5cGUnOiAnbm9uZScsCisgICAgICAgICAgICAgICAgICAgICd0 b29sc2V0cyc6IFsnaG9zdCddLAogICAgICAgICAgICAgICAgIH1dLAogICAgICAgICAgICAgXSwK ICAgICAgICAgfSwKQEAgLTIzMiw5ICsyMzAsNyBAQAogICAgICAgICAgICAgICAgIH1dLAogICAg ICAgICAgICAgICAgIFsnT1M9PSJhbmRyb2lkIicsIHsKICAgICAgICAgICAgICAgICAgICAgJ2Rl cGVuZGVuY2llcyc6IFsKLSAgICAgICAgICAgICAgICAgICAgICAgICMgRklYTUU6IFJlLWVuYWJs ZSBidWlsZGluZyBJbWFnZURpZmYgb24gQW5kcm9pZC4KLSAgICAgICAgICAgICAgICAgICAgICAg ICMgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgyMDM5Ci0gICAgICAg ICAgICAgICAgICAgICAgICAjJ0ltYWdlRGlmZiNob3N0JywKKyAgICAgICAgICAgICAgICAgICAg ICAgICdJbWFnZURpZmYjaG9zdCcsCiAgICAgICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAg ICAgICAgICAgICdzb3VyY2VzLyc6IFsKICAgICAgICAgICAgICAgICAgICAgICAgIFsnaW5jbHVk ZScsICdjaHJvbWl1bS9UZXN0U2hlbGxMaW51eFxcLmNwcCQnXSwK 141705 2012-05-14 05:59:52 -0700 2012-05-14 11:25:57 -0700 Patch bug-82039-20120514205957.patch text/plain 3643 james.wei U3VidmVyc2lvbiBSZXZpc2lvbjogMTE2ODYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV1RGL0NoYW5n ZUxvZyBiL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCmluZGV4IDQxNzQ4MTQxNThlMzE3YTRkNmYzZjY0 OGJmMDAwNTc2ZDdiNDYwMDIuLmRjNzA4YmRmYTI2NDBjZmIxZmRiZWFjOTQ3YTZjYWY3YmRjY2Mx MDIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XVEYvQ2hh bmdlTG9nCkBAIC0xLDMgKzEsMTIgQEAKKzIwMTItMDUtMTQgIFdlaSBKYW1lcyAgPGphbWVzLndl aUBpbnRlbC5jb20+CisKKyAgICAgICAgW0Nocm9taXVtXSBJbWFnZURpZmYgc2hvdWxkIGJlIGJ1 aWxkIGZvciBob3N0IG9uIEFuZHJvaWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTgyMDM5CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BT ISkuCisKKyAgICAgICAgKiBXVEYuZ3lwL1dURi5neXA6CisKIDIwMTItMDUtMTAgIE1pY2hhxYIg UGFrdcWCYSB2ZWwgUnV0a2EgIDxtLnBha3VsYUBzYW1zdW5nLmNvbT4KIAogICAgICAgICBbRUZM XSBBZGQgT3duUHRyIHNwZWNpYWxpemF0aW9uIGZvciBFaW5hX0hhc2guCmRpZmYgLS1naXQgYS9T b3VyY2UvV1RGL1dURi5neXAvV1RGLmd5cCBiL1NvdXJjZS9XVEYvV1RGLmd5cC9XVEYuZ3lwCmlu ZGV4IDY3NjdkZjY1N2YzZTc0YTRkMjQ1NTUxNWQxNTE4MGI1NmNiOTg2NzkuLmExNzA1YmFiNDEw N2ViMjk5YzBiNTFhN2JmNTkzNzk0ZjZhYjczNTEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XVEYvV1RG Lmd5cC9XVEYuZ3lwCisrKyBiL1NvdXJjZS9XVEYvV1RGLmd5cC9XVEYuZ3lwCkBAIC05Myw3ICs5 MywxNCBAQAogICAgICAgICAgICAgXSwKICAgICAgICAgICB9XSwKICAgICAgICAgXSwKLSAgICAg IH0KKyAgICAgIH0sCisgICAgICAnY29uZGl0aW9ucyc6IFsKKyAgICAgICAgWydPUz09ImFuZHJv aWQiIGFuZCBhbmRyb2lkX2J1aWxkX3R5cGU9PTAnLCB7CisgICAgICAgICAgIyBBbmRyb2lkIGJ1 aWxkcyBJbWFnZURpZmYgZm9yIGhvc3QsIHdoaWNoIGhhcyBhIGRlcGVuZGVuY3kgb24gd3RmLgor ICAgICAgICAgICMgVGhhdCBtZWFucyB3ZSBuZWVkIHRvIGJ1aWxkIHRoaXMgdGFyZ2V0IGZvciBi b3RoIGhvc3QgYW5kIHRhcmdldC4KKyAgICAgICAgICAndG9vbHNldHMnOiBbJ2hvc3QnLCAndGFy Z2V0J10sCisgICAgICAgIH1dLAorICAgICAgXQogICAgIH0sCiAgICAgewogICAgICAgJ3Rhcmdl dF9uYW1lJzogJ3d0ZicsCkBAIC0xODIsNiArMTg5LDExIEBACiAgICAgICAgICAgICB9XSwKICAg ICAgICAgICBdLAogICAgICAgICB9XSwKKyAgICAgICAgWydPUz09ImFuZHJvaWQiIGFuZCBhbmRy b2lkX2J1aWxkX3R5cGU9PTAnLCB7CisgICAgICAgICAgIyBBbmRyb2lkIGJ1aWxkcyBJbWFnZURp ZmYgZm9yIGhvc3QsIHdoaWNoIGhhcyBhIGRlcGVuZGVuY3kgb24gd3RmLgorICAgICAgICAgICMg VGhhdCBtZWFucyB3ZSBuZWVkIHRvIGJ1aWxkIHRoaXMgdGFyZ2V0IGZvciBib3RoIGhvc3QgYW5k IHRhcmdldC4KKyAgICAgICAgICAndG9vbHNldHMnOiBbJ2hvc3QnLCAndGFyZ2V0J10sCisgICAg ICAgIH1dLAogICAgICAgXSwKICAgICB9LAogICBdCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VM b2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTcxNDc1ZGIwY2E2NTNlZDBhZTdkMjQ3Yzc3NzFj YzM3ZDFlMWM3NC4uNWUwOWJmOTk4YTUyYWE4ZWRkODZiNWM5NmIxYjc0YTk2M2Y3OWYyZiAxMDA2 NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsx LDEyIEBACisyMDEyLTA1LTE0ICBXZWkgSmFtZXMgIDxqYW1lcy53ZWlAaW50ZWwuY29tPgorCisg ICAgICAgIFtDaHJvbWl1bV0gSW1hZ2VEaWZmIHNob3VsZCBiZSBidWlsZCBmb3IgaG9zdCBvbiBB bmRyb2lkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 MjAzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICog RHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUuZ3lwL0R1bXBSZW5kZXJUcmVlLmd5cDoKKwog MjAxMi0wNS0xMiAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAg ICAgICBydW4tc2FmYXJpIGFuZCBjby4gc2hvdWxkIHN1cHBvcnQgLS1ndWFyZC1tYWxsb2MgY29t bWFuZCBsaW5lIGFyZ3VtZW50CmRpZmYgLS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9EdW1w UmVuZGVyVHJlZS5neXAvRHVtcFJlbmRlclRyZWUuZ3lwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUv RHVtcFJlbmRlclRyZWUuZ3lwL0R1bXBSZW5kZXJUcmVlLmd5cAppbmRleCA1MjBlMzg5MDE0YTNh ODA5ZmUxOTk0Y2QzZmI0ODI0MTMwNGE3N2U1Li42ZDY4YzA0M2MwZjJmMzY4MzQyYzk1MTZmOTBi NjVkNTlmZGRhYjkxIDEwMDY0NAotLS0gYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVy VHJlZS5neXAvRHVtcFJlbmRlclRyZWUuZ3lwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL0R1 bXBSZW5kZXJUcmVlLmd5cC9EdW1wUmVuZGVyVHJlZS5neXAKQEAgLTY3LDkgKzY3LDkgQEAKICAg ICAgICAgICAgIF0sCiAgICAgICAgICAgICAnY29uZGl0aW9ucyc6IFsKICAgICAgICAgICAgICAg ICBbJ09TPT0iYW5kcm9pZCInLCB7Ci0gICAgICAgICAgICAgICAgICAgICMgRklYTUU6IFJlLWVu YWJsZSBidWlsZGluZyBJbWFnZURpZmYgYWZ0ZXIgdGhlIGRlcGVuZGVuY2llcwotICAgICAgICAg ICAgICAgICAgICAjIGZvciBob3N0IGhhdmUgYmVlbiBmaXhlZCwgYXMgdGhpcyBicm9rZSBwZXIg dGhlIFdURiBtb3ZlLgotICAgICAgICAgICAgICAgICAgICAndHlwZSc6ICdub25lJywKKyAgICAg ICAgICAgICAgICAgICAgIyBUaGUgQ2hyb21pdW0gQW5kcm9pZCBwb3J0IHdpbGwgY29tcGFyZSBp bWFnZXMgb24gaG9zdCByYXRoZXIKKyAgICAgICAgICAgICAgICAgICAgIyB0aGFuIHRhcmdldCAo YSBkZXZpY2Ugb3IgZW11bGF0b3IpIGZvciBwZXJmb3JtYW5jZSByZWFzb25zLgorICAgICAgICAg ICAgICAgICAgICAndG9vbHNldHMnOiBbJ2hvc3QnXSwKICAgICAgICAgICAgICAgICB9XSwKICAg ICAgICAgICAgIF0sCiAgICAgICAgIH0sCkBAIC0yMzIsOSArMjMyLDcgQEAKICAgICAgICAgICAg ICAgICB9XSwKICAgICAgICAgICAgICAgICBbJ09TPT0iYW5kcm9pZCInLCB7CiAgICAgICAgICAg ICAgICAgICAgICdkZXBlbmRlbmNpZXMnOiBbCi0gICAgICAgICAgICAgICAgICAgICAgICAjIEZJ WE1FOiBSZS1lbmFibGUgYnVpbGRpbmcgSW1hZ2VEaWZmIG9uIEFuZHJvaWQuCi0gICAgICAgICAg ICAgICAgICAgICAgICAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 MjAzOQotICAgICAgICAgICAgICAgICAgICAgICAgIydJbWFnZURpZmYjaG9zdCcsCisgICAgICAg ICAgICAgICAgICAgICAgICAnSW1hZ2VEaWZmI2hvc3QnLAogICAgICAgICAgICAgICAgICAgICBd LAogICAgICAgICAgICAgICAgICAgICAnc291cmNlcy8nOiBbCiAgICAgICAgICAgICAgICAgICAg ICAgICBbJ2luY2x1ZGUnLCAnY2hyb21pdW0vVGVzdFNoZWxsTGludXhcXC5jcHAkJ10sCg==