70028 2011-10-13 08:48:19 -0700 [Chromium] Inherit settings from Chromium's envsetup.sh, address a NDK todo 2012-06-13 09:51:29 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 88853 66689 1 peter peter abarth steveblock webkit.review.bot oldest_to_newest 483213 0 peter 2011-10-13 08:48:19 -0700 This patch changes the build system for the Chromium port on Android from manually setting the appropriate flags, to re-using Chromium's envsetup.sh which does this for us. Furthermore, update-webkit-chromium will now be able to automatically download and extract the Android NDK, fixing a todo. A few minor gyp-file changes are included as well, unrelated but tiny enough. 483214 1 110853 peter 2011-10-13 08:51:51 -0700 Created attachment 110853 Patch 483872 2 peter 2011-10-14 02:40:55 -0700 To give some more background information; The envsetup.sh script[1] has recently landed in Chromium and roughly verifies presence of the NDK, determines the host OS, sets the appropriate GYP_GENERATORS and GYP_DEFINES and sets up compilers to be used with the make command. Unifying this code between Chromium and WebKit has the advantage that we're always using the same settings, as, for example, the arm_neon setting was true for WebKit and false for Chromium. [1] http://src.chromium.org/viewvc/chrome/trunk/src/build/android/envsetup.sh?view=markup 483882 3 110853 abarth 2011-10-14 02:57:55 -0700 Comment on attachment 110853 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=110853&action=review > Source/WebKit/chromium/gyp_webkit:89 > + p = subprocess.Popen(['bash', '-c', 'source %s && python gyp_webkit --no-envsetup-recursion %s' % (envsetup_location, ' '.join(args))]) > + exit(p.wait()) You can just use subprocess.call 483883 4 110853 abarth 2011-10-14 02:58:27 -0700 Comment on attachment 110853 Patch Looks plausible. Would you prefer me or Steve to do the review? 483884 5 peter 2011-10-14 02:59:19 -0700 (In reply to comment #4) > (From update of attachment 110853 [details]) > Looks plausible. Would you prefer me or Steve to do the review? Since most of this is in Tools/Scripts I'd like you to do the review. Thanks! 483952 6 111008 peter 2011-10-14 06:22:03 -0700 Created attachment 111008 Patch Patch addressing comment 3 (use subprocess.call). 484200 7 111008 webkit.review.bot 2011-10-14 12:46:42 -0700 Comment on attachment 111008 Patch Clearing flags on attachment: 111008 Committed r97493: <http://trac.webkit.org/changeset/97493> 484202 8 webkit.review.bot 2011-10-14 12:46:46 -0700 All reviewed patches have been landed. Closing bug. 645989 9 111008 steveblock 2012-06-11 07:25:32 -0700 Comment on attachment 111008 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=111008&action=review > Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:51 > + ['os_posix == 1 and OS != "mac" and OS != "android" and gcc_version==46', { Can you explain why we need to exclude this on Android? This causes compile warnings with GCC 4.6. 646804 10 peter 2012-06-12 04:22:23 -0700 (In reply to comment #9) > (From update of attachment 111008 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=111008&action=review > > > Source/JavaScriptCore/JavaScriptCore.gyp/JavaScriptCore.gyp:51 > > + ['os_posix == 1 and OS != "mac" and OS != "android" and gcc_version==46', { > > Can you explain why we need to exclude this on Android? This causes compile warnings with GCC 4.6. This was added downstream through a merge checkpoint, because gcc_version was not defined during evaluation of the conditional, causing gyp to error out. This still seems to be the case: NameError: name 'gcc_version' is not defined while evaluating condition 'os_posix==1 and OS!="mac" and gcc_version==46' in WebKit.gyp while loading dependencies of WebKitUnitTests.gyp while loading dependencies of All.gyp while trying to load All.gyp The cause for this is the exclusion around line 806 in Chromium's /build/common.gypi, which stops us from initializing a number of settings for the Android platform. 646811 11 peter 2012-06-12 04:27:41 -0700 I filed bug 88853 to remove these exceptions from WebKit, I'll try to enable these settings on the Chromium side today. That way, we can land the change after a DEPS roll. 648154 12 steveblock 2012-06-13 09:47:27 -0700 > This was added downstream through a merge checkpoint, because gcc_version was not defined during > evaluation of the conditional, causing gyp to error out. This still seems to be the case: Right, that's what I thought - just wanted to check there isn't a deeper reason. > I filed bug 88853 to remove these exceptions from WebKit, I'll try to enable these settings on the > Chromium side today. That way, we can land the change after a DEPS roll. Great, thanks! Can you point to the Chromium change? 648158 13 peter 2012-06-13 09:51:29 -0700 (In reply to comment #12) > > I filed bug 88853 to remove these exceptions from WebKit, I'll try to enable these settings on the > > Chromium side today. That way, we can land the change after a DEPS roll. > Great, thanks! Can you point to the Chromium change? Not yet, I've been sheriffing in the past two days. I'll land it tonight. 110853 2011-10-13 08:51:51 -0700 2011-10-14 06:22:03 -0700 Patch scriptpatch-2.patch text/plain 11194 peter ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDMxMmZlMWQuLjI0NjJiMzYgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDExLTEwLTEzICBQZXRlciBCZXZlcmxv byAgPHBldGVyQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIEluaGVyaXQgc2V0 dGluZ3MgZnJvbSBDaHJvbWl1bSdzIGVudnNldHVwLnNoLCBhZGRyZXNzIGEgTkRLIHRvZG8KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwMDI4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBKYXZhU2NyaXB0 Q29yZS5neXAvSmF2YVNjcmlwdENvcmUuZ3lwOgorCiAyMDExLTEwLTEyICBGaWxpcCBQaXpsbyAg PGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAgICAgSWYgYW4gQXJndW1lbnRzIG9iamVjdCBpcyBi ZWluZyB1c2VkIHRvIGNvcHkgdGhlIGFyZ3VtZW50cywgdGhlbgpkaWZmIC0tZ2l0IGEvU291cmNl L0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3JlLmd5cC9KYXZhU2NyaXB0Q29yZS5neXAgYi9T b3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZ3lwL0phdmFTY3JpcHRDb3JlLmd5 cAppbmRleCA0MTIzZTUzLi44YWJiOTkzIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvSmF2YVNjcmlwdENvcmUuZ3lwL0phdmFTY3JpcHRDb3JlLmd5cAorKysgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZ3lwL0phdmFTY3JpcHRDb3JlLmd5cApAQCAtNDgs NyArNDgsNyBAQAogICAgIF0sCiAgIH0sCiAgICdjb25kaXRpb25zJzogWwotICAgIFsnb3NfcG9z aXggPT0gMSBhbmQgT1MgIT0gIm1hYyIgYW5kIGdjY192ZXJzaW9uPT00NicsIHsKKyAgICBbJ29z X3Bvc2l4ID09IDEgYW5kIE9TICE9ICJtYWMiIGFuZCBPUyAhPSAiYW5kcm9pZCIgYW5kIGdjY192 ZXJzaW9uPT00NicsIHsKICAgICAgICd0YXJnZXRfZGVmYXVsdHMnOiB7CiAgICAgICAgICMgRGlz YWJsZSB3YXJuaW5ncyBhYm91dCBjKysweCBjb21wYXRpYmlsaXR5LCBhcyBzb21lIG5hbWVzIChz dWNoIGFzIG51bGxwdHIpIGNvbmZsaWN0CiAgICAgICAgICMgd2l0aCB1cGNvbWluZyBjKysweCB0 eXBlcy4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJD b3JlL0NoYW5nZUxvZwppbmRleCAxY2Y4OGI3Li5iMDUyODE3IDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMTIgQEAKKzIwMTEtMTAtMTMgIFBldGVyIEJldmVybG9vICA8cGV0ZXJAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFtDaHJvbWl1bV0gSW5oZXJpdCBzZXR0aW5ncyBmcm9tIENocm9taXVtJ3Mg ZW52c2V0dXAuc2gsIGFkZHJlc3MgYSBOREsgdG9kbworICAgICAgICBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzAwMjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICAqIFdlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwOgorCiAyMDEx LTEwLTEzICBNaWtoYWlsIE5hZ2Fub3YgIDxtbmFnYW5vdkBjaHJvbWl1bS5vcmc+CiAKICAgICAg ICAgV2ViIEluc3BlY3RvcjogW0Nocm9taXVtXSBBZGQgYW4gYWJpbGl0eSB0byBsb29rIHVwIGFu ZCBleHBsb3JlIGFuIG9iamVjdCBmcm9tIGEgaGVhcCBwcm9maWxlLgpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvV2ViQ29yZS5neXAvV2ViQ29yZS5neXAgYi9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLmd5cC9XZWJDb3JlLmd5cAppbmRleCA2OTUwNTFhLi5kNjU1ZDE4IDEwMDY0NAotLS0gYS9T b3VyY2UvV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cAorKysgYi9Tb3VyY2UvV2ViQ29y ZS9XZWJDb3JlLmd5cC9XZWJDb3JlLmd5cApAQCAtMTA2LDcgKzEwNiw3IEBACiAgICAgICAgICdj ZmxhZ3MhJzogWyctZyddLAogICAgICAgfSwKICAgICB9XSwKLSAgICBbJ29zX3Bvc2l4PT0xIGFu ZCBPUyE9Im1hYyIgYW5kIGdjY192ZXJzaW9uPT00NicsIHsKKyAgICBbJ29zX3Bvc2l4PT0xIGFu ZCBPUyE9Im1hYyIgYW5kIE9TIT0iYW5kcm9pZCIgYW5kIGdjY192ZXJzaW9uPT00NicsIHsKICAg ICAgICd0YXJnZXRfZGVmYXVsdHMnOiB7CiAgICAgICAgICMgRGlzYWJsZSB3YXJuaW5ncyBhYm91 dCBjKysweCBjb21wYXRpYmlsaXR5LCBhcyBzb21lIG5hbWVzIChzdWNoIGFzIG51bGxwdHIpIGNv bmZsaWN0CiAgICAgICAgICMgd2l0aCB1cGNvbWluZyBjKysweCB0eXBlcy4KQEAgLTE2NjMsNyAr MTY2Myw3IEBACiAgICAgICAgICAgICBbJ2V4Y2x1ZGUnLCAncmVuZGVyaW5nL1JlbmRlclRoZW1l Q2hyb21pdW1Ta2lhXFwuY3BwJCddLAogICAgICAgICAgIF0sCiAgICAgICAgIH1dLAotICAgICAg ICBbJ29zX3Bvc2l4ID09IDEgYW5kIE9TICE9ICJtYWMiIGFuZCBnY2NfdmVyc2lvbiA9PSA0Mics IHsKKyAgICAgICAgWydvc19wb3NpeCA9PSAxIGFuZCBPUyAhPSAibWFjIiBhbmQgT1MgIT0gImFu ZHJvaWQiIGFuZCBnY2NfdmVyc2lvbiA9PSA0MicsIHsKICAgICAgICAgICAjIER1ZSB0byBhIGJ1 ZyBpbiBnY2MgNC4yLjEgKHRoZSBjdXJyZW50IHZlcnNpb24gb24gaGFyZHkpLCB3ZSBnZXQKICAg ICAgICAgICAjIHdhcm5pbmdzIGFib3V0IHVuaW5pdGlhbGl6ZWQgdGhpcy4KICAgICAgICAgICAn Y2ZsYWdzJzogWyctV25vLXVuaW5pdGlhbGl6ZWQnXSwKQEAgLTE3OTksNyArMTc5OSw3IEBACiAg ICAgICAgICAgICBbJ2luY2x1ZGUnLCAnL1RyYW5zcGFyZW5jeVdpblxcLmNwcCQnXSwKICAgICAg ICAgICBdLAogICAgICAgICB9XSwKLSAgICAgICAgWydvc19wb3NpeCA9PSAxIGFuZCBPUyAhPSAi bWFjIiBhbmQgZ2NjX3ZlcnNpb24gPT0gNDInLCB7CisgICAgICAgIFsnb3NfcG9zaXggPT0gMSBh bmQgT1MgIT0gIm1hYyIgYW5kIE9TICE9ICJhbmRyb2lkIiBhbmQgZ2NjX3ZlcnNpb24gPT0gNDIn LCB7CiAgICAgICAgICAgIyBEdWUgdG8gYSBidWcgaW4gZ2NjIDQuMi4xICh0aGUgY3VycmVudCB2 ZXJzaW9uIG9uIGhhcmR5KSwgd2UgZ2V0CiAgICAgICAgICAgIyB3YXJuaW5ncyBhYm91dCB1bmlu aXRpYWxpemVkIHRoaXMuCiAgICAgICAgICAgJ2NmbGFncyc6IFsnLVduby11bmluaXRpYWxpemVk J10sCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0NoYW5nZUxvZyBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4IDQ5MDViODkuLjQ3Mzg4OWQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMTEtMTAtMTMgIFBldGVy IEJldmVybG9vICA8cGV0ZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gSW5o ZXJpdCBzZXR0aW5ncyBmcm9tIENocm9taXVtJ3MgZW52c2V0dXAuc2gsIGFkZHJlc3MgYSBOREsg dG9kbworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzAw MjgKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFdl YktpdC5neXA6CisgICAgICAgICogZ3lwX3dlYmtpdDoKKwogMjAxMS0xMC0xMyAgS2VudCBUYW11 cmEgIDx0a2VudEBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgQ2xlYW51cCBvZiBIVE1MU2VsZWN0 RWxlbWVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwIGIv U291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCmluZGV4IDAwYjNmOWUuLjE4NjExYTYg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAorKysgYi9Tb3Vy Y2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKQEAgLTEzNDksNyArMTM0OSw3IEBACiAgICAg ICAgICAgICAgICAgJ3NvdXJjZXMnOiBbJy4uLy4uLy4uL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL2No cm9taXVtL0xheW91dFRlc3RIZWxwZXJXaW4uY3BwJ10sCiAgICAgICAgICAgICB9XSwKICAgICAg ICAgfV0sCi0gICAgICAgIFsnb3NfcG9zaXg9PTEgYW5kIE9TIT0ibWFjIiBhbmQgZ2NjX3ZlcnNp b249PTQ2JywgeworICAgICAgICBbJ29zX3Bvc2l4PT0xIGFuZCBPUyE9Im1hYyIgYW5kIE9TIT0i YW5kcm9pZCIgYW5kIGdjY192ZXJzaW9uPT00NicsIHsKICAgICAgICAgICAgICd0YXJnZXRfZGVm YXVsdHMnOiB7CiAgICAgICAgICAgICAgICAgIyBEaXNhYmxlIHdhcm5pbmdzIGFib3V0IGMrKzB4 IGNvbXBhdGliaWxpdHksIGFzIHNvbWUgbmFtZXMgKHN1Y2gKICAgICAgICAgICAgICAgICAjIGFz IG51bGxwdHIpIGNvbmZsaWN0IHdpdGggdXBjb21pbmcgYysrMHggdHlwZXMuCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2d5cF93ZWJraXQgYi9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL2d5cF93ZWJraXQKaW5kZXggMzIzOTM2OC4uNWE1NDc2YyAxMDA3NTUKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9neXBfd2Via2l0CisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0v Z3lwX3dlYmtpdApAQCAtMzMsNiArMzMsNyBAQAogaW1wb3J0IGdsb2IKIGltcG9ydCBvcwogaW1w b3J0IHNobGV4CitpbXBvcnQgc3VicHJvY2VzcwogaW1wb3J0IHN5cwogCiBzY3JpcHRfZGlyID0g b3MucGF0aC5kaXJuYW1lKF9fZmlsZV9fKQpAQCAtNzcsNiArNzgsMTkgQEAgaWYgX19uYW1lX18g PT0gJ19fbWFpbl9fJzoKIAogICBhcmdzID0gc3lzLmFyZ3ZbMTpdCiAKKyAgIyBXaGVuIGJ1aWxk aW5nIHRoZSBXZWJLaXQgQ2hyb21pdW0gcG9ydCBmb3IgQW5kcm9pZCwgd2UgaGF2ZSB0byBjcm9z cy1jb21waWxlCisgICMgdGhlIHNvdXJjZSB0byBBUk0sIGNoZWNrIGZvciB0aGUgcmlnaHQgQW5k cm9pZCBOREsgYW5kIHNldCB0aGUgYXBwcm9wcmlhdGUKKyAgIyBHWVAgZmxhZ3MuIENocm9taXVt J3MgZW52c2V0dXAuc2ggc2NyaXB0IHdpbGwgaGFuZGxlIHRoZXNlIHN0ZXBzLCBidXQgYXMgaXQK KyAgIyBleHBvcnRzIHZhcmlhYmxlcyBhbmQgY29tbWFuZHMgd2UgaGF2ZSB0byByZS1jYWxsIG91 cnNlbHZlcyBhZnRlcndhcmRzLgorICBpZiAnV0VCS0lUX0FORFJPSURfQlVJTEQnIGluIG9zLmVu dmlyb246CisgICAgaWYgbm90ICctLW5vLWVudnNldHVwLXJlY3Vyc2lvbicgaW4gYXJnczoKKyAg ICAgIGVudnNldHVwX2xvY2F0aW9uID0gb3MucGF0aC5qb2luKGNocm9tZV9zcmMsICdidWlsZCcs ICdhbmRyb2lkJywgJ2VudnNldHVwLnNoJykKKyAgICAgIHAgPSBzdWJwcm9jZXNzLlBvcGVuKFsn YmFzaCcsICctYycsICdzb3VyY2UgJXMgJiYgcHl0aG9uIGd5cF93ZWJraXQgLS1uby1lbnZzZXR1 cC1yZWN1cnNpb24gJXMnICUgKGVudnNldHVwX2xvY2F0aW9uLCAnICcuam9pbihhcmdzKSldKQor ICAgICAgZXhpdChwLndhaXQoKSkKKyAgICBlbHNlOgorICAgICAgb3MuZW52aXJvblsnQ0MudGFy Z2V0J10gPSBvcy5lbnZpcm9uWydDUk9TU19DQyddCisgICAgICBhcmdzLnJlbW92ZSgnLS1uby1l bnZzZXR1cC1yZWN1cnNpb24nKQorCiAgICMgQWRkIGluY2x1ZGVzLgogICBhcmdzLmV4dGVuZChb Jy1JJyArIGkgZm9yIGkgaW4gYWRkaXRpb25hbF9pbmNsdWRlX2ZpbGVzKGFyZ3MpXSkKIApAQCAt OTAsNyArMTA0LDcgQEAgaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICBhcmdzLmFwcGVu ZCgnLS1uby1jaXJjdWxhci1jaGVjaycpCiAKICAgIyBPbiBsaW51eCwgd2Ugd2FudCBneXAgdG8g b3V0cHV0IGEgbWFrZWZpbGUgKGRlZmF1bHQgaXMgc2NvbnMpLgotICBpZiBzeXMucGxhdGZvcm0u c3RhcnRzd2l0aCgnbGludXgnKSBvciAnR1lQX0FORFJPSURfQlVJTEQnIGluIG9zLmVudmlyb246 CisgIGlmIHN5cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCdsaW51eCcpIG9yICdXRUJLSVRfQU5EUk9J RF9CVUlMRCcgaW4gb3MuZW52aXJvbjoKICAgICBhcmdzLmV4dGVuZChbJy1mbWFrZScsCiAgICAg ICAgICAgICAgICAgICctLXN1ZmZpeD0uY2hyb21pdW0nLAogICAgICAgICAgICAgICAgICAnLS10 b3BsZXZlbC1kaXI9Li4vLi4vLi4nLApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9v bHMvQ2hhbmdlTG9nCmluZGV4IDVjZjU2YmYuLjM3MTE2YmIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0No YW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNSBAQAorMjAxMS0xMC0x MyAgUGV0ZXIgQmV2ZXJsb28gIDxwZXRlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9t aXVtXSBJbmhlcml0IHNldHRpbmdzIGZyb20gQ2hyb21pdW0ncyBlbnZzZXR1cC5zaCwgYWRkcmVz cyBhIE5ESyB0b2RvCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD03MDAyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtOgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0ZGlycy5wbToKKyAgICAgICAgKGJ1aWxkQ2hyb21pdW1NYWtlZmlsZSk6CisgICAgICAg IChidWlsZENocm9taXVtKToKKwogMjAxMS0xMC0xMyAgS2VudCBUYW11cmEgIDx0a2VudEBjaHJv bWl1bS5vcmc+CiAKICAgICAgICAgW0Nocm9taXVtXSBBIERSVCBmaXggZm9yIHI5NzM0OC4KZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bSBiL1Rvb2xzL1Nj cmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bQppbmRleCA5MmU3NmFjLi4xNjI3YWI2IDEwMDc1 NQotLS0gYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW0KKysrIGIvVG9vbHMv U2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtCkBAIC01OCwxMiArNTgsMjQgQEAgaWYgKCEg LWUgIi5nY2xpZW50IikgewogICAgICAgICAgICAiLS1zcGVjPXNvbHV0aW9ucz1beyduYW1lJzon Li8nLCd1cmwnOk5vbmV9XSIpID09IDAgb3IgZGllICQhOwogfQogCi0jIFNldCBjZXJ0YWluIGd5 cCBzZXR0aW5ncyBmb3IgdGhlIEFuZHJvaWQgYnVpbGQKKyMgV2hlbiBidWlsZGluZyBXZWJLaXQn cyBDaHJvbWl1bSBwb3J0IGZvciBBbmRyb2lkLCB3ZSBuZWVkIHRoZSBBbmRyb2lkIE5ESyBhcwor IyBpdCB3aWxsIGFsbG93IHVzIHRvIGNyb3NzLWNvbXBpbGUgYWxsIHNvdXJjZXMgdG8gdGhlIHRh cmdldCBhcmNoaXRlY3R1cmUuCiBpZiAoaXNDaHJvbWl1bUFuZHJvaWQoKSkgewotICAgICMgRklY TUU6IEFkZCBjb2RlIHRvIGF1dG9tYXRpY2FsbHkgZG93bmxvYWQgdGhlIE5ESwotICAgIG15ICRo b3N0X29zID0gaXNMaW51eCgpID8gImxpbnV4IiA6ICJtYWMiOwotICAgICRFTlZ7R1lQX0RFRklO RVN9ID0gIk9TPWFuZHJvaWQgaG9zdF9vcz0iIC4gJGhvc3Rfb3MgLiAiIHRhcmdldF9hcmNoPWFy bSBhcm1fbmVvbj0xIGFybXY3PTEgYXJtX3RodW1iPTEgbGludXhfZnBpYz0xIHVzZV9vcGVuc3Ns PTEgdXNlX3N5c3RlbV9saWJqcGVnPTAgbGludXhfdXNlX3RjbWFsbG9jPTAiOwotICAgICRFTlZ7 R1lQX0FORFJPSURfQlVJTER9ID0gMTsKKyAgICBpZiAoISAtZSAidGhpcmRfcGFydHkvYW5kcm9p ZC1uZGstcjZiIikgeworICAgICAgICBwcmludCAiSW5zdGFsbGluZyB0aGUgQW5kcm9pZCBOREss IHZlcnNpb24gNmIuLi5cbiI7CisgICAgICAgIGlmICghIC1lICJ0aGlyZF9wYXJ0eS8iKSB7Cisg ICAgICAgICAgICBta2RpciAidGhpcmRfcGFydHkiOworICAgICAgICB9CisgICAgICAgIG15ICRo b3N0X29zID0gaXNMaW51eCgpID8gImxpbnV4IiA6ICJkYXJ3aW4iOworICAgICAgICBteSAkcmVz dWx0ID0gc3lzdGVtKCJjdXJsIiwgIi1vIiwgInRoaXJkX3BhcnR5L2FuZHJvaWQtbmRrLXI2Yi50 YXIuYnoyIiwgImh0dHA6Ly9kbC5nb29nbGUuY29tL2FuZHJvaWQvbmRrL2FuZHJvaWQtbmRrLXI2 Yi0iIC4gJGhvc3Rfb3MgLiAiLXg4Ni50YXIuYnoyIik7CisgICAgICAgIGRpZSAiQ291bGRuJ3Qg ZG93bmxvYWQgdGhlIEFuZHJvaWQgTkRLLiIgaWYgJHJlc3VsdDsKKworICAgICAgICAkcmVzdWx0 ID0gc3lzdGVtKCJ0YXIiLCAianhDIiwgInRoaXJkX3BhcnR5IiwgIi1mIiwgInRoaXJkX3BhcnR5 L2FuZHJvaWQtbmRrLXI2Yi50YXIuYnoyIik7CisgICAgICAgIGRpZSAiQ291bGRuJ3QgZXh0cmFj dCB0aGUgQW5kcm9pZCBOREsuIiBpZiAkcmVzdWx0OworICAgIH0KKworICAgICRFTlZ7QU5EUk9J RF9OREtfUk9PVH0gPSBzb3VyY2VEaXIoKSAuICIvU291cmNlL1dlYktpdC9jaHJvbWl1bS90aGly ZF9wYXJ0eS9hbmRyb2lkLW5kay1yNmIiOworICAgICRFTlZ7V0VCS0lUX0FORFJPSURfQlVJTER9 ID0gMTsKIH0KIAogbXkgJGZvcmNlID0gMDsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCBiYzVjOWJlLi40 YjBiZGQzIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9v bHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0xOTA4LDcgKzE5MDgsMjAgQEAgc3ViIGJ1aWxk Q2hyb21pdW1NYWtlZmlsZSgkJEApCiAgICAgICAgICRtYWtlQXJncyA9ICQxIGlmIC9eLS1tYWtl YXJncz0oLiopL2k7CiAgICAgfQogICAgICRtYWtlQXJncyA9ICItaiRudW1DcHVzIiBpZiBub3Qg JG1ha2VBcmdzOwotICAgIG15ICRjb21tYW5kID0gIm1ha2UgLWZNYWtlZmlsZS5jaHJvbWl1bSAk bWFrZUFyZ3MgQlVJTERUWVBFPSRjb25maWcgJHRhcmdldCI7CisgICAgbXkgJGNvbW1hbmQgPSAi IjsKKworICAgICMgQnVpbGRpbmcgdGhlIFdlYktpdCBDaHJvbWl1bSBwb3J0IGZvciBBbmRyb2lk IHJlcXVpcmVzIHVzIHRvIGNyb3NzLQorICAgICMgY29tcGlsZSwgd2hpY2ggd2lsbCBiZSBzZXQg dXAgYnkgQ2hyb21pdW0ncyBlbnZzZXR1cC5zaC4gVGhlIHNjcmlwdCBpdHNlbGYKKyAgICAjIHdp bGwgdmVyaWZ5IHRoYXQgdGhlIGluc3RhbGxlZCBOREsgaXMgaW5kZWVkIGF2YWlsYWJsZS4KKyAg ICBpZiAoaXNDaHJvbWl1bUFuZHJvaWQoKSkgeworICAgICAgICAkY29tbWFuZCAuPSAiYmFzaCAt YyBcInNvdXJjZSAiIC4gc291cmNlRGlyKCkgLiAiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vYnVp bGQvYW5kcm9pZC9lbnZzZXR1cC5zaCAmJiAiOworICAgICAgICAkRU5We0FORFJPSURfTkRLX1JP T1R9ID0gc291cmNlRGlyKCkgLiAiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGhpcmRfcGFydHkv YW5kcm9pZC1uZGstcjZiIjsKKyAgICAgICAgJEVOVntXRUJLSVRfQU5EUk9JRF9CVUlMRH0gPSAx OworICAgIH0KKworICAgICRjb21tYW5kIC49ICJtYWtlIC1mTWFrZWZpbGUuY2hyb21pdW0gJG1h a2VBcmdzIEJVSUxEVFlQRT0kY29uZmlnICR0YXJnZXQiOworICAgICRjb21tYW5kIC49ICJcIiIg aWYgaXNDaHJvbWl1bUFuZHJvaWQoKTsKKwogICAgIHByaW50ICIkY29tbWFuZFxuIjsKICAgICBy ZXR1cm4gc3lzdGVtICRjb21tYW5kOwogfQpAQCAtMTk2MywyOSArMTk3NiwxMyBAQCBzdWIgYnVp bGRDaHJvbWl1bSgkQCkKICAgICB9CiAKICAgICBteSAkcmVzdWx0ID0gMTsKLSAgICBpZiAoaXND aHJvbWl1bUFuZHJvaWQoKSkgewotICAgICAgICAjIEJ1aWxkaW5nIENocm9taXVtIGZvciBBbmRy b2lkIG5lZWRzIHRvIGNyb3NzLWNvbXBpbGUgdXNpbmcgdGhlCi0gICAgICAgICMgVG9vbGNoYWlu cyBzdXBwbGllZCBieSB0aGUgQW5kcm9pZCBOREsuCi0gICAgICAgIG15ICRuZGtCYXNlRGlyID0g c291cmNlRGlyKCkgLiAiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGhpcmRfcGFydHkvYW5kcm9p ZC1uZGstcjYiOwotICAgICAgICBteSAkcGxhdGZvcm0gPSBpc0RhcndpbigpID8gImRhcndpbi14 ODYiIDogImxpbnV4LXg4NiI7Ci0KLSAgICAgICAgbXkgJHRvb2xjaGFpbkJhc2UgPSAkbmRrQmFz ZURpciAuICIvdG9vbGNoYWlucy9hcm0tbGludXgtYW5kcm9pZGVhYmktNC40LjMvcHJlYnVpbHQv IiAuICRwbGF0Zm9ybSAuICIvYmluL2FybS1saW51eC1hbmRyb2lkZWFiaS0iOwotCi0gICAgICAg ICRFTlZ7QVJ9ID0gJHRvb2xjaGFpbkJhc2UgLiAiYXIiOwotICAgICAgICAkRU5We0NDfSA9ICR0 b29sY2hhaW5CYXNlIC4gImdjYyI7Ci0gICAgICAgICRFTlZ7Q1hYfSA9ICR0b29sY2hhaW5CYXNl IC4gImcrKyI7Ci0gICAgICAgICRFTlZ7TElOS30gPSAkdG9vbGNoYWluQmFzZSAuICJnY2MiOwot ICAgICAgICAkRU5We1JBTkxJQn0gPSAkdG9vbGNoYWluQmFzZSAuICJyYW5saWIiOwotICAgICAg ICAkRU5We1NUUklQfSA9ICR0b29sY2hhaW5CYXNlIC4gInN0cmlwIjsKLQotICAgICAgICAkcmVz dWx0ID0gYnVpbGRDaHJvbWl1bU1ha2VmaWxlKCJhbGwiLCAkY2xlYW4pOwotICAgIH0gZWxzaWYg KGlzRGFyd2luKCkpIHsKKyAgICBpZiAoaXNEYXJ3aW4oKSAmJiAhaXNDaHJvbWl1bUFuZHJvaWQo KSkgewogICAgICAgICAjIE1hYyBidWlsZCAtIGJ1aWxkcyB0aGUgcm9vdCB4Y29kZSBwcm9qZWN0 LgogICAgICAgICAkcmVzdWx0ID0gYnVpbGRYQ29kZVByb2plY3QoIlNvdXJjZS9XZWJLaXQvY2hy b21pdW0vV2ViS2l0IiwgJGNsZWFuLCAiLWNvbmZpZ3VyYXRpb24iLCBjb25maWd1cmF0aW9uKCks IEBvcHRpb25zKTsKICAgICB9IGVsc2lmIChpc0N5Z3dpbigpIHx8IGlzV2luZG93cygpKSB7CiAg ICAgICAgICMgV2luZG93cyBidWlsZCAtIGJ1aWxkcyB0aGUgcm9vdCB2aXN1YWwgc3R1ZGlvIHNv bHV0aW9uLgogICAgICAgICAkcmVzdWx0ID0gYnVpbGRDaHJvbWl1bVZpc3VhbFN0dWRpb1Byb2pl Y3QoIlNvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0LnNsbiIsICRjbGVhbik7Ci0gICAgfSBl bHNpZiAoaXNMaW51eCgpKSB7CisgICAgfSBlbHNpZiAoaXNMaW51eCgpIHx8IGlzQ2hyb21pdW1B bmRyb2lkKCkpIHsKICAgICAgICAgIyBMaW51eCBidWlsZCAtIGJ1aWxkIHVzaW5nIG1ha2UuCiAg ICAgICAgICRyZXN1bHQgPSBidWlsZENocm9taXVtTWFrZWZpbGUoImFsbCIsICRjbGVhbiwgQG9w dGlvbnMpOwogICAgIH0gZWxzZSB7Cg== 111008 2011-10-14 06:22:03 -0700 2012-06-11 07:25:32 -0700 Patch script-patch-3.patch text/plain 11132 peter ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cgYi9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvQ2hhbmdlTG9nCmluZGV4IDdlOTlmN2MuLjA4N2Y5NWEgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEyIEBACisyMDExLTEwLTEzICBQZXRlciBCZXZlcmxv byAgPHBldGVyQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIEluaGVyaXQgc2V0 dGluZ3MgZnJvbSBDaHJvbWl1bSdzIGVudnNldHVwLnNoLCBhZGRyZXNzIGEgTkRLIHRvZG8KKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwMDI4CisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBKYXZhU2NyaXB0 Q29yZS5neXAvSmF2YVNjcmlwdENvcmUuZ3lwOgorCiAyMDExLTEwLTEzICBGaWxpcCBQaXpsbyAg PGZwaXpsb0BhcHBsZS5jb20+CiAKICAgICAgICAgU3BlY3VsYXRpb24gZmFpbHVyZXMgaW4gVmFs dWVUb0ludDMyIGFyZSBjYXVzaW5nIGEgMnggc2xvdy1kb3duCmRpZmYgLS1naXQgYS9Tb3VyY2Uv SmF2YVNjcmlwdENvcmUvSmF2YVNjcmlwdENvcmUuZ3lwL0phdmFTY3JpcHRDb3JlLmd5cCBiL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5neXAvSmF2YVNjcmlwdENvcmUuZ3lw CmluZGV4IDQxMjNlNTMuLjhhYmI5OTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9KYXZhU2NyaXB0Q29yZS5neXAvSmF2YVNjcmlwdENvcmUuZ3lwCisrKyBiL1NvdXJjZS9KYXZh U2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS5neXAvSmF2YVNjcmlwdENvcmUuZ3lwCkBAIC00OCw3 ICs0OCw3IEBACiAgICAgXSwKICAgfSwKICAgJ2NvbmRpdGlvbnMnOiBbCi0gICAgWydvc19wb3Np eCA9PSAxIGFuZCBPUyAhPSAibWFjIiBhbmQgZ2NjX3ZlcnNpb249PTQ2JywgeworICAgIFsnb3Nf cG9zaXggPT0gMSBhbmQgT1MgIT0gIm1hYyIgYW5kIE9TICE9ICJhbmRyb2lkIiBhbmQgZ2NjX3Zl cnNpb249PTQ2JywgewogICAgICAgJ3RhcmdldF9kZWZhdWx0cyc6IHsKICAgICAgICAgIyBEaXNh YmxlIHdhcm5pbmdzIGFib3V0IGMrKzB4IGNvbXBhdGliaWxpdHksIGFzIHNvbWUgbmFtZXMgKHN1 Y2ggYXMgbnVsbHB0cikgY29uZmxpY3QKICAgICAgICAgIyB3aXRoIHVwY29taW5nIGMrKzB4IHR5 cGVzLgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkNv cmUvQ2hhbmdlTG9nCmluZGV4IDYxNzcyODkuLjgyYjUyZjIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL0NoYW5nZUxvZworKysgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKQEAgLTEsMyAr MSwxMiBAQAorMjAxMS0xMC0xMyAgUGV0ZXIgQmV2ZXJsb28gIDxwZXRlckBjaHJvbWl1bS5vcmc+ CisKKyAgICAgICAgW0Nocm9taXVtXSBJbmhlcml0IHNldHRpbmdzIGZyb20gQ2hyb21pdW0ncyBl bnZzZXR1cC5zaCwgYWRkcmVzcyBhIE5ESyB0b2RvCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDAyOAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogV2ViQ29yZS5neXAvV2ViQ29yZS5neXA6CisKIDIwMTEt MTAtMTQgIEFuZHJlYXMgS2xpbmcgIDxrbGluZ0B3ZWJraXQub3JnPgogCiAgICAgICAgIE1lcmdl IFN0eWxlTGlzdCBpbnRvIFN0eWxlU2hlZXQuCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9X ZWJDb3JlLmd5cC9XZWJDb3JlLmd5cCBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNv cmUuZ3lwCmluZGV4IDY5NTA1MWEuLmQ2NTVkMTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L1dlYkNvcmUuZ3lwL1dlYkNvcmUuZ3lwCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUuZ3lw L1dlYkNvcmUuZ3lwCkBAIC0xMDYsNyArMTA2LDcgQEAKICAgICAgICAgJ2NmbGFncyEnOiBbJy1n J10sCiAgICAgICB9LAogICAgIH1dLAotICAgIFsnb3NfcG9zaXg9PTEgYW5kIE9TIT0ibWFjIiBh bmQgZ2NjX3ZlcnNpb249PTQ2JywgeworICAgIFsnb3NfcG9zaXg9PTEgYW5kIE9TIT0ibWFjIiBh bmQgT1MhPSJhbmRyb2lkIiBhbmQgZ2NjX3ZlcnNpb249PTQ2JywgewogICAgICAgJ3RhcmdldF9k ZWZhdWx0cyc6IHsKICAgICAgICAgIyBEaXNhYmxlIHdhcm5pbmdzIGFib3V0IGMrKzB4IGNvbXBh dGliaWxpdHksIGFzIHNvbWUgbmFtZXMgKHN1Y2ggYXMgbnVsbHB0cikgY29uZmxpY3QKICAgICAg ICAgIyB3aXRoIHVwY29taW5nIGMrKzB4IHR5cGVzLgpAQCAtMTY2Myw3ICsxNjYzLDcgQEAKICAg ICAgICAgICAgIFsnZXhjbHVkZScsICdyZW5kZXJpbmcvUmVuZGVyVGhlbWVDaHJvbWl1bVNraWFc XC5jcHAkJ10sCiAgICAgICAgICAgXSwKICAgICAgICAgfV0sCi0gICAgICAgIFsnb3NfcG9zaXgg PT0gMSBhbmQgT1MgIT0gIm1hYyIgYW5kIGdjY192ZXJzaW9uID09IDQyJywgeworICAgICAgICBb J29zX3Bvc2l4ID09IDEgYW5kIE9TICE9ICJtYWMiIGFuZCBPUyAhPSAiYW5kcm9pZCIgYW5kIGdj Y192ZXJzaW9uID09IDQyJywgewogICAgICAgICAgICMgRHVlIHRvIGEgYnVnIGluIGdjYyA0LjIu MSAodGhlIGN1cnJlbnQgdmVyc2lvbiBvbiBoYXJkeSksIHdlIGdldAogICAgICAgICAgICMgd2Fy bmluZ3MgYWJvdXQgdW5pbml0aWFsaXplZCB0aGlzLgogICAgICAgICAgICdjZmxhZ3MnOiBbJy1X bm8tdW5pbml0aWFsaXplZCddLApAQCAtMTc5OSw3ICsxNzk5LDcgQEAKICAgICAgICAgICAgIFsn aW5jbHVkZScsICcvVHJhbnNwYXJlbmN5V2luXFwuY3BwJCddLAogICAgICAgICAgIF0sCiAgICAg ICAgIH1dLAotICAgICAgICBbJ29zX3Bvc2l4ID09IDEgYW5kIE9TICE9ICJtYWMiIGFuZCBnY2Nf dmVyc2lvbiA9PSA0MicsIHsKKyAgICAgICAgWydvc19wb3NpeCA9PSAxIGFuZCBPUyAhPSAibWFj IiBhbmQgT1MgIT0gImFuZHJvaWQiIGFuZCBnY2NfdmVyc2lvbiA9PSA0MicsIHsKICAgICAgICAg ICAjIER1ZSB0byBhIGJ1ZyBpbiBnY2MgNC4yLjEgKHRoZSBjdXJyZW50IHZlcnNpb24gb24gaGFy ZHkpLCB3ZSBnZXQKICAgICAgICAgICAjIHdhcm5pbmdzIGFib3V0IHVuaW5pdGlhbGl6ZWQgdGhp cy4KICAgICAgICAgICAnY2ZsYWdzJzogWyctV25vLXVuaW5pdGlhbGl6ZWQnXSwKZGlmZiAtLWdp dCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9DaGFuZ2VMb2cKaW5kZXggMTViNDJmNC4uZmU5N2M5MiAxMDA2NDQKLS0tIGEvU291cmNl L1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMS0xMC0xMyAgUGV0ZXIgQmV2ZXJsb28gIDxw ZXRlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBJbmhlcml0IHNldHRpbmdz IGZyb20gQ2hyb21pdW0ncyBlbnZzZXR1cC5zaCwgYWRkcmVzcyBhIE5ESyB0b2RvCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD03MDAyOAorCisgICAgICAg IFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogV2ViS2l0Lmd5cDoKKyAg ICAgICAgKiBneXBfd2Via2l0OgorCiAyMDExLTEwLTEyICBIYW5zIFdlbm5ib3JnICA8aGFuc0Bj aHJvbWl1bS5vcmc+CiAKICAgICAgICAgSW5kZXhlZERCOiBSZW1vdmUgU1FMaXRlIGJhY2tpbmcg c3RvcmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cCBiL1Nv dXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Lmd5cAppbmRleCAwMGIzZjllLi4xODYxMWE2IDEw MDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5neXAKKysrIGIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9XZWJLaXQuZ3lwCkBAIC0xMzQ5LDcgKzEzNDksNyBAQAogICAgICAg ICAgICAgICAgICdzb3VyY2VzJzogWycuLi8uLi8uLi9Ub29scy9EdW1wUmVuZGVyVHJlZS9jaHJv bWl1bS9MYXlvdXRUZXN0SGVscGVyV2luLmNwcCddLAogICAgICAgICAgICAgfV0sCiAgICAgICAg IH1dLAotICAgICAgICBbJ29zX3Bvc2l4PT0xIGFuZCBPUyE9Im1hYyIgYW5kIGdjY192ZXJzaW9u PT00NicsIHsKKyAgICAgICAgWydvc19wb3NpeD09MSBhbmQgT1MhPSJtYWMiIGFuZCBPUyE9ImFu ZHJvaWQiIGFuZCBnY2NfdmVyc2lvbj09NDYnLCB7CiAgICAgICAgICAgICAndGFyZ2V0X2RlZmF1 bHRzJzogewogICAgICAgICAgICAgICAgICMgRGlzYWJsZSB3YXJuaW5ncyBhYm91dCBjKysweCBj b21wYXRpYmlsaXR5LCBhcyBzb21lIG5hbWVzIChzdWNoCiAgICAgICAgICAgICAgICAgIyBhcyBu dWxscHRyKSBjb25mbGljdCB3aXRoIHVwY29taW5nIGMrKzB4IHR5cGVzLgpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYktpdC9jaHJvbWl1bS9neXBfd2Via2l0IGIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9neXBfd2Via2l0CmluZGV4IDMyMzkzNjguLjkyNTYzOTYgMTAwNzU1Ci0tLSBhL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vZ3lwX3dlYmtpdAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2d5 cF93ZWJraXQKQEAgLTMzLDYgKzMzLDcgQEAKIGltcG9ydCBnbG9iCiBpbXBvcnQgb3MKIGltcG9y dCBzaGxleAoraW1wb3J0IHN1YnByb2Nlc3MKIGltcG9ydCBzeXMKIAogc2NyaXB0X2RpciA9IG9z LnBhdGguZGlybmFtZShfX2ZpbGVfXykKQEAgLTc3LDYgKzc4LDE4IEBAIGlmIF9fbmFtZV9fID09 ICdfX21haW5fXyc6CiAKICAgYXJncyA9IHN5cy5hcmd2WzE6XQogCisgICMgV2hlbiBidWlsZGlu ZyB0aGUgV2ViS2l0IENocm9taXVtIHBvcnQgZm9yIEFuZHJvaWQsIHdlIGhhdmUgdG8gY3Jvc3Mt Y29tcGlsZQorICAjIHRoZSBzb3VyY2UgdG8gQVJNLCBjaGVjayBmb3IgdGhlIHJpZ2h0IEFuZHJv aWQgTkRLIGFuZCBzZXQgdGhlIGFwcHJvcHJpYXRlCisgICMgR1lQIGZsYWdzLiBDaHJvbWl1bSdz IGVudnNldHVwLnNoIHNjcmlwdCB3aWxsIGhhbmRsZSB0aGVzZSBzdGVwcywgYnV0IGFzIGl0Cisg ICMgZXhwb3J0cyB2YXJpYWJsZXMgYW5kIGNvbW1hbmRzIHdlIGhhdmUgdG8gcmUtY2FsbCBvdXJz ZWx2ZXMgYWZ0ZXJ3YXJkcy4KKyAgaWYgJ1dFQktJVF9BTkRST0lEX0JVSUxEJyBpbiBvcy5lbnZp cm9uOgorICAgIGlmIG5vdCAnLS1uby1lbnZzZXR1cC1yZWN1cnNpb24nIGluIGFyZ3M6CisgICAg ICBlbnZzZXR1cF9sb2NhdGlvbiA9IG9zLnBhdGguam9pbihjaHJvbWVfc3JjLCAnYnVpbGQnLCAn YW5kcm9pZCcsICdlbnZzZXR1cC5zaCcpCisgICAgICBleGl0KHN1YnByb2Nlc3MuY2FsbChbJ2Jh c2gnLCAnLWMnLCAnc291cmNlICVzICYmIHB5dGhvbiBneXBfd2Via2l0IC0tbm8tZW52c2V0dXAt cmVjdXJzaW9uICVzJyAlIChlbnZzZXR1cF9sb2NhdGlvbiwgJyAnLmpvaW4oYXJncykpXSkpCisg ICAgZWxzZToKKyAgICAgIG9zLmVudmlyb25bJ0NDLnRhcmdldCddID0gb3MuZW52aXJvblsnQ1JP U1NfQ0MnXQorICAgICAgYXJncy5yZW1vdmUoJy0tbm8tZW52c2V0dXAtcmVjdXJzaW9uJykKKwog ICAjIEFkZCBpbmNsdWRlcy4KICAgYXJncy5leHRlbmQoWyctSScgKyBpIGZvciBpIGluIGFkZGl0 aW9uYWxfaW5jbHVkZV9maWxlcyhhcmdzKV0pCiAKQEAgLTkwLDcgKzEwMyw3IEBAIGlmIF9fbmFt ZV9fID09ICdfX21haW5fXyc6CiAgICAgYXJncy5hcHBlbmQoJy0tbm8tY2lyY3VsYXItY2hlY2sn KQogCiAgICMgT24gbGludXgsIHdlIHdhbnQgZ3lwIHRvIG91dHB1dCBhIG1ha2VmaWxlIChkZWZh dWx0IGlzIHNjb25zKS4KLSAgaWYgc3lzLnBsYXRmb3JtLnN0YXJ0c3dpdGgoJ2xpbnV4Jykgb3Ig J0dZUF9BTkRST0lEX0JVSUxEJyBpbiBvcy5lbnZpcm9uOgorICBpZiBzeXMucGxhdGZvcm0uc3Rh cnRzd2l0aCgnbGludXgnKSBvciAnV0VCS0lUX0FORFJPSURfQlVJTEQnIGluIG9zLmVudmlyb246 CiAgICAgYXJncy5leHRlbmQoWyctZm1ha2UnLAogICAgICAgICAgICAgICAgICAnLS1zdWZmaXg9 LmNocm9taXVtJywKICAgICAgICAgICAgICAgICAgJy0tdG9wbGV2ZWwtZGlyPS4uLy4uLy4uJywK ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBiMDA4 Mzc2OS4uZDBlMTk1YyAxMDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0No YW5nZUxvZwpAQCAtMSwzICsxLDE1IEBACisyMDExLTEwLTEzICBQZXRlciBCZXZlcmxvbyAgPHBl dGVyQGNocm9taXVtLm9yZz4KKworICAgICAgICBbQ2hyb21pdW1dIEluaGVyaXQgc2V0dGluZ3Mg ZnJvbSBDaHJvbWl1bSdzIGVudnNldHVwLnNoLCBhZGRyZXNzIGEgTkRLIHRvZG8KKyAgICAgICAg aHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTcwMDI4CisKKyAgICAgICAg UmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3VwZGF0ZS13 ZWJraXQtY2hyb21pdW06CisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJzLnBtOgorICAgICAg ICAoYnVpbGRDaHJvbWl1bU1ha2VmaWxlKToKKyAgICAgICAgKGJ1aWxkQ2hyb21pdW0pOgorCiAy MDExLTEwLTEzICBPamFuIFZhZmFpICA8b2phbkBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgTWFr ZSBmaWx0ZXItYnVpbGQtd2Via2l0IGV4aXQgMSBpZiB0aGUgYnVpbGQgZmFpbHMuCmRpZmYgLS1n aXQgYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW0gYi9Ub29scy9TY3JpcHRz L3VwZGF0ZS13ZWJraXQtY2hyb21pdW0KaW5kZXggOTJlNzZhYy4uMTYyN2FiNiAxMDA3NTUKLS0t IGEvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtCisrKyBiL1Rvb2xzL1Njcmlw dHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bQpAQCAtNTgsMTIgKzU4LDI0IEBAIGlmICghIC1lICIu Z2NsaWVudCIpIHsKICAgICAgICAgICAgIi0tc3BlYz1zb2x1dGlvbnM9W3snbmFtZSc6Jy4vJywn dXJsJzpOb25lfV0iKSA9PSAwIG9yIGRpZSAkITsKIH0KIAotIyBTZXQgY2VydGFpbiBneXAgc2V0 dGluZ3MgZm9yIHRoZSBBbmRyb2lkIGJ1aWxkCisjIFdoZW4gYnVpbGRpbmcgV2ViS2l0J3MgQ2hy b21pdW0gcG9ydCBmb3IgQW5kcm9pZCwgd2UgbmVlZCB0aGUgQW5kcm9pZCBOREsgYXMKKyMgaXQg d2lsbCBhbGxvdyB1cyB0byBjcm9zcy1jb21waWxlIGFsbCBzb3VyY2VzIHRvIHRoZSB0YXJnZXQg YXJjaGl0ZWN0dXJlLgogaWYgKGlzQ2hyb21pdW1BbmRyb2lkKCkpIHsKLSAgICAjIEZJWE1FOiBB ZGQgY29kZSB0byBhdXRvbWF0aWNhbGx5IGRvd25sb2FkIHRoZSBOREsKLSAgICBteSAkaG9zdF9v cyA9IGlzTGludXgoKSA/ICJsaW51eCIgOiAibWFjIjsKLSAgICAkRU5We0dZUF9ERUZJTkVTfSA9 ICJPUz1hbmRyb2lkIGhvc3Rfb3M9IiAuICRob3N0X29zIC4gIiB0YXJnZXRfYXJjaD1hcm0gYXJt X25lb249MSBhcm12Nz0xIGFybV90aHVtYj0xIGxpbnV4X2ZwaWM9MSB1c2Vfb3BlbnNzbD0xIHVz ZV9zeXN0ZW1fbGlianBlZz0wIGxpbnV4X3VzZV90Y21hbGxvYz0wIjsKLSAgICAkRU5We0dZUF9B TkRST0lEX0JVSUxEfSA9IDE7CisgICAgaWYgKCEgLWUgInRoaXJkX3BhcnR5L2FuZHJvaWQtbmRr LXI2YiIpIHsKKyAgICAgICAgcHJpbnQgIkluc3RhbGxpbmcgdGhlIEFuZHJvaWQgTkRLLCB2ZXJz aW9uIDZiLi4uXG4iOworICAgICAgICBpZiAoISAtZSAidGhpcmRfcGFydHkvIikgeworICAgICAg ICAgICAgbWtkaXIgInRoaXJkX3BhcnR5IjsKKyAgICAgICAgfQorICAgICAgICBteSAkaG9zdF9v cyA9IGlzTGludXgoKSA/ICJsaW51eCIgOiAiZGFyd2luIjsKKyAgICAgICAgbXkgJHJlc3VsdCA9 IHN5c3RlbSgiY3VybCIsICItbyIsICJ0aGlyZF9wYXJ0eS9hbmRyb2lkLW5kay1yNmIudGFyLmJ6 MiIsICJodHRwOi8vZGwuZ29vZ2xlLmNvbS9hbmRyb2lkL25kay9hbmRyb2lkLW5kay1yNmItIiAu ICRob3N0X29zIC4gIi14ODYudGFyLmJ6MiIpOworICAgICAgICBkaWUgIkNvdWxkbid0IGRvd25s b2FkIHRoZSBBbmRyb2lkIE5ESy4iIGlmICRyZXN1bHQ7CisKKyAgICAgICAgJHJlc3VsdCA9IHN5 c3RlbSgidGFyIiwgImp4QyIsICJ0aGlyZF9wYXJ0eSIsICItZiIsICJ0aGlyZF9wYXJ0eS9hbmRy b2lkLW5kay1yNmIudGFyLmJ6MiIpOworICAgICAgICBkaWUgIkNvdWxkbid0IGV4dHJhY3QgdGhl IEFuZHJvaWQgTkRLLiIgaWYgJHJlc3VsdDsKKyAgICB9CisKKyAgICAkRU5We0FORFJPSURfTkRL X1JPT1R9ID0gc291cmNlRGlyKCkgLiAiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGhpcmRfcGFy dHkvYW5kcm9pZC1uZGstcjZiIjsKKyAgICAkRU5We1dFQktJVF9BTkRST0lEX0JVSUxEfSA9IDE7 CiB9CiAKIG15ICRmb3JjZSA9IDA7CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRp cnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggYmM1YzliZS4uNGIwYmRk MyAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1Nj cmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtMTkwOCw3ICsxOTA4LDIwIEBAIHN1YiBidWlsZENocm9t aXVtTWFrZWZpbGUoJCRAKQogICAgICAgICAkbWFrZUFyZ3MgPSAkMSBpZiAvXi0tbWFrZWFyZ3M9 KC4qKS9pOwogICAgIH0KICAgICAkbWFrZUFyZ3MgPSAiLWokbnVtQ3B1cyIgaWYgbm90ICRtYWtl QXJnczsKLSAgICBteSAkY29tbWFuZCA9ICJtYWtlIC1mTWFrZWZpbGUuY2hyb21pdW0gJG1ha2VB cmdzIEJVSUxEVFlQRT0kY29uZmlnICR0YXJnZXQiOworICAgIG15ICRjb21tYW5kID0gIiI7CisK KyAgICAjIEJ1aWxkaW5nIHRoZSBXZWJLaXQgQ2hyb21pdW0gcG9ydCBmb3IgQW5kcm9pZCByZXF1 aXJlcyB1cyB0byBjcm9zcy0KKyAgICAjIGNvbXBpbGUsIHdoaWNoIHdpbGwgYmUgc2V0IHVwIGJ5 IENocm9taXVtJ3MgZW52c2V0dXAuc2guIFRoZSBzY3JpcHQgaXRzZWxmCisgICAgIyB3aWxsIHZl cmlmeSB0aGF0IHRoZSBpbnN0YWxsZWQgTkRLIGlzIGluZGVlZCBhdmFpbGFibGUuCisgICAgaWYg KGlzQ2hyb21pdW1BbmRyb2lkKCkpIHsKKyAgICAgICAgJGNvbW1hbmQgLj0gImJhc2ggLWMgXCJz b3VyY2UgIiAuIHNvdXJjZURpcigpIC4gIi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2J1aWxkL2Fu ZHJvaWQvZW52c2V0dXAuc2ggJiYgIjsKKyAgICAgICAgJEVOVntBTkRST0lEX05ES19ST09UfSA9 IHNvdXJjZURpcigpIC4gIi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3RoaXJkX3BhcnR5L2FuZHJv aWQtbmRrLXI2YiI7CisgICAgICAgICRFTlZ7V0VCS0lUX0FORFJPSURfQlVJTER9ID0gMTsKKyAg ICB9CisKKyAgICAkY29tbWFuZCAuPSAibWFrZSAtZk1ha2VmaWxlLmNocm9taXVtICRtYWtlQXJn cyBCVUlMRFRZUEU9JGNvbmZpZyAkdGFyZ2V0IjsKKyAgICAkY29tbWFuZCAuPSAiXCIiIGlmIGlz Q2hyb21pdW1BbmRyb2lkKCk7CisKICAgICBwcmludCAiJGNvbW1hbmRcbiI7CiAgICAgcmV0dXJu IHN5c3RlbSAkY29tbWFuZDsKIH0KQEAgLTE5NjMsMjkgKzE5NzYsMTMgQEAgc3ViIGJ1aWxkQ2hy b21pdW0oJEApCiAgICAgfQogCiAgICAgbXkgJHJlc3VsdCA9IDE7Ci0gICAgaWYgKGlzQ2hyb21p dW1BbmRyb2lkKCkpIHsKLSAgICAgICAgIyBCdWlsZGluZyBDaHJvbWl1bSBmb3IgQW5kcm9pZCBu ZWVkcyB0byBjcm9zcy1jb21waWxlIHVzaW5nIHRoZQotICAgICAgICAjIFRvb2xjaGFpbnMgc3Vw cGxpZWQgYnkgdGhlIEFuZHJvaWQgTkRLLgotICAgICAgICBteSAkbmRrQmFzZURpciA9IHNvdXJj ZURpcigpIC4gIi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL3RoaXJkX3BhcnR5L2FuZHJvaWQtbmRr LXI2IjsKLSAgICAgICAgbXkgJHBsYXRmb3JtID0gaXNEYXJ3aW4oKSA/ICJkYXJ3aW4teDg2IiA6 ICJsaW51eC14ODYiOwotCi0gICAgICAgIG15ICR0b29sY2hhaW5CYXNlID0gJG5ka0Jhc2VEaXIg LiAiL3Rvb2xjaGFpbnMvYXJtLWxpbnV4LWFuZHJvaWRlYWJpLTQuNC4zL3ByZWJ1aWx0LyIgLiAk cGxhdGZvcm0gLiAiL2Jpbi9hcm0tbGludXgtYW5kcm9pZGVhYmktIjsKLQotICAgICAgICAkRU5W e0FSfSA9ICR0b29sY2hhaW5CYXNlIC4gImFyIjsKLSAgICAgICAgJEVOVntDQ30gPSAkdG9vbGNo YWluQmFzZSAuICJnY2MiOwotICAgICAgICAkRU5We0NYWH0gPSAkdG9vbGNoYWluQmFzZSAuICJn KysiOwotICAgICAgICAkRU5We0xJTkt9ID0gJHRvb2xjaGFpbkJhc2UgLiAiZ2NjIjsKLSAgICAg ICAgJEVOVntSQU5MSUJ9ID0gJHRvb2xjaGFpbkJhc2UgLiAicmFubGliIjsKLSAgICAgICAgJEVO VntTVFJJUH0gPSAkdG9vbGNoYWluQmFzZSAuICJzdHJpcCI7Ci0KLSAgICAgICAgJHJlc3VsdCA9 IGJ1aWxkQ2hyb21pdW1NYWtlZmlsZSgiYWxsIiwgJGNsZWFuKTsKLSAgICB9IGVsc2lmIChpc0Rh cndpbigpKSB7CisgICAgaWYgKGlzRGFyd2luKCkgJiYgIWlzQ2hyb21pdW1BbmRyb2lkKCkpIHsK ICAgICAgICAgIyBNYWMgYnVpbGQgLSBidWlsZHMgdGhlIHJvb3QgeGNvZGUgcHJvamVjdC4KICAg ICAgICAgJHJlc3VsdCA9IGJ1aWxkWENvZGVQcm9qZWN0KCJTb3VyY2UvV2ViS2l0L2Nocm9taXVt L1dlYktpdCIsICRjbGVhbiwgIi1jb25maWd1cmF0aW9uIiwgY29uZmlndXJhdGlvbigpLCBAb3B0 aW9ucyk7CiAgICAgfSBlbHNpZiAoaXNDeWd3aW4oKSB8fCBpc1dpbmRvd3MoKSkgewogICAgICAg ICAjIFdpbmRvd3MgYnVpbGQgLSBidWlsZHMgdGhlIHJvb3QgdmlzdWFsIHN0dWRpbyBzb2x1dGlv bi4KICAgICAgICAgJHJlc3VsdCA9IGJ1aWxkQ2hyb21pdW1WaXN1YWxTdHVkaW9Qcm9qZWN0KCJT b3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdC5zbG4iLCAkY2xlYW4pOwotICAgIH0gZWxzaWYg KGlzTGludXgoKSkgeworICAgIH0gZWxzaWYgKGlzTGludXgoKSB8fCBpc0Nocm9taXVtQW5kcm9p ZCgpKSB7CiAgICAgICAgICMgTGludXggYnVpbGQgLSBidWlsZCB1c2luZyBtYWtlLgogICAgICAg ICAkcmVzdWx0ID0gYnVpbGRDaHJvbWl1bU1ha2VmaWxlKCJhbGwiLCAkY2xlYW4sIEBvcHRpb25z KTsKICAgICB9IGVsc2Ugewo=