77243 2012-01-27 14:12:45 -0800 [chromium] Add support for building standalone webkit/chromium checkouts with ninja. 2012-01-28 15:43:52 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 77287 1 thakis thakis abarth jochen webkit.review.bot oldest_to_newest 544349 0 thakis 2012-01-27 14:12:45 -0800 [chromium] Add support for building standalone webkit/chromium checkouts with ninja. 544350 1 124367 thakis 2012-01-27 14:13:03 -0800 Created attachment 124367 Patch 544352 2 124367 thakis 2012-01-27 14:14:16 -0800 Comment on attachment 124367 Patch This will probably do it, but it looks like nobody ever used ninja/linux with standalone webkit builds yet -- the ninja gyp generator can't handle this configuration yet. I'm looking into that. 544551 3 124410 thakis 2012-01-27 17:51:50 -0800 Created attachment 124410 Patch 544552 4 thakis 2012-01-27 17:52:13 -0800 Depends on http://codereview.chromium.org/9298039/ 544562 5 124413 thakis 2012-01-27 18:10:38 -0800 Created attachment 124413 Patch 544630 6 abarth 2012-01-28 00:14:24 -0800 Thanks! Please feel free to land whenever everything else is in place. 544693 7 thakis 2012-01-28 14:21:22 -0800 Landing should be safe now (modulo possible breakages I might have introduced), but it needs the chromium deps roll in bug 77287 to actually work. Once that's in Tools/Scripts/update-webkit --chromium --ninja Tools/Scripts/build-webkit --chromium should do the trick. I only ran that a single time and verified that the build doesn't fail, and didn't do any testing. Let me know how it goes! 544702 8 124413 webkit.review.bot 2012-01-28 15:43:47 -0800 Comment on attachment 124413 Patch Clearing flags on attachment: 124413 Committed r106195: <http://trac.webkit.org/changeset/106195> 544703 9 webkit.review.bot 2012-01-28 15:43:52 -0800 All reviewed patches have been landed. Closing bug. 124367 2012-01-27 14:13:03 -0800 2012-01-27 17:51:47 -0800 Patch bug-77243-20120127141302.patch text/plain 4847 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2MTQzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOTBmYzczYTNhYjU4OTM3MDA5ODUzMjllOTYxMTgzMzdk NGMxZmRjMS4uZjJmYjJmOWMzZWQyNmVlYmFkZjZjYjQzNGZiYjRjOWNhZjU3YjlmYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3 IEBACisyMDEyLTAxLTI3ICBOaWNvIFdlYmVyICA8dGhha2lzQGNocm9taXVtLm9yZz4KKworICAg ICAgICBbY2hyb21pdW1dIEFkZCBzdXBwb3J0IGZvciBidWlsZGluZyBzdGFuZGFsb25lIHdlYmtp dC9jaHJvbWl1bSBjaGVja291dHMgd2l0aCBuaW5qYS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc3MjQzCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3VwZGF0ZS13ZWJraXQ6CisgICAgICAg ICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoaXNDaHJvbWl1bU5pbmphKToKKyAg ICAgICAgKGRldGVybWluZUlzQ2hyb21pdW1OaW5qYSk6CisgICAgICAgIChidWlsZENocm9taXVt TmluamEpOgorICAgICAgICAoYnVpbGRDaHJvbWl1bSk6CisKIDIwMTItMDEtMjcgIE1hcnRpbiBS b2JpbnNvbiAgPG1yb2JpbnNvbkBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIFtXSzJdIElt cGxlbWVudCB0aGUgcG9saWN5IGNsaWVudApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy91cGRh dGUtd2Via2l0IGIvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0CmluZGV4IDdlYzg4YmIzMzc4 YmExZDUyY2Q0N2Q2NjRjNGQ2ODczMzE4NjQ3NGYuLmViOTRmMTY1YjRlMGM3YjBkNmY3MWIzNzA1 YWFiYzAyZmI1OGZmZDUgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdAor KysgYi9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQKQEAgLTQ4LDYgKzQ4LDcgQEAgbXkgJHF1 aWV0ID0gJyc7CiBteSAkc2hvd0hlbHA7CiBteSAkdXNlR1lQID0gMDsKIG15ICR1c2VNYWtlID0g MDsKK215ICR1c2VOaW5qYSA9IDA7CiAKIGRldGVybWluZUlzQ2hyb21pdW0oKTsKIGRldGVybWlu ZUlzQ2hyb21pdW1BbmRyb2lkKCk7CkBAIC02MSw2ICs2Miw3IEBAIG15ICRnZXRPcHRpb25zUmVz dWx0ID0gR2V0T3B0aW9ucygKICAgICAncXxxdWlldCcgPT4gXCRxdWlldCwKICAgICAnZ3lwJyA9 PiBcJHVzZUdZUCwKICAgICAnbWFrZScgPT4gXCR1c2VNYWtlLAorICAgICduaW5qYScgPT4gXCR1 c2VOaW5qYSwKICk7IAogCiBpZiAoISRnZXRPcHRpb25zUmVzdWx0IHx8ICRzaG93SGVscCkgewpA QCAtNjgsNiArNzAsNyBAQCBpZiAoISRnZXRPcHRpb25zUmVzdWx0IHx8ICRzaG93SGVscCkgewog VXNhZ2U6IEB7WyBiYXNlbmFtZSgkMCkgXX0gW29wdGlvbnNdCiAgIC0tY2hyb21pdW0gICAgICAg ICAgYWxzbyB1cGRhdGUgZGVwZW5kZW5jaWVzIG9mIHRoZSBjaHJvbWl1bSBwb3J0CiAgIC0tbWFr ZSAgICAgICAgICAgICAgZ2VuZXJhdGUgdGhlIE1ha2VmaWxlLWJhc2VkIGJ1aWxkIHN5c3RlbSAo Q2hyb21pdW0gb25seSkKKyAgLS1uaW5qYSAgICAgICAgICAgICBnZW5lcmF0ZSB0aGUgbmluamEt YmFzZWQgYnVpbGQgc3lzdGVtIChDaHJvbWl1bSBvbmx5KQogICAtLWNocm9taXVtLWFuZHJvaWQg IGFsc28gdXBkYXRlIGRlcGVuZGVuY2llcyBvZiB0aGUgY2hyb21pdW0gcG9ydCBmb3IgQW5kcm9p ZAogICAtaHwtLWhlbHAgICAgICAgICAgIHNob3cgdGhlIGhlbHAgbWVzc2FnZQogICAtcXwtLXF1 aWV0ICAgICAgICAgIHBhc3MgLXEgdG8gc3ZuIHVwZGF0ZSBmb3IgcXVpZXQgdXBkYXRlcwpAQCAt ODAsNiArODMsOSBAQCBfX0VORF9fCiBpZiAoJHVzZU1ha2UpIHsKICAgICAkRU5WeyJHWVBfR0VO RVJBVE9SUyJ9ID0gIm1ha2UiOwogfQoraWYgKCR1c2VOaW5qYSkgeworICAgICRFTlZ7IkdZUF9H RU5FUkFUT1JTIn0gPSAibmluamEiOworfQogCiBteSAkc3RhcnRUaW1lID0gdGltZSgpOwogCmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dl YmtpdGRpcnMucG0KaW5kZXggNDMxYmFhZmU5NzZmZDllODNlOTAwOWE2NDJmOGMxNmJmMmQxYTgw MS4uNDE2NjViZWQ1NTNkOGZlYzU1Mzg5YmM3ZjAwMThhMzg2NDBhYTllZSAxMDA3NTUKLS0tIGEv VG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGly cy5wbQpAQCAtOTUsNiArOTUsNyBAQCBteSAkaXNCbGFja0JlcnJ5OwogbXkgJGlzQ2hyb21pdW07 CiBteSAkaXNDaHJvbWl1bUFuZHJvaWQ7CiBteSAkaXNDaHJvbWl1bU1hY01ha2U7CitteSAkaXND aHJvbWl1bU5pbmphOwogbXkgJGZvcmNlQ2hyb21pdW1VcGRhdGU7CiBteSAkaXNJbnNwZWN0b3JG cm9udGVuZDsKIG15ICRpc1dLMjsKQEAgLTExMzksNiArMTE0MCwzNyBAQCBzdWIgZGV0ZXJtaW5l SXNDaHJvbWl1bU1hY01ha2UoKQogICAgICRpc0Nocm9taXVtTWFjTWFrZSA9IGlzRGFyd2luKCkg JiYgJGhhc1VwVG9EYXRlTWFrZWZpbGU7CiB9CiAKK3N1YiBpc0Nocm9taXVtTmluamEoKQorewor ICAgIGRldGVybWluZUlzQ2hyb21pdW1OaW5qYSgpOworICAgIHJldHVybiAkaXNDaHJvbWl1bU5p bmphOworfQorCitzdWIgZGV0ZXJtaW5lSXNDaHJvbWl1bU5pbmphKCkKK3sKKyAgICByZXR1cm4g aWYgZGVmaW5lZCgkaXNDaHJvbWl1bU5pbmphKTsKKworICAgIG15ICRjb25maWcgPSBjb25maWd1 cmF0aW9uKCk7CisKKyAgICBteSAkaGFzVXBUb0RhdGVOaW5qYWJ1aWxkID0gMDsKKyAgICBpZiAo LWUgIm91dC8kY29uZmlnL2J1aWxkLm5pbmphIikgeworICAgICAgICBteSAkc3RhdE5pbmphID0g c3RhdCgib3V0LyRjb25maWcvYnVpbGQubmluamEiKTsKKworICAgICAgICBteSAkc3RhdFhjb2Rl ID0gMDsKKyAgICAgICAgaWYgKC1lICdTb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC54Y29k ZXByb2onKSB7CisgICAgICAgICAgJHN0YXRYY29kZSA9IHN0YXQoJ1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vV2ViS2l0Lnhjb2RlcHJvaicpLT5tdGltZTsKKyAgICAgICAgfQorCisgICAgICAgIG15 ICRzdGF0TWFrZSA9IDA7CisgICAgICAgIGlmICgtZSAnTWFrZWZpbGUuY2hyb21pdW0nKSB7Cisg ICAgICAgICAgJHN0YXRYY29kZSA9IHN0YXQoJ01ha2VmaWxlLmNocm9taXVtJyktPm10aW1lOwor ICAgICAgICB9CisKKyAgICAgICAgJGhhc1VwVG9EYXRlTmluamFidWlsZCA9ICRzdGF0TmluamEg PiAkc3RhdFhjb2RlICYmICRzdGF0TmluamEgPiAkc3RhdE1ha2U7CisgICAgfQorICAgICRpc0No cm9taXVtTmluamEgPSAkaGFzVXBUb0RhdGVOaW5qYWJ1aWxkOworfQorCiBzdWIgZm9yY2VDaHJv bWl1bVVwZGF0ZSgpCiB7CiAgICAgZGV0ZXJtaW5lSXNDaHJvbWl1bSgpOwpAQCAtMjI2Niw2ICsy Mjk4LDE5IEBAIHN1YiBidWlsZENocm9taXVtTWFrZWZpbGUoJCRAKQogICAgIHJldHVybiBzeXN0 ZW0gJGNvbW1hbmQ7CiB9CiAKK3N1YiBidWlsZENocm9taXVtTmluamEoJCRAKQoreworICAgICMg cm0gLXJmIG91dCByZXF1aXJlcyByZXJ1bm5pbmcgZ3lwLCBzbyBkb24ndCBzdXBwb3J0IC0tY2xl YW4gZm9yIG5vdy4KKyAgICBteSAoJHRhcmdldCwgQG9wdGlvbnMpID0gQF87CisgICAgbXkgJGNv bmZpZyA9IGNvbmZpZ3VyYXRpb24oKTsKKyAgICBteSAkY29tbWFuZCA9ICIiOworCisgICAgJGNv bW1hbmQgLj0gIm5pbmphIC1Db3V0LyRjb25maWcgJHRhcmdldCI7CisKKyAgICBwcmludCAiJGNv bW1hbmRcbiI7CisgICAgcmV0dXJuIHN5c3RlbSAkY29tbWFuZDsKK30KKwogc3ViIGJ1aWxkQ2hy b21pdW1WaXN1YWxTdHVkaW9Qcm9qZWN0KCQkKQogewogICAgIG15ICgkcHJvamVjdFBhdGgsICRj bGVhbikgPSBAXzsKQEAgLTIzMTYsMTIgKzIzNjEsMTQgQEAgc3ViIGJ1aWxkQ2hyb21pdW0oJEAp CiAgICAgfQogCiAgICAgbXkgJHJlc3VsdCA9IDE7Ci0gICAgaWYgKGlzRGFyd2luKCkgJiYgIWlz Q2hyb21pdW1BbmRyb2lkKCkgJiYgIWlzQ2hyb21pdW1NYWNNYWtlKCkpIHsKKyAgICBpZiAoaXNE YXJ3aW4oKSAmJiAhaXNDaHJvbWl1bUFuZHJvaWQoKSAmJiAhaXNDaHJvbWl1bU1hY01ha2UoKSAm JiAhaXNDaHJvbWl1bU5pbmphKCkpIHsKICAgICAgICAgIyBNYWMgYnVpbGQgLSBidWlsZHMgdGhl IHJvb3QgeGNvZGUgcHJvamVjdC4KICAgICAgICAgJHJlc3VsdCA9IGJ1aWxkWENvZGVQcm9qZWN0 KCJTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0FsbCIsICRjbGVhbiwgIi1jb25maWd1cmF0aW9uIiwg Y29uZmlndXJhdGlvbigpLCBAb3B0aW9ucyk7CiAgICAgfSBlbHNpZiAoaXNDeWd3aW4oKSB8fCBp c1dpbmRvd3MoKSkgewogICAgICAgICAjIFdpbmRvd3MgYnVpbGQgLSBidWlsZHMgdGhlIHJvb3Qg dmlzdWFsIHN0dWRpbyBzb2x1dGlvbi4KICAgICAgICAgJHJlc3VsdCA9IGJ1aWxkQ2hyb21pdW1W aXN1YWxTdHVkaW9Qcm9qZWN0KCJTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0FsbC5zbG4iLCAkY2xl YW4pOworICAgIH0gZWxzaWYgKGlzQ2hyb21pdW1OaW5qYSgpKSB7CisgICAgICAgICRyZXN1bHQg PSBidWlsZENocm9taXVtTmluamEoImFsbCIsICRjbGVhbiwgQG9wdGlvbnMpOwogICAgIH0gZWxz aWYgKGlzTGludXgoKSB8fCBpc0Nocm9taXVtQW5kcm9pZCgpIHx8IGlzQ2hyb21pdW1NYWNNYWtl KCkpIHsKICAgICAgICAgIyBMaW51eCBidWlsZCAtIGJ1aWxkIHVzaW5nIG1ha2UuCiAgICAgICAg ICRyZXN1bHQgPSBidWlsZENocm9taXVtTWFrZWZpbGUoImFsbCIsICRjbGVhbiwgQG9wdGlvbnMp Owo= 124410 2012-01-27 17:51:50 -0800 2012-01-27 18:10:35 -0800 Patch bug-77243-20120127175148.patch text/plain 6569 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2MTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDg1ZTNmZDFmMjQ1MTcwOGI4YjcxZTQ4YmMzMTIwNjkxMmU5Y2M4YTEuLjA4YmE4MjdjODYxNzk4 YTJkZGY0NzkwNjRmYTNjNzQ0MTQ2OTQ2ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTIgQEAKKzIwMTItMDEtMjcgIE5pY28gV2ViZXIgIDx0aGFraXNAY2hyb21pdW0u b3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gQWRkIHN1cHBvcnQgZm9yIGJ1aWxkaW5nIHN0YW5k YWxvbmUgd2Via2l0L2Nocm9taXVtIGNoZWNrb3V0cyB3aXRoIG5pbmphLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzcyNDMKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGd5cF93ZWJraXQ6CisKIDIwMTIt MDEtMjcgIEplZmYgVGltYW51cyAgPHR3aXpAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJv bWl1bV0gSW5jcmVhc2UgdGhlIHNpemUgb2YgdGhlIEdhbmVzaCB0ZXh0dXJlIGNhY2hlIHRvIHBy ZXZlbnQgcGVyZm9ybWFuY2UgcHJvYmxlbXMgb24gYWR2YW5jZWQgQ2FudmFzMkQgcGFnZXMuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2d5cF93ZWJraXQgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL2d5cF93ZWJraXQKaW5kZXggNTkwNzFhMzg1YmU5NzRmZDk4ZDk0M2NmZjgz ODc3Yzk0YTg1OTJmYi4uMmU3M2Y0ZWE2MDcyODYxYzY1ZTA5MmQyNTBjYjA2MmM0MTVjODA3MCAx MDA3NTUKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9neXBfd2Via2l0CisrKyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vZ3lwX3dlYmtpdApAQCAtMTAyLDExICsxMDIsMTIgQEAgaWYgX19u YW1lX18gPT0gJ19fbWFpbl9fJzoKICAgaWYgc3lzLnBsYXRmb3JtIG5vdCBpbiAoJ2Rhcndpbics KToKICAgICBhcmdzLmFwcGVuZCgnLS1uby1jaXJjdWxhci1jaGVjaycpCiAKLSAgIyBPbiBsaW51 eCwgd2Ugd2FudCBneXAgdG8gb3V0cHV0IGEgbWFrZWZpbGUgKGRlZmF1bHQgaXMgc2NvbnMpLgot ICBpZiAoc3lzLnBsYXRmb3JtLnN0YXJ0c3dpdGgoJ2xpbnV4Jykgb3IKKyAgZ2VuZXJhdG9ycyA9 IG9zLmVudmlyb24uZ2V0KCdHWVBfR0VORVJBVE9SUycsICcnKQorICBpZiAnbmluamEnIGluIGdl bmVyYXRvcnM6CisgICAgYXJncy5leHRlbmQoWyAnLS10b3BsZXZlbC1kaXI9Li4vLi4vLi4nIF0p CisgIGVsaWYgKHN5cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCdsaW51eCcpIG9yCiAgICAgICAnV0VC S0lUX0FORFJPSURfQlVJTEQnIGluIG9zLmVudmlyb24gb3IKLSAgICAgIChzeXMucGxhdGZvcm0g PT0gJ2RhcndpbicgYW5kCi0gICAgICAgICAgb3MuZW52aXJvbi5nZXQoJ0dZUF9HRU5FUkFUT1JT JywgJycpLmZpbmQoJ21ha2UnKSAhPSAtMSkpOgorICAgICAgKHN5cy5wbGF0Zm9ybSA9PSAnZGFy d2luJyBhbmQgJ21ha2UnIGluIGdlbmVyYXRvcnMpKToKICAgICBhcmdzLmV4dGVuZChbJy1mbWFr ZScsCiAgICAgICAgICAgICAgICAgICctLXN1ZmZpeD0uY2hyb21pdW0nLAogICAgICAgICAgICAg ICAgICAnLS10b3BsZXZlbC1kaXI9Li4vLi4vLi4nLApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdl TG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGQ1NDdmOGY4N2ZjODEzOGE2YmYzMDQyODM0MDk4 ZGVkMjNiOTQxODguLjkzYmYwOTc3YmYwOWFiMzgwNmVhZGQ5ZjU4MjFkZjlkNGM4YTE3NDIgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNyBAQAorMjAxMi0wMS0yNyAgTmljbyBXZWJlciAgPHRoYWtpc0BjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgW2Nocm9taXVtXSBBZGQgc3VwcG9ydCBmb3IgYnVpbGRpbmcgc3RhbmRhbG9uZSB3 ZWJraXQvY2hyb21pdW0gY2hlY2tvdXRzIHdpdGggbmluamEuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzI0MworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy91cGRhdGUtd2Via2l0OgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgKGlzQ2hyb21pdW1OaW5qYSk6 CisgICAgICAgIChkZXRlcm1pbmVJc0Nocm9taXVtTmluamEpOgorICAgICAgICAoYnVpbGRDaHJv bWl1bU5pbmphKToKKyAgICAgICAgKGJ1aWxkQ2hyb21pdW0pOgorCiAyMDEyLTAxLTI3ICBFbnJp Y2EgQ2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CiAKICAgICAgICAgRm9sbG93dXAgdG8gaHR0 cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTA2MTcxLgpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy91cGRhdGUtd2Via2l0IGIvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0CmluZGV4 IDdlYzg4YmIzMzc4YmExZDUyY2Q0N2Q2NjRjNGQ2ODczMzE4NjQ3NGYuLmViOTRmMTY1YjRlMGM3 YjBkNmY3MWIzNzA1YWFiYzAyZmI1OGZmZDUgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvdXBk YXRlLXdlYmtpdAorKysgYi9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQKQEAgLTQ4LDYgKzQ4 LDcgQEAgbXkgJHF1aWV0ID0gJyc7CiBteSAkc2hvd0hlbHA7CiBteSAkdXNlR1lQID0gMDsKIG15 ICR1c2VNYWtlID0gMDsKK215ICR1c2VOaW5qYSA9IDA7CiAKIGRldGVybWluZUlzQ2hyb21pdW0o KTsKIGRldGVybWluZUlzQ2hyb21pdW1BbmRyb2lkKCk7CkBAIC02MSw2ICs2Miw3IEBAIG15ICRn ZXRPcHRpb25zUmVzdWx0ID0gR2V0T3B0aW9ucygKICAgICAncXxxdWlldCcgPT4gXCRxdWlldCwK ICAgICAnZ3lwJyA9PiBcJHVzZUdZUCwKICAgICAnbWFrZScgPT4gXCR1c2VNYWtlLAorICAgICdu aW5qYScgPT4gXCR1c2VOaW5qYSwKICk7IAogCiBpZiAoISRnZXRPcHRpb25zUmVzdWx0IHx8ICRz aG93SGVscCkgewpAQCAtNjgsNiArNzAsNyBAQCBpZiAoISRnZXRPcHRpb25zUmVzdWx0IHx8ICRz aG93SGVscCkgewogVXNhZ2U6IEB7WyBiYXNlbmFtZSgkMCkgXX0gW29wdGlvbnNdCiAgIC0tY2hy b21pdW0gICAgICAgICAgYWxzbyB1cGRhdGUgZGVwZW5kZW5jaWVzIG9mIHRoZSBjaHJvbWl1bSBw b3J0CiAgIC0tbWFrZSAgICAgICAgICAgICAgZ2VuZXJhdGUgdGhlIE1ha2VmaWxlLWJhc2VkIGJ1 aWxkIHN5c3RlbSAoQ2hyb21pdW0gb25seSkKKyAgLS1uaW5qYSAgICAgICAgICAgICBnZW5lcmF0 ZSB0aGUgbmluamEtYmFzZWQgYnVpbGQgc3lzdGVtIChDaHJvbWl1bSBvbmx5KQogICAtLWNocm9t aXVtLWFuZHJvaWQgIGFsc28gdXBkYXRlIGRlcGVuZGVuY2llcyBvZiB0aGUgY2hyb21pdW0gcG9y dCBmb3IgQW5kcm9pZAogICAtaHwtLWhlbHAgICAgICAgICAgIHNob3cgdGhlIGhlbHAgbWVzc2Fn ZQogICAtcXwtLXF1aWV0ICAgICAgICAgIHBhc3MgLXEgdG8gc3ZuIHVwZGF0ZSBmb3IgcXVpZXQg dXBkYXRlcwpAQCAtODAsNiArODMsOSBAQCBfX0VORF9fCiBpZiAoJHVzZU1ha2UpIHsKICAgICAk RU5WeyJHWVBfR0VORVJBVE9SUyJ9ID0gIm1ha2UiOwogfQoraWYgKCR1c2VOaW5qYSkgeworICAg ICRFTlZ7IkdZUF9HRU5FUkFUT1JTIn0gPSAibmluamEiOworfQogCiBteSAkc3RhcnRUaW1lID0g dGltZSgpOwogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29s cy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggNDMxYmFhZmU5NzZmZDllODNlOTAwOWE2NDJm OGMxNmJmMmQxYTgwMS4uNDE2NjViZWQ1NTNkOGZlYzU1Mzg5YmM3ZjAwMThhMzg2NDBhYTllZSAx MDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbQpAQCAtOTUsNiArOTUsNyBAQCBteSAkaXNCbGFja0JlcnJ5OwogbXkg JGlzQ2hyb21pdW07CiBteSAkaXNDaHJvbWl1bUFuZHJvaWQ7CiBteSAkaXNDaHJvbWl1bU1hY01h a2U7CitteSAkaXNDaHJvbWl1bU5pbmphOwogbXkgJGZvcmNlQ2hyb21pdW1VcGRhdGU7CiBteSAk aXNJbnNwZWN0b3JGcm9udGVuZDsKIG15ICRpc1dLMjsKQEAgLTExMzksNiArMTE0MCwzNyBAQCBz dWIgZGV0ZXJtaW5lSXNDaHJvbWl1bU1hY01ha2UoKQogICAgICRpc0Nocm9taXVtTWFjTWFrZSA9 IGlzRGFyd2luKCkgJiYgJGhhc1VwVG9EYXRlTWFrZWZpbGU7CiB9CiAKK3N1YiBpc0Nocm9taXVt TmluamEoKQoreworICAgIGRldGVybWluZUlzQ2hyb21pdW1OaW5qYSgpOworICAgIHJldHVybiAk aXNDaHJvbWl1bU5pbmphOworfQorCitzdWIgZGV0ZXJtaW5lSXNDaHJvbWl1bU5pbmphKCkKK3sK KyAgICByZXR1cm4gaWYgZGVmaW5lZCgkaXNDaHJvbWl1bU5pbmphKTsKKworICAgIG15ICRjb25m aWcgPSBjb25maWd1cmF0aW9uKCk7CisKKyAgICBteSAkaGFzVXBUb0RhdGVOaW5qYWJ1aWxkID0g MDsKKyAgICBpZiAoLWUgIm91dC8kY29uZmlnL2J1aWxkLm5pbmphIikgeworICAgICAgICBteSAk c3RhdE5pbmphID0gc3RhdCgib3V0LyRjb25maWcvYnVpbGQubmluamEiKTsKKworICAgICAgICBt eSAkc3RhdFhjb2RlID0gMDsKKyAgICAgICAgaWYgKC1lICdTb3VyY2UvV2ViS2l0L2Nocm9taXVt L1dlYktpdC54Y29kZXByb2onKSB7CisgICAgICAgICAgJHN0YXRYY29kZSA9IHN0YXQoJ1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lnhjb2RlcHJvaicpLT5tdGltZTsKKyAgICAgICAgfQor CisgICAgICAgIG15ICRzdGF0TWFrZSA9IDA7CisgICAgICAgIGlmICgtZSAnTWFrZWZpbGUuY2hy b21pdW0nKSB7CisgICAgICAgICAgJHN0YXRYY29kZSA9IHN0YXQoJ01ha2VmaWxlLmNocm9taXVt JyktPm10aW1lOworICAgICAgICB9CisKKyAgICAgICAgJGhhc1VwVG9EYXRlTmluamFidWlsZCA9 ICRzdGF0TmluamEgPiAkc3RhdFhjb2RlICYmICRzdGF0TmluamEgPiAkc3RhdE1ha2U7CisgICAg fQorICAgICRpc0Nocm9taXVtTmluamEgPSAkaGFzVXBUb0RhdGVOaW5qYWJ1aWxkOworfQorCiBz dWIgZm9yY2VDaHJvbWl1bVVwZGF0ZSgpCiB7CiAgICAgZGV0ZXJtaW5lSXNDaHJvbWl1bSgpOwpA QCAtMjI2Niw2ICsyMjk4LDE5IEBAIHN1YiBidWlsZENocm9taXVtTWFrZWZpbGUoJCRAKQogICAg IHJldHVybiBzeXN0ZW0gJGNvbW1hbmQ7CiB9CiAKK3N1YiBidWlsZENocm9taXVtTmluamEoJCRA KQoreworICAgICMgcm0gLXJmIG91dCByZXF1aXJlcyByZXJ1bm5pbmcgZ3lwLCBzbyBkb24ndCBz dXBwb3J0IC0tY2xlYW4gZm9yIG5vdy4KKyAgICBteSAoJHRhcmdldCwgQG9wdGlvbnMpID0gQF87 CisgICAgbXkgJGNvbmZpZyA9IGNvbmZpZ3VyYXRpb24oKTsKKyAgICBteSAkY29tbWFuZCA9ICIi OworCisgICAgJGNvbW1hbmQgLj0gIm5pbmphIC1Db3V0LyRjb25maWcgJHRhcmdldCI7CisKKyAg ICBwcmludCAiJGNvbW1hbmRcbiI7CisgICAgcmV0dXJuIHN5c3RlbSAkY29tbWFuZDsKK30KKwog c3ViIGJ1aWxkQ2hyb21pdW1WaXN1YWxTdHVkaW9Qcm9qZWN0KCQkKQogewogICAgIG15ICgkcHJv amVjdFBhdGgsICRjbGVhbikgPSBAXzsKQEAgLTIzMTYsMTIgKzIzNjEsMTQgQEAgc3ViIGJ1aWxk Q2hyb21pdW0oJEApCiAgICAgfQogCiAgICAgbXkgJHJlc3VsdCA9IDE7Ci0gICAgaWYgKGlzRGFy d2luKCkgJiYgIWlzQ2hyb21pdW1BbmRyb2lkKCkgJiYgIWlzQ2hyb21pdW1NYWNNYWtlKCkpIHsK KyAgICBpZiAoaXNEYXJ3aW4oKSAmJiAhaXNDaHJvbWl1bUFuZHJvaWQoKSAmJiAhaXNDaHJvbWl1 bU1hY01ha2UoKSAmJiAhaXNDaHJvbWl1bU5pbmphKCkpIHsKICAgICAgICAgIyBNYWMgYnVpbGQg LSBidWlsZHMgdGhlIHJvb3QgeGNvZGUgcHJvamVjdC4KICAgICAgICAgJHJlc3VsdCA9IGJ1aWxk WENvZGVQcm9qZWN0KCJTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0FsbCIsICRjbGVhbiwgIi1jb25m aWd1cmF0aW9uIiwgY29uZmlndXJhdGlvbigpLCBAb3B0aW9ucyk7CiAgICAgfSBlbHNpZiAoaXND eWd3aW4oKSB8fCBpc1dpbmRvd3MoKSkgewogICAgICAgICAjIFdpbmRvd3MgYnVpbGQgLSBidWls ZHMgdGhlIHJvb3QgdmlzdWFsIHN0dWRpbyBzb2x1dGlvbi4KICAgICAgICAgJHJlc3VsdCA9IGJ1 aWxkQ2hyb21pdW1WaXN1YWxTdHVkaW9Qcm9qZWN0KCJTb3VyY2UvV2ViS2l0L2Nocm9taXVtL0Fs bC5zbG4iLCAkY2xlYW4pOworICAgIH0gZWxzaWYgKGlzQ2hyb21pdW1OaW5qYSgpKSB7CisgICAg ICAgICRyZXN1bHQgPSBidWlsZENocm9taXVtTmluamEoImFsbCIsICRjbGVhbiwgQG9wdGlvbnMp OwogICAgIH0gZWxzaWYgKGlzTGludXgoKSB8fCBpc0Nocm9taXVtQW5kcm9pZCgpIHx8IGlzQ2hy b21pdW1NYWNNYWtlKCkpIHsKICAgICAgICAgIyBMaW51eCBidWlsZCAtIGJ1aWxkIHVzaW5nIG1h a2UuCiAgICAgICAgICRyZXN1bHQgPSBidWlsZENocm9taXVtTWFrZWZpbGUoImFsbCIsICRjbGVh biwgQG9wdGlvbnMpOwo= 124413 2012-01-27 18:10:38 -0800 2012-01-28 15:43:47 -0800 Patch bug-77243-20120127181037.patch text/plain 6570 thakis U3VidmVyc2lvbiBSZXZpc2lvbjogMTA2MTcyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDg1ZTNmZDFmMjQ1MTcwOGI4YjcxZTQ4YmMzMTIwNjkxMmU5Y2M4YTEuLjA4YmE4MjdjODYxNzk4 YTJkZGY0NzkwNjRmYTNjNzQ0MTQ2OTQ2ZWIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTIgQEAKKzIwMTItMDEtMjcgIE5pY28gV2ViZXIgIDx0aGFraXNAY2hyb21pdW0u b3JnPgorCisgICAgICAgIFtjaHJvbWl1bV0gQWRkIHN1cHBvcnQgZm9yIGJ1aWxkaW5nIHN0YW5k YWxvbmUgd2Via2l0L2Nocm9taXVtIGNoZWNrb3V0cyB3aXRoIG5pbmphLgorICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzcyNDMKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGd5cF93ZWJraXQ6CisKIDIwMTIt MDEtMjcgIEplZmYgVGltYW51cyAgPHR3aXpAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIFtjaHJv bWl1bV0gSW5jcmVhc2UgdGhlIHNpemUgb2YgdGhlIEdhbmVzaCB0ZXh0dXJlIGNhY2hlIHRvIHBy ZXZlbnQgcGVyZm9ybWFuY2UgcHJvYmxlbXMgb24gYWR2YW5jZWQgQ2FudmFzMkQgcGFnZXMuCmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2d5cF93ZWJraXQgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL2d5cF93ZWJraXQKaW5kZXggNTkwNzFhMzg1YmU5NzRmZDk4ZDk0M2NmZjgz ODc3Yzk0YTg1OTJmYi4uMmU3M2Y0ZWE2MDcyODYxYzY1ZTA5MmQyNTBjYjA2MmM0MTVjODA3MCAx MDA3NTUKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9neXBfd2Via2l0CisrKyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vZ3lwX3dlYmtpdApAQCAtMTAyLDExICsxMDIsMTIgQEAgaWYgX19u YW1lX18gPT0gJ19fbWFpbl9fJzoKICAgaWYgc3lzLnBsYXRmb3JtIG5vdCBpbiAoJ2Rhcndpbics KToKICAgICBhcmdzLmFwcGVuZCgnLS1uby1jaXJjdWxhci1jaGVjaycpCiAKLSAgIyBPbiBsaW51 eCwgd2Ugd2FudCBneXAgdG8gb3V0cHV0IGEgbWFrZWZpbGUgKGRlZmF1bHQgaXMgc2NvbnMpLgot ICBpZiAoc3lzLnBsYXRmb3JtLnN0YXJ0c3dpdGgoJ2xpbnV4Jykgb3IKKyAgZ2VuZXJhdG9ycyA9 IG9zLmVudmlyb24uZ2V0KCdHWVBfR0VORVJBVE9SUycsICcnKQorICBpZiAnbmluamEnIGluIGdl bmVyYXRvcnM6CisgICAgYXJncy5leHRlbmQoWyAnLS10b3BsZXZlbC1kaXI9Li4vLi4vLi4nIF0p CisgIGVsaWYgKHN5cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCdsaW51eCcpIG9yCiAgICAgICAnV0VC S0lUX0FORFJPSURfQlVJTEQnIGluIG9zLmVudmlyb24gb3IKLSAgICAgIChzeXMucGxhdGZvcm0g PT0gJ2RhcndpbicgYW5kCi0gICAgICAgICAgb3MuZW52aXJvbi5nZXQoJ0dZUF9HRU5FUkFUT1JT JywgJycpLmZpbmQoJ21ha2UnKSAhPSAtMSkpOgorICAgICAgKHN5cy5wbGF0Zm9ybSA9PSAnZGFy d2luJyBhbmQgJ21ha2UnIGluIGdlbmVyYXRvcnMpKToKICAgICBhcmdzLmV4dGVuZChbJy1mbWFr ZScsCiAgICAgICAgICAgICAgICAgICctLXN1ZmZpeD0uY2hyb21pdW0nLAogICAgICAgICAgICAg ICAgICAnLS10b3BsZXZlbC1kaXI9Li4vLi4vLi4nLApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdl TG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IGQ1NDdmOGY4N2ZjODEzOGE2YmYzMDQyODM0MDk4 ZGVkMjNiOTQxODguLjkzYmYwOTc3YmYwOWFiMzgwNmVhZGQ5ZjU4MjFkZjlkNGM4YTE3NDIgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxNyBAQAorMjAxMi0wMS0yNyAgTmljbyBXZWJlciAgPHRoYWtpc0BjaHJvbWl1bS5vcmc+CisK KyAgICAgICAgW2Nocm9taXVtXSBBZGQgc3VwcG9ydCBmb3IgYnVpbGRpbmcgc3RhbmRhbG9uZSB3 ZWJraXQvY2hyb21pdW0gY2hlY2tvdXRzIHdpdGggbmluamEuCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03NzI0MworCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy91cGRhdGUtd2Via2l0OgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgKGlzQ2hyb21pdW1OaW5qYSk6 CisgICAgICAgIChkZXRlcm1pbmVJc0Nocm9taXVtTmluamEpOgorICAgICAgICAoYnVpbGRDaHJv bWl1bU5pbmphKToKKyAgICAgICAgKGJ1aWxkQ2hyb21pdW0pOgorCiAyMDEyLTAxLTI3ICBFbnJp Y2EgQ2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CiAKICAgICAgICAgRm9sbG93dXAgdG8gaHR0 cDovL3RyYWMud2Via2l0Lm9yZy9jaGFuZ2VzZXQvMTA2MTcxLgpkaWZmIC0tZ2l0IGEvVG9vbHMv U2NyaXB0cy91cGRhdGUtd2Via2l0IGIvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0CmluZGV4 IDdlYzg4YmIzMzc4YmExZDUyY2Q0N2Q2NjRjNGQ2ODczMzE4NjQ3NGYuLmViOTRmMTY1YjRlMGM3 YjBkNmY3MWIzNzA1YWFiYzAyZmI1OGZmZDUgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvdXBk YXRlLXdlYmtpdAorKysgYi9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQKQEAgLTQ4LDYgKzQ4 LDcgQEAgbXkgJHF1aWV0ID0gJyc7CiBteSAkc2hvd0hlbHA7CiBteSAkdXNlR1lQID0gMDsKIG15 ICR1c2VNYWtlID0gMDsKK215ICR1c2VOaW5qYSA9IDA7CiAKIGRldGVybWluZUlzQ2hyb21pdW0o KTsKIGRldGVybWluZUlzQ2hyb21pdW1BbmRyb2lkKCk7CkBAIC02MSw2ICs2Miw3IEBAIG15ICRn ZXRPcHRpb25zUmVzdWx0ID0gR2V0T3B0aW9ucygKICAgICAncXxxdWlldCcgPT4gXCRxdWlldCwK ICAgICAnZ3lwJyA9PiBcJHVzZUdZUCwKICAgICAnbWFrZScgPT4gXCR1c2VNYWtlLAorICAgICdu aW5qYScgPT4gXCR1c2VOaW5qYSwKICk7IAogCiBpZiAoISRnZXRPcHRpb25zUmVzdWx0IHx8ICRz aG93SGVscCkgewpAQCAtNjgsNiArNzAsNyBAQCBpZiAoISRnZXRPcHRpb25zUmVzdWx0IHx8ICRz aG93SGVscCkgewogVXNhZ2U6IEB7WyBiYXNlbmFtZSgkMCkgXX0gW29wdGlvbnNdCiAgIC0tY2hy b21pdW0gICAgICAgICAgYWxzbyB1cGRhdGUgZGVwZW5kZW5jaWVzIG9mIHRoZSBjaHJvbWl1bSBw b3J0CiAgIC0tbWFrZSAgICAgICAgICAgICAgZ2VuZXJhdGUgdGhlIE1ha2VmaWxlLWJhc2VkIGJ1 aWxkIHN5c3RlbSAoQ2hyb21pdW0gb25seSkKKyAgLS1uaW5qYSAgICAgICAgICAgICBnZW5lcmF0 ZSB0aGUgbmluamEtYmFzZWQgYnVpbGQgc3lzdGVtIChDaHJvbWl1bSBvbmx5KQogICAtLWNocm9t aXVtLWFuZHJvaWQgIGFsc28gdXBkYXRlIGRlcGVuZGVuY2llcyBvZiB0aGUgY2hyb21pdW0gcG9y dCBmb3IgQW5kcm9pZAogICAtaHwtLWhlbHAgICAgICAgICAgIHNob3cgdGhlIGhlbHAgbWVzc2Fn ZQogICAtcXwtLXF1aWV0ICAgICAgICAgIHBhc3MgLXEgdG8gc3ZuIHVwZGF0ZSBmb3IgcXVpZXQg dXBkYXRlcwpAQCAtODAsNiArODMsOSBAQCBfX0VORF9fCiBpZiAoJHVzZU1ha2UpIHsKICAgICAk RU5WeyJHWVBfR0VORVJBVE9SUyJ9ID0gIm1ha2UiOwogfQoraWYgKCR1c2VOaW5qYSkgeworICAg ICRFTlZ7IkdZUF9HRU5FUkFUT1JTIn0gPSAibmluamEiOworfQogCiBteSAkc3RhcnRUaW1lID0g dGltZSgpOwogCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29s cy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggNDMxYmFhZmU5NzZmZDllODNlOTAwOWE2NDJm OGMxNmJmMmQxYTgwMS4uZThmZTNkMmI1OWE3MGE4YmM2MjRhMTdkMjc4NmI3MGE3YjUzZDUyMiAx MDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbQpAQCAtOTUsNiArOTUsNyBAQCBteSAkaXNCbGFja0JlcnJ5OwogbXkg JGlzQ2hyb21pdW07CiBteSAkaXNDaHJvbWl1bUFuZHJvaWQ7CiBteSAkaXNDaHJvbWl1bU1hY01h a2U7CitteSAkaXNDaHJvbWl1bU5pbmphOwogbXkgJGZvcmNlQ2hyb21pdW1VcGRhdGU7CiBteSAk aXNJbnNwZWN0b3JGcm9udGVuZDsKIG15ICRpc1dLMjsKQEAgLTExMzksNiArMTE0MCwzNyBAQCBz dWIgZGV0ZXJtaW5lSXNDaHJvbWl1bU1hY01ha2UoKQogICAgICRpc0Nocm9taXVtTWFjTWFrZSA9 IGlzRGFyd2luKCkgJiYgJGhhc1VwVG9EYXRlTWFrZWZpbGU7CiB9CiAKK3N1YiBpc0Nocm9taXVt TmluamEoKQoreworICAgIGRldGVybWluZUlzQ2hyb21pdW1OaW5qYSgpOworICAgIHJldHVybiAk aXNDaHJvbWl1bU5pbmphOworfQorCitzdWIgZGV0ZXJtaW5lSXNDaHJvbWl1bU5pbmphKCkKK3sK KyAgICByZXR1cm4gaWYgZGVmaW5lZCgkaXNDaHJvbWl1bU5pbmphKTsKKworICAgIG15ICRjb25m aWcgPSBjb25maWd1cmF0aW9uKCk7CisKKyAgICBteSAkaGFzVXBUb0RhdGVOaW5qYWJ1aWxkID0g MDsKKyAgICBpZiAoLWUgIm91dC8kY29uZmlnL2J1aWxkLm5pbmphIikgeworICAgICAgICBteSAk c3RhdE5pbmphID0gc3RhdCgib3V0LyRjb25maWcvYnVpbGQubmluamEiKTsKKworICAgICAgICBt eSAkc3RhdFhjb2RlID0gMDsKKyAgICAgICAgaWYgKC1lICdTb3VyY2UvV2ViS2l0L2Nocm9taXVt L1dlYktpdC54Y29kZXByb2onKSB7CisgICAgICAgICAgJHN0YXRYY29kZSA9IHN0YXQoJ1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lnhjb2RlcHJvaicpLT5tdGltZTsKKyAgICAgICAgfQor CisgICAgICAgIG15ICRzdGF0TWFrZSA9IDA7CisgICAgICAgIGlmICgtZSAnTWFrZWZpbGUuY2hy b21pdW0nKSB7CisgICAgICAgICAgJHN0YXRYY29kZSA9IHN0YXQoJ01ha2VmaWxlLmNocm9taXVt JyktPm10aW1lOworICAgICAgICB9CisKKyAgICAgICAgJGhhc1VwVG9EYXRlTmluamFidWlsZCA9 ICRzdGF0TmluamEgPiAkc3RhdFhjb2RlICYmICRzdGF0TmluamEgPiAkc3RhdE1ha2U7CisgICAg fQorICAgICRpc0Nocm9taXVtTmluamEgPSAkaGFzVXBUb0RhdGVOaW5qYWJ1aWxkOworfQorCiBz dWIgZm9yY2VDaHJvbWl1bVVwZGF0ZSgpCiB7CiAgICAgZGV0ZXJtaW5lSXNDaHJvbWl1bSgpOwpA QCAtMjI2Niw2ICsyMjk4LDE5IEBAIHN1YiBidWlsZENocm9taXVtTWFrZWZpbGUoJCRAKQogICAg IHJldHVybiBzeXN0ZW0gJGNvbW1hbmQ7CiB9CiAKK3N1YiBidWlsZENocm9taXVtTmluamEoJCRA KQoreworICAgICMgcm0gLXJmIG91dCByZXF1aXJlcyByZXJ1bm5pbmcgZ3lwLCBzbyBkb24ndCBz dXBwb3J0IC0tY2xlYW4gZm9yIG5vdy4KKyAgICBteSAoJHRhcmdldCwgQG9wdGlvbnMpID0gQF87 CisgICAgbXkgJGNvbmZpZyA9IGNvbmZpZ3VyYXRpb24oKTsKKyAgICBteSAkY29tbWFuZCA9ICIi OworCisgICAgJGNvbW1hbmQgLj0gIm5pbmphIC1DIG91dC8kY29uZmlnICR0YXJnZXQiOworCisg ICAgcHJpbnQgIiRjb21tYW5kXG4iOworICAgIHJldHVybiBzeXN0ZW0gJGNvbW1hbmQ7Cit9CisK IHN1YiBidWlsZENocm9taXVtVmlzdWFsU3R1ZGlvUHJvamVjdCgkJCkKIHsKICAgICBteSAoJHBy b2plY3RQYXRoLCAkY2xlYW4pID0gQF87CkBAIC0yMzE2LDEyICsyMzYxLDE0IEBAIHN1YiBidWls ZENocm9taXVtKCRAKQogICAgIH0KIAogICAgIG15ICRyZXN1bHQgPSAxOwotICAgIGlmIChpc0Rh cndpbigpICYmICFpc0Nocm9taXVtQW5kcm9pZCgpICYmICFpc0Nocm9taXVtTWFjTWFrZSgpKSB7 CisgICAgaWYgKGlzRGFyd2luKCkgJiYgIWlzQ2hyb21pdW1BbmRyb2lkKCkgJiYgIWlzQ2hyb21p dW1NYWNNYWtlKCkgJiYgIWlzQ2hyb21pdW1OaW5qYSgpKSB7CiAgICAgICAgICMgTWFjIGJ1aWxk IC0gYnVpbGRzIHRoZSByb290IHhjb2RlIHByb2plY3QuCiAgICAgICAgICRyZXN1bHQgPSBidWls ZFhDb2RlUHJvamVjdCgiU291cmNlL1dlYktpdC9jaHJvbWl1bS9BbGwiLCAkY2xlYW4sICItY29u ZmlndXJhdGlvbiIsIGNvbmZpZ3VyYXRpb24oKSwgQG9wdGlvbnMpOwogICAgIH0gZWxzaWYgKGlz Q3lnd2luKCkgfHwgaXNXaW5kb3dzKCkpIHsKICAgICAgICAgIyBXaW5kb3dzIGJ1aWxkIC0gYnVp bGRzIHRoZSByb290IHZpc3VhbCBzdHVkaW8gc29sdXRpb24uCiAgICAgICAgICRyZXN1bHQgPSBi dWlsZENocm9taXVtVmlzdWFsU3R1ZGlvUHJvamVjdCgiU291cmNlL1dlYktpdC9jaHJvbWl1bS9B bGwuc2xuIiwgJGNsZWFuKTsKKyAgICB9IGVsc2lmIChpc0Nocm9taXVtTmluamEoKSkgeworICAg ICAgICAkcmVzdWx0ID0gYnVpbGRDaHJvbWl1bU5pbmphKCJhbGwiLCAkY2xlYW4sIEBvcHRpb25z KTsKICAgICB9IGVsc2lmIChpc0xpbnV4KCkgfHwgaXNDaHJvbWl1bUFuZHJvaWQoKSB8fCBpc0No cm9taXVtTWFjTWFrZSgpKSB7CiAgICAgICAgICMgTGludXggYnVpbGQgLSBidWlsZCB1c2luZyBt YWtlLgogICAgICAgICAkcmVzdWx0ID0gYnVpbGRDaHJvbWl1bU1ha2VmaWxlKCJhbGwiLCAkY2xl YW4sIEBvcHRpb25zKTsK