80861 2012-03-12 11:33:00 -0700 [Chromium] Remove Android build-fix when the proper fix rolled into WebKit 2012-03-21 03:06:18 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 80862 81005 1 peter peter abarth bulach tony oldest_to_newest 576320 0 peter 2012-03-12 11:33:00 -0700 The temporary build-fix in webkitdirs.pm should be removed as soon as Chromium has rolled. 577366 1 131626 peter 2012-03-13 08:51:52 -0700 Created attachment 131626 Patch 577396 2 131626 bulach 2012-03-13 09:02:44 -0700 Comment on attachment 131626 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=131626&action=review > Source/WebKit/chromium/gyp_webkit:89 > + output, retval = p.communicate() nit: use _ if not using retval, lile: output, _ = p.communicate() alternatively maybe: assert retval == 0 > Source/WebKit/chromium/gyp_webkit:90 > + return output.split(os.linesep)[0] nit: output.splitlines()[0] > Source/WebKit/chromium/gyp_webkit:98 > + # GYP flags. Chromium's envsetup.sh script will handle part an important part, nit: the sentence doesn't make much sense, maybe: # Chromium's envsetup.sh script will setup various other environment variables, # but some need to be defined separately here as they're used by common.gypi # to generate the Makefiles with the cross compiler. 577410 3 131632 peter 2012-03-13 09:11:16 -0700 Created attachment 131632 Patch 577414 4 peter 2012-03-13 09:15:29 -0700 View in context: https://bugs.webkit.org/attachment.cgi?id=131626&action=review Cheers, Marcus! This patch is dependent on the following Chromium CL to become available in WebKit: http://codereview.chromium.org/9693042/ Depending on the review of that CL, minor modifications may be necessary (I'd re-request review). Together with the Chromium patch this will significantly simplify Android's custom build steps within WebKit as all processing/setup will now be done when generating the project files from gyp. >> Source/WebKit/chromium/gyp_webkit:89 >> + output, retval = p.communicate() > > nit: use _ if not using retval, lile: > output, _ = p.communicate() > alternatively maybe: > assert retval == 0 Done. >> Source/WebKit/chromium/gyp_webkit:90 >> + return output.split(os.linesep)[0] > > nit: output.splitlines()[0] Done. >> Source/WebKit/chromium/gyp_webkit:98 >> + # GYP flags. Chromium's envsetup.sh script will handle part an important part, > > nit: the sentence doesn't make much sense, maybe: > # Chromium's envsetup.sh script will setup various other environment variables, > # but some need to be defined separately here as they're used by common.gypi > # to generate the Makefiles with the cross compiler. I've rewritten the comment. 577705 5 abarth 2012-03-13 12:58:20 -0700 gyp_webkit is a mystery to me. Maybe Tony would be a good reviewer? 577765 6 131632 tony 2012-03-13 13:42:40 -0700 Comment on attachment 131632 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=131632&action=review > Source/WebKit/chromium/gyp_webkit:103 > exit(subprocess.call(['bash', '-c', 'source %s && python gyp_webkit --no-envsetup-recursion %s' % (envsetup_location, ' '.join(args))])) This is gross. I bet there's a design that doesn't involve reinvoking gyp_webkit, but that's beyond the scope of this patch. > Source/WebKit/chromium/gyp_webkit:107 > + os.environ['CROSS_CC'] = find_in_android_toolchain('gcc') > + os.environ['CROSS_CXX'] = find_in_android_toolchain('g++') > + os.environ['CROSS_LINK'] = find_in_android_toolchain('gcc') Nit: Can we just reuse the results of CROSS_CC to set CROSS_LINK? Same with HOST_CC and HOST_LINK below. > Source/WebKit/chromium/gyp_webkit:111 > + os.environ['HOST_CC'] = first_line_of_stdout(['which', 'gcc']) > + os.environ['HOST_CXX'] = first_line_of_stdout(['which', 'g++']) > + os.environ['HOST_LINK'] = first_line_of_stdout(['which', 'g++']) > + os.environ['LIBGCC_FILE_NAME'] = first_line_of_stdout([os.environ.get('CROSS_CC'), '-print-libgcc-file-name']) Nit: Can you use a tuple instead of a list? Alternately, you could just pass them in as 2 separate args and use *command in the function definition. 582936 7 132799 peter 2012-03-20 04:34:13 -0700 Created attachment 132799 Patch 582938 8 peter 2012-03-20 04:41:01 -0700 Following the version of Marcus' patch that just landed in Chromium, all that's required now is removing a ton of code :-). http://codereview.chromium.org/9693042/ Requesting a re-review / rubberstamp as the patch itself has significantly changed, although it should be fine. This can land after a Chromium LKGR >=r127667 lands in WebKit, I will attempt to do so later today (GMT-time). Too reply to the re-invocation of gyp_webkit: envsetup.sh exports environment variables which are required later in the same program's execution, namely by gyp. I couldn't find a way to get them in the same process without re-invoking itself. Maybe using subprocess.call() with Shell=True could work, I'll experiment with that later. 582942 9 peter 2012-03-20 04:43:04 -0700 "A ton" relative to the total amount of Android-specific code in those files, obviously, only to be emphasized by the hack on webkitdirs.pm. 583946 10 peter 2012-03-21 03:06:18 -0700 Committed r111517: <http://trac.webkit.org/changeset/111517> 131626 2012-03-13 08:51:52 -0700 2012-03-13 09:11:10 -0700 Patch bug-80861-20120313155147.patch text/plain 5849 peter U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwNTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGNlZWI3ZGIwYjRhZDhkMWI2ZjhkNzRiMjRjNjJiZjA0OTkxNDA1MTMuLmIyMWU2MzZkYzkzNmRm ZjNmYjA5YWFiYmU2ZDNmOTgwMDQ4YTg1MGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTkgQEAKKzIwMTItMDMtMTMgIFBldGVyIEJldmVybG9vICA8cGV0ZXJAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gUmVtb3ZlIEFuZHJvaWQgYnVpbGQtZml4IHdo ZW4gdGhlIHByb3BlciBmaXggcm9sbGVkIGludG8gV2ViS2l0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDg2MQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNldCB0aGUgcmVxdWlyZWQgZW52aXJvbm1lbnQg dmFyaWFibGVzIGp1c3QgYmVmb3JlIGdlbmVyYXRpbmcgdGhlIGd5cAorICAgICAgICBwcm9qZWN0 IGZpbGVzIGZvciBBbmRyb2lkLCBhbGxvd2luZyB0aGUgcmlnaHQgY3Jvc3MtY29tcGlsYXRpb24g c2V0dGluZ3MKKyAgICAgICAgdG8gYmUgc2V0IGR1cmluZyB0aGlzIHBoYXNlLiBBbHNvIHVwZGF0 ZSB0aGUgY29tbWVudCB0byBtaW1pYyB0aGlzLgorCisgICAgICAgICogZ3lwX3dlYmtpdDoKKyAg ICAgICAgKGFkZGl0aW9uYWxfaW5jbHVkZV9maWxlcyk6CisgICAgICAgIChmaW5kX2luX2FuZHJv aWRfdG9vbGNoYWluKToKKyAgICAgICAgKGZpcnN0X2xpbmVfb2Zfc3Rkb3V0KToKKwogMjAxMi0w My0xMyAgS2ludWtvIFlhc3VkYSAgPGtpbnVrb0BjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQWxs b3cgV2ViRmlsZUNob29zZXIgdG8gcmV0dXJuIGV4dHJhIGZpbGUgaW5mbyAobGlrZSBkaXNwbGF5 TmFtZSkgaW4gYWRkaXRpb24gdG8gbWVyZSBmaWxlIHBhdGhzCmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL2d5cF93ZWJraXQgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2d5cF93 ZWJraXQKaW5kZXggMmU3M2Y0ZWE2MDcyODYxYzY1ZTA5MmQyNTBjYjA2MmM0MTVjODA3MC4uZTIw NTg0ZjZhYzBhMjE4M2EwNDA1MmEzOThjZGQ3OWQzMDY2ZGQ4NCAxMDA3NTUKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9neXBfd2Via2l0CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Z3lwX3dlYmtpdApAQCAtNzQsMjAgKzc0LDQxIEBAIGRlZiBhZGRpdGlvbmFsX2luY2x1ZGVfZmls ZXMoYXJncz1bXSk6CiAKICAgcmV0dXJuIHJlc3VsdAogCitkZWYgZmluZF9pbl9hbmRyb2lkX3Rv b2xjaGFpbihuYW1lKToKKyAgIiIiCisgIFJldHVybnMgdGhlIGZpcnN0IG1hdGNoIGZyb20gYSBn bG9iIHNlYXJjaCBpbiB0aGUgQW5kcm9pZCBOREsncyB0b29sY2hhaW4KKyAgYmluYXJ5IGRpcmVj dG9yeSBmb3IgYSBwYXJ0aWN1bGFyIGZpbGVuYW1lLgorICAiIiIKKyAgcmV0dXJuIGdsb2IuZ2xv YignJXMvKi0lcycgJSAob3MuZW52aXJvbi5nZXQoJ0FORFJPSURfVE9PTENIQUlOJyksIG5hbWUp KVswXTsKKworZGVmIGZpcnN0X2xpbmVfb2Zfc3Rkb3V0KGNvbW1hbmQpOgorICAiIiIKKyAgUmV0 dXJucyB0aGUgZmlyc3QgbGluZSBvZiBTVERPVVQgYWZ0ZXIgZXhlY3V0aW5nIHNhaWQgY29tbWFu ZC4KKyAgIiIiCisgIHAgPSBzdWJwcm9jZXNzLlBvcGVuKGNvbW1hbmQsIHN0ZG91dD1zdWJwcm9j ZXNzLlBJUEUpCisgIG91dHB1dCwgcmV0dmFsID0gcC5jb21tdW5pY2F0ZSgpCisgIHJldHVybiBv dXRwdXQuc3BsaXQob3MubGluZXNlcClbMF0KKwogaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoK IAogICBhcmdzID0gc3lzLmFyZ3ZbMTpdCiAKICAgIyBXaGVuIGJ1aWxkaW5nIHRoZSBXZWJLaXQg Q2hyb21pdW0gcG9ydCBmb3IgQW5kcm9pZCwgd2UgaGF2ZSB0byBjcm9zcy1jb21waWxlCiAgICMg dGhlIHNvdXJjZSB0byBBUk0sIGNoZWNrIGZvciB0aGUgcmlnaHQgQW5kcm9pZCBOREsgYW5kIHNl dCB0aGUgYXBwcm9wcmlhdGUKLSAgIyBHWVAgZmxhZ3MuIENocm9taXVtJ3MgZW52c2V0dXAuc2gg c2NyaXB0IHdpbGwgaGFuZGxlIHRoZXNlIHN0ZXBzLCBidXQgYXMgaXQKLSAgIyBleHBvcnRzIHZh cmlhYmxlcyBhbmQgY29tbWFuZHMgd2UgaGF2ZSB0byByZS1jYWxsIG91cnNlbHZlcyBhZnRlcndh cmRzLgorICAjIEdZUCBmbGFncy4gQ2hyb21pdW0ncyBlbnZzZXR1cC5zaCBzY3JpcHQgd2lsbCBo YW5kbGUgcGFydCBhbiBpbXBvcnRhbnQgcGFydCwKKyAgIyBidXQgc29tZSBuZWVkIHRvIGJlIGRl ZmluZWQgc2VwYXJhdGVseSBmb3IgY29tbW9uLmd5cGkuCiAgIGlmICdXRUJLSVRfQU5EUk9JRF9C VUlMRCcgaW4gb3MuZW52aXJvbjoKICAgICBpZiBub3QgJy0tbm8tZW52c2V0dXAtcmVjdXJzaW9u JyBpbiBhcmdzOgogICAgICAgZW52c2V0dXBfbG9jYXRpb24gPSBvcy5wYXRoLmpvaW4oY2hyb21l X3NyYywgJ2J1aWxkJywgJ2FuZHJvaWQnLCAnZW52c2V0dXAuc2gnKQogICAgICAgZXhpdChzdWJw cm9jZXNzLmNhbGwoWydiYXNoJywgJy1jJywgJ3NvdXJjZSAlcyAmJiBweXRob24gZ3lwX3dlYmtp dCAtLW5vLWVudnNldHVwLXJlY3Vyc2lvbiAlcycgJSAoZW52c2V0dXBfbG9jYXRpb24sICcgJy5q b2luKGFyZ3MpKV0pKQogICAgIGVsc2U6Ci0gICAgICBvcy5lbnZpcm9uWydDQy50YXJnZXQnXSA9 IG9zLmVudmlyb25bJ0NST1NTX0NDJ10KKyAgICAgIG9zLmVudmlyb25bJ0NST1NTX0NDJ10gPSBm aW5kX2luX2FuZHJvaWRfdG9vbGNoYWluKCdnY2MnKQorICAgICAgb3MuZW52aXJvblsnQ1JPU1Nf Q1hYJ10gPSBmaW5kX2luX2FuZHJvaWRfdG9vbGNoYWluKCdnKysnKQorICAgICAgb3MuZW52aXJv blsnQ1JPU1NfTElOSyddID0gZmluZF9pbl9hbmRyb2lkX3Rvb2xjaGFpbignZ2NjJykKKyAgICAg IG9zLmVudmlyb25bJ0hPU1RfQ0MnXSA9IGZpcnN0X2xpbmVfb2Zfc3Rkb3V0KFsnd2hpY2gnLCAn Z2NjJ10pCisgICAgICBvcy5lbnZpcm9uWydIT1NUX0NYWCddID0gZmlyc3RfbGluZV9vZl9zdGRv dXQoWyd3aGljaCcsICdnKysnXSkKKyAgICAgIG9zLmVudmlyb25bJ0hPU1RfTElOSyddID0gZmly c3RfbGluZV9vZl9zdGRvdXQoWyd3aGljaCcsICdnKysnXSkKKyAgICAgIG9zLmVudmlyb25bJ0xJ QkdDQ19GSUxFX05BTUUnXSA9IGZpcnN0X2xpbmVfb2Zfc3Rkb3V0KFtvcy5lbnZpcm9uLmdldCgn Q1JPU1NfQ0MnKSwgJy1wcmludC1saWJnY2MtZmlsZS1uYW1lJ10pCiAgICAgICBhcmdzLnJlbW92 ZSgnLS1uby1lbnZzZXR1cC1yZWN1cnNpb24nKQogCiAgICMgQWRkIGluY2x1ZGVzLgpkaWZmIC0t Z2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDJmZWY2MzAyZTkw NTQ1M2U1ZTQ1NDdiYjExYmFjYzNhMzNlNjYzNzMuLmU0ZDZhMDgwZThmYWZjZDg4ZGQzODk5MzI5 M2FmMzA2YzAyZjA2OWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxNiBAQAorMjAxMi0wMy0xMyAgUGV0ZXIgQmV2ZXJsb28gIDxw ZXRlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBSZW1vdmUgQW5kcm9pZCBi dWlsZC1maXggd2hlbiB0aGUgcHJvcGVyIGZpeCByb2xsZWQgaW50byBXZWJLaXQKKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwODYxCisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgUmVtb3ZlIG1vc3QgQW5kcm9p ZC1zcGVjaWZpYyBsb2dpYyBmcm9tIHdlYmtpdGRpcnMucG0gaW4gZmF2b3Igb2YKKyAgICAgICAg aGFuZGxpbmcgdGhpcyBkdXJpbmcgcHJvamVjdCBnZW5lcmF0aW9uIHRpbWUuCisKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChidWlsZENocm9taXVtTWFrZWZpbGUp OgorCiAyMDEyLTAzLTEyICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgd2Via2l0LXBhdGNoIG9wdGltaXplLWJhc2VsaW5lcyBzb21ldGltZXMgY3JlYXRlcyBhIG1h Yy1mdXR1cmUgcmVzdWx0CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0g Yi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggN2ExNThlM2YyNzJkZDIxM2U3NTll Y2I0OGNmMjk5YzRhMjVlNDY4Yy4uZDgwNTBkZThiYTNjOGYxOTQ0N2JjZDdmNTVkM2NhYzA5OTcw MGM4ZSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMjI5MywyNiArMjI5Myw3IEBAIHN1YiBidWlsZENo cm9taXVtTWFrZWZpbGUoJCRAKQogICAgICAgICAkbWFrZUFyZ3MgPSAkMSBpZiAvXi0tbWFrZWFy Z3M9KC4qKS9pOwogICAgIH0KICAgICAkbWFrZUFyZ3MgPSAiLWokbnVtQ3B1cyIgaWYgbm90ICRt YWtlQXJnczsKLSAgICBteSAkY29tbWFuZCA9ICIiOwotCi0gICAgIyBCdWlsZGluZyB0aGUgV2Vi S2l0IENocm9taXVtIHBvcnQgZm9yIEFuZHJvaWQgcmVxdWlyZXMgdXMgdG8gY3Jvc3MtCi0gICAg IyBjb21waWxlLCB3aGljaCB3aWxsIGJlIHNldCB1cCBieSBDaHJvbWl1bSdzIGVudnNldHVwLnNo LiBUaGUgc2NyaXB0IGl0c2VsZgotICAgICMgd2lsbCB2ZXJpZnkgdGhhdCB0aGUgaW5zdGFsbGVk IE5ESyBpcyBpbmRlZWQgYXZhaWxhYmxlLgotICAgIGlmIChpc0Nocm9taXVtQW5kcm9pZCgpKSB7 Ci0gICAgICAgICRjb21tYW5kIC49ICJiYXNoIC1jIFwic291cmNlICIgLiBzb3VyY2VEaXIoKSAu ICIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9idWlsZC9hbmRyb2lkL2VudnNldHVwLnNoICYmICI7 Ci0gICAgICAgICRFTlZ7QU5EUk9JRF9OREtfUk9PVH0gPSBzb3VyY2VEaXIoKSAuICIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9hbmRyb2lkLW5kay1yNyI7Ci0gICAgICAgICRFTlZ7V0VCS0lUX0FO RFJPSURfQlVJTER9ID0gMTsKLQotICAgICAgICAjIEZJWE1FOiBSZW1vdmUgdGhlIGJ1aWxkLWZp eCBvbmNlIHRoZSBDaHJvbWl1bS1zaWRlIGZpeCByb2xsZWQgaW4uCi0gICAgICAgICMgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwODYxCi0gICAgICAgIG15ICRiaW5h cnlQcmVmaXggPSAkRU5We0FORFJPSURfTkRLX1JPT1R9IC4gIi90b29sY2hhaW5zL2FybS1saW51 eC1hbmRyb2lkZWFiaS00LjQuMy9wcmVidWlsdC9saW51eC14ODYvYmluL2FybS1saW51eC1hbmRy b2lkZWFiaSI7Ci0gICAgICAgICRjb21tYW5kIC49IHFxKENDPSIkYmluYXJ5UHJlZml4LWdjYyIg Q1hYPSIkYmluYXJ5UHJlZml4LWcrKyIgKTsKLSAgICAgICAgJGNvbW1hbmQgLj0gcXEoTElOSz0i JGJpbmFyeVByZWZpeC1nY2MiIEFSPSIkYmluYXJ5UHJlZml4LWFyIiApOwotICAgICAgICAkY29t bWFuZCAuPSBxcShSQU5MSUI9IiRiaW5hcnlQcmVmaXgtcmFubGliIiApOwotICAgIH0KLQotICAg ICRjb21tYW5kIC49ICJtYWtlIC1mTWFrZWZpbGUuY2hyb21pdW0gJG1ha2VBcmdzIEJVSUxEVFlQ RT0kY29uZmlnICR0YXJnZXQiOwotICAgICRjb21tYW5kIC49ICJcIiIgaWYgaXNDaHJvbWl1bUFu ZHJvaWQoKTsKKyAgICBteSAkY29tbWFuZCAuPSAibWFrZSAtZk1ha2VmaWxlLmNocm9taXVtICRt YWtlQXJncyBCVUlMRFRZUEU9JGNvbmZpZyAkdGFyZ2V0IjsKIAogICAgIHByaW50ICIkY29tbWFu ZFxuIjsKICAgICByZXR1cm4gc3lzdGVtICRjb21tYW5kOwo= 131632 2012-03-13 09:11:16 -0700 2012-03-20 04:34:06 -0700 Patch bug-80861-20120313161114.patch text/plain 5979 peter U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwNTYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGNlZWI3ZGIwYjRhZDhkMWI2ZjhkNzRiMjRjNjJiZjA0OTkxNDA1MTMuLmQ4MzllZTdjNmFmY2Ew ZWJhOGI4NDNjNWFiYjlhNGY5YmZiNjVkMmQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTggQEAKKzIwMTItMDMtMTMgIFBldGVyIEJldmVybG9vICA8cGV0ZXJAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gUmVtb3ZlIEFuZHJvaWQgYnVpbGQtZml4IHdo ZW4gdGhlIHByb3BlciBmaXggcm9sbGVkIGludG8gV2ViS2l0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDg2MQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFNldCB0aGUgcmVxdWlyZWQgZW52aXJvbm1lbnQg dmFyaWFibGVzIGp1c3QgYmVmb3JlIGdlbmVyYXRpbmcgdGhlIGd5cAorICAgICAgICBwcm9qZWN0 IGZpbGVzIGZvciBBbmRyb2lkLCBhbGxvd2luZyB0aGUgcmlnaHQgY3Jvc3MtY29tcGlsYXRpb24g c2V0dGluZ3MKKyAgICAgICAgdG8gYmUgc2V0IGR1cmluZyB0aGlzIHBoYXNlLiBBbHNvIHVwZGF0 ZSB0aGUgY29tbWVudCB0byBtaW1pYyB0aGlzLgorCisgICAgICAgICogZ3lwX3dlYmtpdDoKKyAg ICAgICAgKGZpbmRfaW5fYW5kcm9pZF90b29sY2hhaW4pOgorICAgICAgICAoZmlyc3RfbGluZV9v Zl9zdGRvdXQpOgorCiAyMDEyLTAzLTEzICBLaW51a28gWWFzdWRhICA8a2ludWtvQGNocm9taXVt Lm9yZz4KIAogICAgICAgICBBbGxvdyBXZWJGaWxlQ2hvb3NlciB0byByZXR1cm4gZXh0cmEgZmls ZSBpbmZvIChsaWtlIGRpc3BsYXlOYW1lKSBpbiBhZGRpdGlvbiB0byBtZXJlIGZpbGUgcGF0aHMK ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vZ3lwX3dlYmtpdCBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vZ3lwX3dlYmtpdAppbmRleCAyZTczZjRlYTYwNzI4NjFjNjVlMDkyZDI1 MGNiMDYyYzQxNWM4MDcwLi5hMDA4MzA2NDk3MjcyODdhMzZmM2Q5NGI2YWM0NzQxYTAzZWEwODA0 IDEwMDc1NQotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2d5cF93ZWJraXQKKysrIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9neXBfd2Via2l0CkBAIC03NCwyMCArNzQsNDEgQEAgZGVmIGFk ZGl0aW9uYWxfaW5jbHVkZV9maWxlcyhhcmdzPVtdKToKIAogICByZXR1cm4gcmVzdWx0CiAKK2Rl ZiBmaW5kX2luX2FuZHJvaWRfdG9vbGNoYWluKG5hbWUpOgorICAiIiIKKyAgUmV0dXJucyB0aGUg Zmlyc3QgbWF0Y2ggZnJvbSBhIGdsb2Igc2VhcmNoIGluIHRoZSBBbmRyb2lkIE5ESydzIHRvb2xj aGFpbgorICBiaW5hcnkgZGlyZWN0b3J5IGZvciBhIHBhcnRpY3VsYXIgZmlsZW5hbWUuCisgICIi IgorICByZXR1cm4gZ2xvYi5nbG9iKCclcy8qLSVzJyAlIChvcy5lbnZpcm9uLmdldCgnQU5EUk9J RF9UT09MQ0hBSU4nKSwgbmFtZSkpWzBdOworCitkZWYgZmlyc3RfbGluZV9vZl9zdGRvdXQoY29t bWFuZCk6CisgICIiIgorICBSZXR1cm5zIHRoZSBmaXJzdCBsaW5lIG9mIFNURE9VVCBhZnRlciBl eGVjdXRpbmcgc2FpZCBjb21tYW5kLgorICAiIiIKKyAgcCA9IHN1YnByb2Nlc3MuUG9wZW4oY29t bWFuZCwgc3Rkb3V0PXN1YnByb2Nlc3MuUElQRSkKKyAgb3V0cHV0LCBfID0gcC5jb21tdW5pY2F0 ZSgpCisgIHJldHVybiBvdXRwdXQuc3BsaXRsaW5lcygpWzBdCisKIGlmIF9fbmFtZV9fID09ICdf X21haW5fXyc6CiAKICAgYXJncyA9IHN5cy5hcmd2WzE6XQogCi0gICMgV2hlbiBidWlsZGluZyB0 aGUgV2ViS2l0IENocm9taXVtIHBvcnQgZm9yIEFuZHJvaWQsIHdlIGhhdmUgdG8gY3Jvc3MtY29t cGlsZQotICAjIHRoZSBzb3VyY2UgdG8gQVJNLCBjaGVjayBmb3IgdGhlIHJpZ2h0IEFuZHJvaWQg TkRLIGFuZCBzZXQgdGhlIGFwcHJvcHJpYXRlCi0gICMgR1lQIGZsYWdzLiBDaHJvbWl1bSdzIGVu dnNldHVwLnNoIHNjcmlwdCB3aWxsIGhhbmRsZSB0aGVzZSBzdGVwcywgYnV0IGFzIGl0Ci0gICMg ZXhwb3J0cyB2YXJpYWJsZXMgYW5kIGNvbW1hbmRzIHdlIGhhdmUgdG8gcmUtY2FsbCBvdXJzZWx2 ZXMgYWZ0ZXJ3YXJkcy4KKyAgIyBUaGUgQ2hyb21pdW0gcG9ydCBmb3IgQW5kcm9pZCB3aWxsIGxl dmVyYWdlIHRoZSBBbmRyb2lkIE5ESyBmb3IgY3Jvc3MtCisgICMgY29tcGlsaW5nIHRoZSBzb3Vy Y2VzIHRvIEFSTSBjb2RlLiBDaHJvbWl1bSdzIGVudnNldHVwLnNoIHNjcmlwdCB3aWxsIHNldHVw CisgICMgdmFyaW91cyBvdGhlciBlbnZpcm9ubWVudCB2YXJpYWJsZXMgYWlkaW5nIHRoaXMsIGJ1 dCBzb21lIG5lZWQgdG8gYmUgZGVmaW5lZAorICAjIHNlcGFyYXRlbHkgaGVyZSBhcyB0aGV5J3Jl IGJlaW5nIHVzZWQgYnkgY29tbW9uLmd5cGkgdG8gZ2VuZXJhdGUgbWFrZWZpbGVzLgogICBpZiAn V0VCS0lUX0FORFJPSURfQlVJTEQnIGluIG9zLmVudmlyb246CiAgICAgaWYgbm90ICctLW5vLWVu dnNldHVwLXJlY3Vyc2lvbicgaW4gYXJnczoKICAgICAgIGVudnNldHVwX2xvY2F0aW9uID0gb3Mu cGF0aC5qb2luKGNocm9tZV9zcmMsICdidWlsZCcsICdhbmRyb2lkJywgJ2VudnNldHVwLnNoJykK ICAgICAgIGV4aXQoc3VicHJvY2Vzcy5jYWxsKFsnYmFzaCcsICctYycsICdzb3VyY2UgJXMgJiYg cHl0aG9uIGd5cF93ZWJraXQgLS1uby1lbnZzZXR1cC1yZWN1cnNpb24gJXMnICUgKGVudnNldHVw X2xvY2F0aW9uLCAnICcuam9pbihhcmdzKSldKSkKICAgICBlbHNlOgotICAgICAgb3MuZW52aXJv blsnQ0MudGFyZ2V0J10gPSBvcy5lbnZpcm9uWydDUk9TU19DQyddCisgICAgICBvcy5lbnZpcm9u WydDUk9TU19DQyddID0gZmluZF9pbl9hbmRyb2lkX3Rvb2xjaGFpbignZ2NjJykKKyAgICAgIG9z LmVudmlyb25bJ0NST1NTX0NYWCddID0gZmluZF9pbl9hbmRyb2lkX3Rvb2xjaGFpbignZysrJykK KyAgICAgIG9zLmVudmlyb25bJ0NST1NTX0xJTksnXSA9IGZpbmRfaW5fYW5kcm9pZF90b29sY2hh aW4oJ2djYycpCisgICAgICBvcy5lbnZpcm9uWydIT1NUX0NDJ10gPSBmaXJzdF9saW5lX29mX3N0 ZG91dChbJ3doaWNoJywgJ2djYyddKQorICAgICAgb3MuZW52aXJvblsnSE9TVF9DWFgnXSA9IGZp cnN0X2xpbmVfb2Zfc3Rkb3V0KFsnd2hpY2gnLCAnZysrJ10pCisgICAgICBvcy5lbnZpcm9uWydI T1NUX0xJTksnXSA9IGZpcnN0X2xpbmVfb2Zfc3Rkb3V0KFsnd2hpY2gnLCAnZysrJ10pCisgICAg ICBvcy5lbnZpcm9uWydMSUJHQ0NfRklMRV9OQU1FJ10gPSBmaXJzdF9saW5lX29mX3N0ZG91dChb b3MuZW52aXJvbi5nZXQoJ0NST1NTX0NDJyksICctcHJpbnQtbGliZ2NjLWZpbGUtbmFtZSddKQog ICAgICAgYXJncy5yZW1vdmUoJy0tbm8tZW52c2V0dXAtcmVjdXJzaW9uJykKIAogICAjIEFkZCBp bmNsdWRlcy4KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwpp bmRleCAyZmVmNjMwMmU5MDU0NTNlNWU0NTQ3YmIxMWJhY2MzYTMzZTY2MzczLi5lNGQ2YTA4MGU4 ZmFmY2Q4OGRkMzg5OTMyOTNhZjMwNmMwMmYwNjliIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VM b2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTItMDMtMTMgIFBl dGVyIEJldmVybG9vICA8cGV0ZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0g UmVtb3ZlIEFuZHJvaWQgYnVpbGQtZml4IHdoZW4gdGhlIHByb3BlciBmaXggcm9sbGVkIGludG8g V2ViS2l0CisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 MDg2MQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFJl bW92ZSBtb3N0IEFuZHJvaWQtc3BlY2lmaWMgbG9naWMgZnJvbSB3ZWJraXRkaXJzLnBtIGluIGZh dm9yIG9mCisgICAgICAgIGhhbmRsaW5nIHRoaXMgZHVyaW5nIHByb2plY3QgZ2VuZXJhdGlvbiB0 aW1lLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAgICAoYnVpbGRD aHJvbWl1bU1ha2VmaWxlKToKKwogMjAxMi0wMy0xMiAgT2phbiBWYWZhaSAgPG9qYW5AY2hyb21p dW0ub3JnPgogCiAgICAgICAgIHdlYmtpdC1wYXRjaCBvcHRpbWl6ZS1iYXNlbGluZXMgc29tZXRp bWVzIGNyZWF0ZXMgYSBtYWMtZnV0dXJlIHJlc3VsdApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IDdhMTU4 ZTNmMjcyZGQyMTNlNzU5ZWNiNDhjZjI5OWM0YTI1ZTQ2OGMuLmQ4MDUwZGU4YmEzYzhmMTk0NDdi Y2Q3ZjU1ZDNjYWMwOTk3MDBjOGUgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGly cy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTIyOTMsMjYgKzIyOTMs NyBAQCBzdWIgYnVpbGRDaHJvbWl1bU1ha2VmaWxlKCQkQCkKICAgICAgICAgJG1ha2VBcmdzID0g JDEgaWYgL14tLW1ha2VhcmdzPSguKikvaTsKICAgICB9CiAgICAgJG1ha2VBcmdzID0gIi1qJG51 bUNwdXMiIGlmIG5vdCAkbWFrZUFyZ3M7Ci0gICAgbXkgJGNvbW1hbmQgPSAiIjsKLQotICAgICMg QnVpbGRpbmcgdGhlIFdlYktpdCBDaHJvbWl1bSBwb3J0IGZvciBBbmRyb2lkIHJlcXVpcmVzIHVz IHRvIGNyb3NzLQotICAgICMgY29tcGlsZSwgd2hpY2ggd2lsbCBiZSBzZXQgdXAgYnkgQ2hyb21p dW0ncyBlbnZzZXR1cC5zaC4gVGhlIHNjcmlwdCBpdHNlbGYKLSAgICAjIHdpbGwgdmVyaWZ5IHRo YXQgdGhlIGluc3RhbGxlZCBOREsgaXMgaW5kZWVkIGF2YWlsYWJsZS4KLSAgICBpZiAoaXNDaHJv bWl1bUFuZHJvaWQoKSkgewotICAgICAgICAkY29tbWFuZCAuPSAiYmFzaCAtYyBcInNvdXJjZSAi IC4gc291cmNlRGlyKCkgLiAiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vYnVpbGQvYW5kcm9pZC9l bnZzZXR1cC5zaCAmJiAiOwotICAgICAgICAkRU5We0FORFJPSURfTkRLX1JPT1R9ID0gc291cmNl RGlyKCkgLiAiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vYW5kcm9pZC1uZGstcjciOwotICAgICAg ICAkRU5We1dFQktJVF9BTkRST0lEX0JVSUxEfSA9IDE7Ci0KLSAgICAgICAgIyBGSVhNRTogUmVt b3ZlIHRoZSBidWlsZC1maXggb25jZSB0aGUgQ2hyb21pdW0tc2lkZSBmaXggcm9sbGVkIGluLgot ICAgICAgICAjIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDg2MQot ICAgICAgICBteSAkYmluYXJ5UHJlZml4ID0gJEVOVntBTkRST0lEX05ES19ST09UfSAuICIvdG9v bGNoYWlucy9hcm0tbGludXgtYW5kcm9pZGVhYmktNC40LjMvcHJlYnVpbHQvbGludXgteDg2L2Jp bi9hcm0tbGludXgtYW5kcm9pZGVhYmkiOwotICAgICAgICAkY29tbWFuZCAuPSBxcShDQz0iJGJp bmFyeVByZWZpeC1nY2MiIENYWD0iJGJpbmFyeVByZWZpeC1nKysiICk7Ci0gICAgICAgICRjb21t YW5kIC49IHFxKExJTks9IiRiaW5hcnlQcmVmaXgtZ2NjIiBBUj0iJGJpbmFyeVByZWZpeC1hciIg KTsKLSAgICAgICAgJGNvbW1hbmQgLj0gcXEoUkFOTElCPSIkYmluYXJ5UHJlZml4LXJhbmxpYiIg KTsKLSAgICB9Ci0KLSAgICAkY29tbWFuZCAuPSAibWFrZSAtZk1ha2VmaWxlLmNocm9taXVtICRt YWtlQXJncyBCVUlMRFRZUEU9JGNvbmZpZyAkdGFyZ2V0IjsKLSAgICAkY29tbWFuZCAuPSAiXCIi IGlmIGlzQ2hyb21pdW1BbmRyb2lkKCk7CisgICAgbXkgJGNvbW1hbmQgLj0gIm1ha2UgLWZNYWtl ZmlsZS5jaHJvbWl1bSAkbWFrZUFyZ3MgQlVJTERUWVBFPSRjb25maWcgJHRhcmdldCI7CiAKICAg ICBwcmludCAiJGNvbW1hbmRcbiI7CiAgICAgcmV0dXJuIHN5c3RlbSAkY29tbWFuZDsK 132799 2012-03-20 04:34:13 -0700 2012-03-20 10:02:44 -0700 Patch bug-80861-20120320113412.patch text/plain 3911 peter U3VidmVyc2lvbiBSZXZpc2lvbjogMTExMzc4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDdlZWRiNTU3YjE2NTEwZTA4ZGNiZjU2ZDgzNjIyMDRkODQwNzhhZDQuLmMyNmY0NjBlODhhMjk3 YzVkMWE4NWI3OTIwNzE1OWViODA1N2FjODQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTUgQEAKKzIwMTItMDMtMjAgIFBldGVyIEJldmVybG9vICA8cGV0ZXJAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gUmVtb3ZlIEFuZHJvaWQgYnVpbGQtZml4IHdo ZW4gdGhlIHByb3BlciBmaXggcm9sbGVkIGludG8gV2ViS2l0CisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04MDg2MQorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE5vIGxvbmdlciBzZXQgdGhlIENDLnRhcmdldCBl bnZpcm9ubWVudCB2YXJpYWJsZSBhcyB0aGlzIGlzIG5vIGxvbmdlcgorICAgICAgICByZXF1aXJl ZCBmb3IgcHJvamVjdCBmaWxlIGdlbmVyYXRpb24uCisKKyAgICAgICAgKiBneXBfd2Via2l0Ogor CiAyMDEyLTAzLTE5ICBBZGFtIEJhcnRoICA8YWJhcnRoQHdlYmtpdC5vcmc+CiAKICAgICAgICAg UmVtb3ZlIHN1cHBvcnQgZm9yICJtYWdpYyIgaWZyYW1lCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL2d5cF93ZWJraXQgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2d5cF93ZWJr aXQKaW5kZXggMmU3M2Y0ZWE2MDcyODYxYzY1ZTA5MmQyNTBjYjA2MmM0MTVjODA3MC4uMmMzNGQ4 MjA1ZmM5ZTYwZGU5ZDFkYjYzZjUzYzI5NmU0ODg2MDNkMSAxMDA3NTUKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9neXBfd2Via2l0CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vZ3lw X3dlYmtpdApAQCAtODcsNyArODcsNiBAQCBpZiBfX25hbWVfXyA9PSAnX19tYWluX18nOgogICAg ICAgZW52c2V0dXBfbG9jYXRpb24gPSBvcy5wYXRoLmpvaW4oY2hyb21lX3NyYywgJ2J1aWxkJywg J2FuZHJvaWQnLCAnZW52c2V0dXAuc2gnKQogICAgICAgZXhpdChzdWJwcm9jZXNzLmNhbGwoWydi YXNoJywgJy1jJywgJ3NvdXJjZSAlcyAmJiBweXRob24gZ3lwX3dlYmtpdCAtLW5vLWVudnNldHVw LXJlY3Vyc2lvbiAlcycgJSAoZW52c2V0dXBfbG9jYXRpb24sICcgJy5qb2luKGFyZ3MpKV0pKQog ICAgIGVsc2U6Ci0gICAgICBvcy5lbnZpcm9uWydDQy50YXJnZXQnXSA9IG9zLmVudmlyb25bJ0NS T1NTX0NDJ10KICAgICAgIGFyZ3MucmVtb3ZlKCctLW5vLWVudnNldHVwLXJlY3Vyc2lvbicpCiAK ICAgIyBBZGQgaW5jbHVkZXMuCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cgYi9Ub29scy9D aGFuZ2VMb2cKaW5kZXggY2UzMDNlNGVlNWRiYzdmYWExNDVmNWQ2M2FhYjcwNzEyYzFiN2U1Yi4u OTZjMzlmNzJiNzM5OWE4ZTk4YTQ3NzJhY2Q4ODc4MzgwZTdmNGNlNCAxMDA2NDQKLS0tIGEvVG9v bHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE2IEBACisyMDEy LTAzLTIwICBQZXRlciBCZXZlcmxvbyAgPHBldGVyQGNocm9taXVtLm9yZz4KKworICAgICAgICBb Q2hyb21pdW1dIFJlbW92ZSBBbmRyb2lkIGJ1aWxkLWZpeCB3aGVuIHRoZSBwcm9wZXIgZml4IHJv bGxlZCBpbnRvIFdlYktpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9ODA4NjEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBSZW1vdmUgbW9zdCBBbmRyb2lkLXNwZWNpZmljIGxvZ2ljIGZyb20gd2Via2l0ZGly cy5wbSBpbiBmYXZvciBvZgorICAgICAgICBoYW5kbGluZyB0aGlzIGR1cmluZyBwcm9qZWN0IGdl bmVyYXRpb24gdGltZS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAg ICAgKGJ1aWxkQ2hyb21pdW1NYWtlZmlsZSk6CisKIDIwMTItMDMtMjAgIENzYWJhIE9zenRyb2dv bsOhYyAgPG9zc3lAd2Via2l0Lm9yZz4KIAogICAgICAgICB4ODYgR0NDIGJ1ZyB0cmlnZ2VycyBh IGNvbXBpbGF0aW9uIGVycm9yIGluIGdlbmVyYXRlZCBjb3B5IGNvbnN0cnVjdG9yIG9mIENvbGxh cHNlZEJvcmRlclZhbHVlCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0g Yi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggZTY5NjhhYjAwZGMzOTFjZWQ0MDlm NjAyODE0NDAxZjEzNGVlNjFmOC4uZDVkNTMzYWZjNmY0OTg0N2Y1NTFjNGI5MWY2ZWIzYjlhZjEy YzExZCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMjMwMywyNiArMjMwMyw3IEBAIHN1YiBidWlsZENo cm9taXVtTWFrZWZpbGUoJCRAKQogICAgICAgICAkbWFrZUFyZ3MgPSAkMSBpZiAvXi0tbWFrZWFy Z3M9KC4qKS9pOwogICAgIH0KICAgICAkbWFrZUFyZ3MgPSAiLWokbnVtQ3B1cyIgaWYgbm90ICRt YWtlQXJnczsKLSAgICBteSAkY29tbWFuZCA9ICIiOwotCi0gICAgIyBCdWlsZGluZyB0aGUgV2Vi S2l0IENocm9taXVtIHBvcnQgZm9yIEFuZHJvaWQgcmVxdWlyZXMgdXMgdG8gY3Jvc3MtCi0gICAg IyBjb21waWxlLCB3aGljaCB3aWxsIGJlIHNldCB1cCBieSBDaHJvbWl1bSdzIGVudnNldHVwLnNo LiBUaGUgc2NyaXB0IGl0c2VsZgotICAgICMgd2lsbCB2ZXJpZnkgdGhhdCB0aGUgaW5zdGFsbGVk IE5ESyBpcyBpbmRlZWQgYXZhaWxhYmxlLgotICAgIGlmIChpc0Nocm9taXVtQW5kcm9pZCgpKSB7 Ci0gICAgICAgICRjb21tYW5kIC49ICJiYXNoIC1jIFwic291cmNlICIgLiBzb3VyY2VEaXIoKSAu ICIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9idWlsZC9hbmRyb2lkL2VudnNldHVwLnNoICYmICI7 Ci0gICAgICAgICRFTlZ7QU5EUk9JRF9OREtfUk9PVH0gPSBzb3VyY2VEaXIoKSAuICIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9hbmRyb2lkLW5kay1yNyI7Ci0gICAgICAgICRFTlZ7V0VCS0lUX0FO RFJPSURfQlVJTER9ID0gMTsKLQotICAgICAgICAjIEZJWE1FOiBSZW1vdmUgdGhlIGJ1aWxkLWZp eCBvbmNlIHRoZSBDaHJvbWl1bS1zaWRlIGZpeCByb2xsZWQgaW4uCi0gICAgICAgICMgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTgwODYxCi0gICAgICAgIG15ICRiaW5h cnlQcmVmaXggPSAkRU5We0FORFJPSURfTkRLX1JPT1R9IC4gIi90b29sY2hhaW5zL2FybS1saW51 eC1hbmRyb2lkZWFiaS00LjQuMy9wcmVidWlsdC9saW51eC14ODYvYmluL2FybS1saW51eC1hbmRy b2lkZWFiaSI7Ci0gICAgICAgICRjb21tYW5kIC49IHFxKENDPSIkYmluYXJ5UHJlZml4LWdjYyIg Q1hYPSIkYmluYXJ5UHJlZml4LWcrKyIgKTsKLSAgICAgICAgJGNvbW1hbmQgLj0gcXEoTElOSz0i JGJpbmFyeVByZWZpeC1nY2MiIEFSPSIkYmluYXJ5UHJlZml4LWFyIiApOwotICAgICAgICAkY29t bWFuZCAuPSBxcShSQU5MSUI9IiRiaW5hcnlQcmVmaXgtcmFubGliIiApOwotICAgIH0KLQotICAg ICRjb21tYW5kIC49ICJtYWtlIC1mTWFrZWZpbGUuY2hyb21pdW0gJG1ha2VBcmdzIEJVSUxEVFlQ RT0kY29uZmlnICR0YXJnZXQiOwotICAgICRjb21tYW5kIC49ICJcIiIgaWYgaXNDaHJvbWl1bUFu ZHJvaWQoKTsKKyAgICBteSAkY29tbWFuZCAuPSAibWFrZSAtZk1ha2VmaWxlLmNocm9taXVtICRt YWtlQXJncyBCVUlMRFRZUEU9JGNvbmZpZyAkdGFyZ2V0IjsKIAogICAgIHByaW50ICIkY29tbWFu ZFxuIjsKICAgICByZXR1cm4gc3lzdGVtICRjb21tYW5kOwo=