79780 2012-02-28 05:17:06 -0800 [Chromium] Automatically install 64-bit linker for Android 2012-05-31 02:23:11 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84843 1 peter peter abarth dpranke eric jrg satish tony oldest_to_newest 566594 0 peter 2012-02-28 05:17:06 -0800 [Chromium] Update Android NDK to r7b, automatically install 64-bit linker 566596 1 129232 peter 2012-02-28 05:23:30 -0800 Created attachment 129232 Patch 566758 2 129232 abarth 2012-02-28 09:03:11 -0800 Comment on attachment 129232 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=129232&action=review > Source/WebKit/chromium/DEPS:177 > + # Directly referring to chromium_deps variable isn't possible, as the > + # dependency is not listed in Chromium's main DEPS file. > + 'third_party/aosp': > + 'http://src.chromium.org/svn/trunk/deps/third_party/aosp@122156', Is maintaining this version number going to be a hassle? Currently we just need to increment one number in this file. Can we refactor Chromium's main DEPS file or improve gclient so we can get the right version automatically? 566834 3 peter 2012-02-28 10:18:43 -0800 (In reply to comment #2) > Is maintaining this version number going to be a hassle? Currently we just need to increment one number in this file. Can we refactor Chromium's main DEPS file or improve gclient so we can get the right version automatically? Android's DEPS additions are being controlled in a separate gyp repository here: http://git.chromium.org/gitweb/?p=chromium/tools/android.deps.git;a=summary An alternative approach would be to include this repository in the gclient configuration file (update-webkit-chromium:58) in case the checkout is for Android. The issue here is that this follows Chromium's path structure, thus prefixing everything with "src/", which we don't want for WebKit. Chromium's WebKit port solves this by referring to the DEPS file in the online repository and pulling the dependency from there using our own naming. I've tried getting this to work with an online version of the DEPS file, but to no avail (http://git.chromium.org/gitweb/?p=chromium/tools/android.deps.git;a=blob_plain;h=ff1118) -- it seems to try to svn checkout a git directory which obviously is not going to work. I'll look into gclient to see if I can somehow get it to check out the android.deps.git file and base the other dependencies off that. 567780 4 peter 2012-02-29 11:39:06 -0800 The File() function in DEPS files is used to check out a single file from a subversion repository. The Android-specific DEPS file we're requiring is only available on git, so that won't fly in it's current form. Checking out a single file from a git repository requires us to clone it, and while that may be fine in this (uncommon) case, it could result in tons of unnecessary traffic elsewhere. A third option would be to add a "Url()" method to gclient which would download the page over HTTP, through the web-viewer. These options are both quite severe and would require quite some changes in gclient. Making the DEPS file (probably the entire repository) available over SVN would be another option, but this would have to be mirrored with the GIT repository as the master (given that Chromium depends on GIT right now). Given that the linker shouldn't require (frequent) updates I think that, for now, it's fine. I'll discuss internally to see what the ideal way would be to get WebKit to be able to access Android's DEPS file. 577504 5 131659 peter 2012-03-13 10:29:40 -0700 Created attachment 131659 Patch 577513 6 peter 2012-03-13 10:35:13 -0700 I moved the update to the Android NDK r7b to Bug 81005. This patch has been tested with both versions of the NDK. At least for now, I don't foresee many changes to the Android-specific DEPS file which would cause too much duplication. Furthermore, since it[1] will be updated on Chromium's schedule, referring to it directly may pull in different versions of files for which WebKit's Chromium version has not yet been updated. Until we've got more insight in what the DEPS file will be used for (as seen from WebKit's interest) aside from the custom linker and Freetype repository, I think we should be fine for now. [1] http://git.chromium.org/gitweb/?p=chromium/tools/android.deps.git;a=blob;f=DEPS 577713 7 abarth 2012-03-13 13:08:09 -0700 It seems like the proper way to solve this problem is to follow the dependency chain: Use the chromium_rev in Source/WebKit/chromium/DEPS to get the proper version of android.deps/DEPS and then look in that file to get the proper version of aosp. Having the version number hard-coded here is going to be a maintenance burden. 577715 8 peter 2012-03-13 13:10:29 -0700 Yes, and there lies the problem: android.deps/DEPS is only available over git, and gclient has no way of referring to that. Adding dpranke; Dirk, would you have any idea on how to solve this in a clean way? 577763 9 abarth 2012-03-13 13:41:17 -0700 If we're going to use git to store DEPS files, it seems like we need to teach gclient how to use git. Another solution is to store the DEPS file in an SVN repo. 577838 10 131659 dpranke 2012-03-13 14:56:11 -0700 Comment on attachment 131659 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=131659&action=review > Source/WebKit/chromium/DEPS:176 > + 'http://src.chromium.org/svn/trunk/deps/third_party/aosp@122156', Can you get this using the "From()" feature in gclient? I've never used it, but I think the syntax is something like 'android_deps': File('http://git.chromium.org/gitweb/?p=chromium/tools/android.deps.git;a=blob;f=DEPS'), 'third_party/aosp': From('android_deps', 'third_party/aosp'), or something like that (there other are examples in this file). However, it seems like you still need to fix a revision of the chromium git repo (since we wouldn't want to just pick HEAD), and since you can't use the svn revision for this, you will still have two numbers to update, so I'm not sure that it's an improvement. It seems bad to me to have a git-only thing in the chromium repo, since everything else works for either svn or git. 577839 11 dpranke 2012-03-13 14:56:42 -0700 Tony knows the webkit / gclient hooks better than I; Tony, any ideas? 577924 12 tony 2012-03-13 15:47:57 -0700 (In reply to comment #4) > Checking out a single file from a git repository requires us to clone it, and while that may be fine in this (uncommon) case, it could result in tons of unnecessary traffic elsewhere. This seems reasonable to me. You would just need to update File() to understand git. I agree that cloning the whole repository seems like a waste, but you could use --depth 1 and -n to avoid pulling the whole history or writing a bunch of files to disk (reference: http://stackoverflow.com/a/2466755 ). How does it work for Chromium checkouts? Is it a separate solution entry in your .gclient file? Alternately, maybe we can add the git clone of android.deps.git to update-webkit-chromium (or maybe this script can add it to the .gclient file). 605909 13 131659 peter 2012-04-19 14:29:02 -0700 Comment on attachment 131659 Patch We're fixing infrastructure to do this the right way, the first patches are already in-flight (elsewhere). I'll upload a new patch once that has been done. 637173 14 144802 peter 2012-05-30 06:58:55 -0700 Created attachment 144802 Patch 637175 15 peter 2012-05-30 07:01:25 -0700 New patch, I would appreciate it if you could take a look! We're now ready to start deprecating the android.deps.git repository in favor of using gclient's new target_os feature and the main DEPS file. As part of that, the versioning issue has been resolved and we now inherit the revision data from Chromium, as pretty much all other dependencies do. 637455 16 144802 abarth 2012-05-30 11:19:13 -0700 Comment on attachment 144802 Patch Thanks. 637457 17 abarth 2012-05-30 11:20:07 -0700 Peter, thanks for doing this the right way. I really appreciate it. 637463 18 peter 2012-05-30 11:22:45 -0700 (In reply to comment #17) > Peter, thanks for doing this the right way. I really appreciate it. That's ok, it's the approach which should have been taken straight away. Thank you for the review! I'll wait for Ami's Chromium DEPS roll to land after which I'll put the patch on the CQ. 637484 19 144881 peter 2012-05-30 11:36:15 -0700 Created attachment 144881 Patch for landing 638139 20 peter 2012-05-31 02:23:11 -0700 Committed r119077: <http://trac.webkit.org/changeset/119077> 129232 2012-02-28 05:23:30 -0800 2012-03-13 10:29:34 -0700 Patch bug-79780-20120228132329.patch text/plain 6869 peter U3VidmVyc2lvbiBSZXZpc2lvbjogMTA5MDkzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDY4ZDI4ZjUzNDJmOGE0YTkyYzVhYmM0M2NlY2NiOTZiODJiNDFmZTAuLjIyYTg5ODQ0MjA3ZThl OGU2ZDY2MmY5MGU5NWM5NGUwOGJiODk3ZTggMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTItMDItMjggIFBldGVyIEJldmVybG9vICA8cGV0ZXJAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gVXBkYXRlIEFuZHJvaWQgTkRLIHRvIHI3Yiwg YXV0b21hdGljYWxseSBpbnN0YWxsIDY0LWJpdCBsaW5rZXIKKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTc5NzgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkg Tk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIHRoZSBBT1NQIHRoaXJkIHBhcnR5IHJlcG9z aXRvcnkgdG8gdGhlIEFuZHJvaWQtc3BlY2lmaWMgREVQUworICAgICAgICBlbnRyaWVzLiBUaGlz IHdpbGwgcHVsbCBpbiB0aGUgNjQtYml0IGxpbmtlci4gUmVmZXIgZGlyZWN0bHkgdG8gdGhlCisg ICAgICAgIGRlcGVuZGVuY3kgYXMgaXQncyBub3QgbGlzdGVkIGluIENocm9taXVtJ3MgZGVmYXVs dCBERVBTIGZpbGUuCisKKyAgICAgICAgKiBERVBTOgorCiAyMDEyLTAyLTI3ICBKYW1lcyBLb3pp YW5za2kgIDxrb3pAY2hyb21pdW0ub3JnPgogCiAgICAgICAgIEFkZCBtaXNzaW5nIHBhcmFtZXRl ciB0byBkaWRDcmVhdGVTY3JpcHRDb250ZXh0KCkgc28gaXQgb3ZlcnJpZGVzIGJhc2UgY2xhc3Mg YWdhaW4uCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0RFUFMgYi9Tb3VyY2Uv V2ViS2l0L2Nocm9taXVtL0RFUFMKaW5kZXggYmE0MjI0NDVjNDllNjU3YWEwODgzMWQ4ZWRlNjVj NmQyNmUxM2ZiMy4uNjU2ZjgzNTBlYTdlZDliMGFiMDkzN2IwYjBlNzAzNWE4ZTJhZjAxYSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9ERVBTCisrKyBiL1NvdXJjZS9XZWJLaXQv Y2hyb21pdW0vREVQUwpAQCAtMTcxLDYgKzE3MSwxMCBAQCBkZXBzX29zID0gewogICAnYW5kcm9p ZCc6IHsKICAgICAndGhpcmRfcGFydHkvZnJlZXR5cGUnOgogICAgICAgJ2h0dHBzOi8vZ2l0LmNo cm9taXVtLm9yZy9jaHJvbWl1bS9zcmMvdGhpcmRfcGFydHkvZnJlZXR5cGUuZ2l0JywKKyAgICAj IERpcmVjdGx5IHJlZmVycmluZyB0byBjaHJvbWl1bV9kZXBzIHZhcmlhYmxlIGlzbid0IHBvc3Np YmxlLCBhcyB0aGUKKyAgICAjIGRlcGVuZGVuY3kgaXMgbm90IGxpc3RlZCBpbiBDaHJvbWl1bSdz IG1haW4gREVQUyBmaWxlLgorICAgICd0aGlyZF9wYXJ0eS9hb3NwJzoKKyAgICAgICdodHRwOi8v c3JjLmNocm9taXVtLm9yZy9zdm4vdHJ1bmsvZGVwcy90aGlyZF9wYXJ0eS9hb3NwQDEyMjE1Nics CiAgIH0sCiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxv ZwppbmRleCA4NmIxMWM4OTZjZDgyMzg3ZWM0NjMxNDAyMmQ4YThjYTIxMmQwNGQ3Li4zZjAwMDZl MGNlYzVjM2E1NzljYjQ5YThmOTc0NGY4NDE5M2Y4MDBmIDEwMDY0NAotLS0gYS9Ub29scy9DaGFu Z2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjAgQEAKKzIwMTItMDItMjgg IFBldGVyIEJldmVybG9vICA8cGV0ZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1 bV0gVXBkYXRlIEFuZHJvaWQgTkRLIHRvIHI3YiwgYXV0b21hdGljYWxseSBpbnN0YWxsIDY0LWJp dCBsaW5rZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lk PTc5NzgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAg VXBkYXRlIHRoZSBBbmRyb2lkIE5ESyB0byB2ZXJzaW9uIHI3Yi4gRnVydGhlcm1vcmUsIGFkZCB0 d28gcm91dGluZXMKKyAgICAgICAgd2hpY2ggZGV0ZWN0IHdoZXRoZXIgdGhlIDY0LWJpdCBsaW5r ZXIgaGFzIGJlZW4gaW5zdGFsbGVkIGZvciBMaW51eAorICAgICAgICBjb21waWxhdGlvbnMsIGFu ZCBpbnN0YWxscyB0aGVtIGlmIHRoZXkgaGF2ZW4ndC4KKworICAgICAgICAqIFNjcmlwdHMvdXBk YXRlLXdlYmtpdC1jaHJvbWl1bToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06Cisg ICAgICAgIChidWlsZENocm9taXVtTWFrZWZpbGUpOgorICAgICAgICAoY2hyb21pdW1JbnN0YWxs NjRCaXRBbmRyb2lkTGlua2VySWZOZWVkZWQpOgorICAgICAgICAoY2hyb21pdW1SZXBsYWNlQW5k cm9pZExpbmtlcklmTmVlZGVkKToKKwogMjAxMi0wMi0yNyAgU2hlcmlmZiBCb3QgIDx3ZWJraXQu cmV2aWV3LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgcm9sbGluZyBvdXQg cjEwOTA0MS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1 bSBiL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bQppbmRleCA4NDA2YjFkMDE4 MDc0ZWM1MzVmZGFkMjcwZWFhNGY2YmY5MTUwMmVjLi40MzMxNmZjYjlkYjUyNDcxYWFjMzgyNDE3 MDJmMzZlZTdmNjRlNzY0IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQt Y2hyb21pdW0KKysrIGIvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtCkBAIC02 MSwxNyArNjEsMjMgQEAgaWYgKCEgLWUgIi5nY2xpZW50IikgewogIyBXaGVuIGJ1aWxkaW5nIFdl YktpdCdzIENocm9taXVtIHBvcnQgZm9yIEFuZHJvaWQsIHdlIG5lZWQgdGhlIEFuZHJvaWQgTkRL IGFzCiAjIGl0IHdpbGwgYWxsb3cgdXMgdG8gY3Jvc3MtY29tcGlsZSBhbGwgc291cmNlcyB0byB0 aGUgdGFyZ2V0IGFyY2hpdGVjdHVyZS4KIGlmIChpc0Nocm9taXVtQW5kcm9pZCgpKSB7Ci0gICAg aWYgKCEgLWUgImFuZHJvaWQtbmRrLXI3IikgewotICAgICAgICBwcmludCAiSW5zdGFsbGluZyB0 aGUgQW5kcm9pZCBOREssIHZlcnNpb24gNy4uLlxuIjsKKyAgICBpZiAoISAtZSAiYW5kcm9pZC1u ZGstcjdiIikgeworICAgICAgICBwcmludCAiSW5zdGFsbGluZyB0aGUgQW5kcm9pZCBOREssIHZl cnNpb24gN2IuLi5cbiI7CiAgICAgICAgIG15ICRob3N0X29zID0gaXNMaW51eCgpID8gImxpbnV4 IiA6ICJkYXJ3aW4iOwotICAgICAgICBteSAkcmVzdWx0ID0gc3lzdGVtKCJjdXJsIiwgIi1vIiwg ImFuZHJvaWQtbmRrLXI3LnRhci5iejIiLCAiaHR0cDovL2RsLmdvb2dsZS5jb20vYW5kcm9pZC9u ZGsvYW5kcm9pZC1uZGstcjctIiAuICRob3N0X29zIC4gIi14ODYudGFyLmJ6MiIpOworICAgICAg ICBteSAkcmVzdWx0ID0gc3lzdGVtKCJjdXJsIiwgIi1vIiwgImFuZHJvaWQtbmRrLXI3Yi50YXIu YnoyIiwgImh0dHA6Ly9kbC5nb29nbGUuY29tL2FuZHJvaWQvbmRrL2FuZHJvaWQtbmRrLXI3Yi0i IC4gJGhvc3Rfb3MgLiAiLXg4Ni50YXIuYnoyIik7CiAgICAgICAgIGRpZSAiQ291bGRuJ3QgZG93 bmxvYWQgdGhlIEFuZHJvaWQgTkRLLiIgaWYgJHJlc3VsdDsKIAotICAgICAgICAkcmVzdWx0ID0g c3lzdGVtKCJ0YXIiLCAiangiLCAiLWYiLCAiYW5kcm9pZC1uZGstcjcudGFyLmJ6MiIpOworICAg ICAgICAkcmVzdWx0ID0gc3lzdGVtKCJ0YXIiLCAiangiLCAiLWYiLCAiYW5kcm9pZC1uZGstcjdi LnRhci5iejIiKTsKICAgICAgICAgZGllICJDb3VsZG4ndCBleHRyYWN0IHRoZSBBbmRyb2lkIE5E Sy4iIGlmICRyZXN1bHQ7CiAgICAgfQogCi0gICAgJEVOVntBTkRST0lEX05ES19ST09UfSA9IHNv dXJjZURpcigpIC4gIi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2FuZHJvaWQtbmRrLXI3IjsKKyAg ICBteSAkYW5kcm9pZE5ES1Jvb3QgPSBzb3VyY2VEaXIoKSAuICIvU291cmNlL1dlYktpdC9jaHJv bWl1bS9hbmRyb2lkLW5kay1yN2IiOworCisgICAgIyBBdHRlbXB0IHRvIHJlcGxhY2UgdGhlIE5E SydzIGxpbmtlciB3aXRoIGEgNjQtYml0IHZlcnNpb24gaWYgdGhlIGhvc3QKKyAgICAjIE9TIGlz IExpbnV4LiBUaGlzIHdpbGwgc2lnbmlmaWNhbnRseSBzcGVlZCB1cCBsaW5rIHRpbWVzLgorICAg IGNocm9taXVtSW5zdGFsbDY0Qml0QW5kcm9pZExpbmtlcklmTmVlZGVkKCRhbmRyb2lkTkRLUm9v dCkgaWYgaXNMaW51eCgpOworCisgICAgJEVOVntBTkRST0lEX05ES19ST09UfSA9ICRhbmRyb2lk TkRLUm9vdDsKICAgICAkRU5We1dFQktJVF9BTkRST0lEX0JVSUxEfSA9IDE7CiB9CiAKZGlmZiAt LWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0 ZGlycy5wbQppbmRleCAwYjJhZGRmYzVmMTQwYjJiOTAzOWQyMjNiNzIwNTQ4ZmM1NGY1MmM1Li4z NDEzOGEwOTVlM2JiZTVmMzdmMTZjNWNkM2QyMWFjNjkyODY0MzYwIDEwMDc1NQotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt CkBAIC0yMjkyLDcgKzIyOTIsNyBAQCBzdWIgYnVpbGRDaHJvbWl1bU1ha2VmaWxlKCQkQCkKICAg ICAjIHdpbGwgdmVyaWZ5IHRoYXQgdGhlIGluc3RhbGxlZCBOREsgaXMgaW5kZWVkIGF2YWlsYWJs ZS4KICAgICBpZiAoaXNDaHJvbWl1bUFuZHJvaWQoKSkgewogICAgICAgICAkY29tbWFuZCAuPSAi YmFzaCAtYyBcInNvdXJjZSAiIC4gc291cmNlRGlyKCkgLiAiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vYnVpbGQvYW5kcm9pZC9lbnZzZXR1cC5zaCAmJiAiOwotICAgICAgICAkRU5We0FORFJPSURf TkRLX1JPT1R9ID0gc291cmNlRGlyKCkgLiAiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vYW5kcm9p ZC1uZGstcjciOworICAgICAgICAkRU5We0FORFJPSURfTkRLX1JPT1R9ID0gc291cmNlRGlyKCkg LiAiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vYW5kcm9pZC1uZGstcjdiIjsKICAgICAgICAgJEVO VntXRUJLSVRfQU5EUk9JRF9CVUlMRH0gPSAxOwogICAgIH0KIApAQCAtMjM4Nyw2ICsyMzg3LDQ3 IEBAIHN1YiBidWlsZENocm9taXVtKCRAKQogICAgIHJldHVybiAkcmVzdWx0OwogfQogCitzdWIg Y2hyb21pdW1JbnN0YWxsNjRCaXRBbmRyb2lkTGlua2VySWZOZWVkZWQKK3sKKyAgICBteSAoJGFu ZHJvaWROREtSb290KSA9IEBfOworCisgICAgbXkgJGxpbmtlckRpclByZWZpeCA9ICIkYW5kcm9p ZE5ES1Jvb3QvdG9vbGNoYWlucy9hcm0tbGludXgtYW5kcm9pZGVhYmktNC40LjMvcHJlYnVpbHQv bGludXgteDg2IjsKKyAgICBteSAkbGlua2VyRGlybmFtZTEgPSAiJGxpbmtlckRpclByZWZpeC9i aW4iOworICAgIG15ICRsaW5rZXJCYXNlbmFtZTEgPSAiYXJtLWxpbnV4LWFuZHJvaWRlYWJpLWxk IjsKKyAgICBteSAkbGlua2VyRGlybmFtZTIgPSAiJGxpbmtlckRpclByZWZpeC9hcm0tbGludXgt YW5kcm9pZGVhYmkvYmluIjsKKyAgICBteSAkbGlua2VyQmFzZW5hbWUyID0gImxkIjsKKyAgICBt eSAkbmV3TGlua2VyID0gImFybS1saW51eC1hbmRyb2lkZWFiaS1sZC5lNGRmM2UwYTViYjY0MGNj ZmEyZjMwZWU2N2ZlOWIzMTQ2YjE1MmQ2IjsKKworICAgICMgRG8gbm90IGNvbnRpbnVlIGlmIHRo ZSBuZXcgbGlua2VyIGlzIG5vdCAoeWV0KSBhdmFpbGFibGUuCisgICAgaWYgKCEgLWUgInRoaXJk X3BhcnR5L2Fvc3AvJG5ld0xpbmtlciIpIHsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKworICAg IGNocm9taXVtUmVwbGFjZUFuZHJvaWRMaW5rZXJJZk5lZWRlZCgkbGlua2VyRGlybmFtZTEsICRs aW5rZXJCYXNlbmFtZTEsICRuZXdMaW5rZXIpOworICAgIGNocm9taXVtUmVwbGFjZUFuZHJvaWRM aW5rZXJJZk5lZWRlZCgkbGlua2VyRGlybmFtZTIsICRsaW5rZXJCYXNlbmFtZTIsICRuZXdMaW5r ZXIpOworfQorCitzdWIgY2hyb21pdW1SZXBsYWNlQW5kcm9pZExpbmtlcklmTmVlZGVkCit7Cisg ICAgbXkgKCRsaW5rZXJEaXJuYW1lLCAkbGlua2VyQmFzZW5hbWUsICRuZXdMaW5rZXIpID0gQF87 CisKKyAgICAjIElmIHRoZSBkZXN0aW5hdGlvbiBkaXJlY3RvcnkgZG9lcyBub3QgZXhpc3QsIG9y IHRoZSBsaW5rZXIgaGFzIGFscmVhZHkKKyAgICAjIGJlZW4gaW5zdGFsbGVkLCByZXBsYWNpbmcg aXQgd2lsbCBub3QgYmUgbmVjZXNzYXJ5LgorICAgIGlmICghIC1kICIkbGlua2VyRGlybmFtZSIg fHwgLWUgIiRsaW5rZXJEaXJuYW1lLyRuZXdMaW5rZXIiKSB7CisgICAgICAgIHJldHVybjsKKyAg ICB9CisKKyAgICBwcmludCAiSW5zdGFsbGluZyA2NC1iaXQgQW5kcm9pZCBsaW5rZXIgaW4gJGxp bmtlckRpcm5hbWUuLlxuIjsKKyAgICBzeXN0ZW0oImNwIiwgInRoaXJkX3BhcnR5L2Fvc3AvJG5l d0xpbmtlciIsICIkbGlua2VyRGlybmFtZS8kbmV3TGlua2VyIik7CisgICAgc3lzdGVtKCJtdiIs ICIkbGlua2VyRGlybmFtZS8kbGlua2VyQmFzZW5hbWUiLCAiJGxpbmtlckRpcm5hbWUvJGxpbmtl ckJhc2VuYW1lLm9yaWciKTsKKyAgICBzeXN0ZW0oImxuIiwgIi1zIiwgIiRuZXdMaW5rZXIiLCAi JGxpbmtlckRpcm5hbWUvJGxpbmtlckJhc2VuYW1lIik7CisKKyAgICBpZiAoISAtZSAiJGxpbmtl ckRpcm5hbWUvJG5ld0xpbmtlciIpIHsKKyAgICAgICAgcHJpbnQgIlVuYWJsZSB0byBjb3B5IHRo ZSBsaW5rZXIuXG4iOworICAgICAgICBleGl0IDE7CisgICAgfQorfQorCiBzdWIgYXBwbGVBcHBs aWNhdGlvblN1cHBvcnRQYXRoCiB7CiAgICAgb3BlbiBJTlNUQUxMX0RJUiwgIjwvcHJvYy9yZWdp c3RyeS9IS0VZX0xPQ0FMX01BQ0hJTkUvU09GVFdBUkUvQXBwbGVcIEluYy4vQXBwbGVcIEFwcGxp Y2F0aW9uXCBTdXBwb3J0L0luc3RhbGxEaXIiOwo= 131659 2012-03-13 10:29:40 -0700 2012-04-19 14:29:02 -0700 Patch bug-79780-20120313172938.patch text/plain 5917 peter U3VidmVyc2lvbiBSZXZpc2lvbjogMTEwNTc2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGI4MjQ4MDA0NThkNWVkZDhjYzNmMjM0NmI2N2Q2NzU5NWVkMTE0NWIuLjU1ZjUwYzQ3NGJiYjAz ZmY0YjZhMzlkNWIyMTlmYzk4ODRiMjk5NDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTItMDMtMTMgIFBldGVyIEJldmVybG9vICA8cGV0ZXJAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gQXV0b21hdGljYWxseSBpbnN0YWxsIDY0LWJp dCBsaW5rZXIgZm9yIEFuZHJvaWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc5NzgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgQWRkIHRoZSBBT1NQIGRpcmVjdG9yeSB0byB0aGUgcGxhdGZvcm0tZGVwZW5k ZW50IGRlcGVuZGVuY2llcyBmb3IKKyAgICAgICAgQW5kcm9pZC4gQXMgbGlzdGVkIGluIGEgY29t bWVudCwgc2luY2UgdGhlIHJlcG9zaXRvcnkgY29udGFpbmluZyB0aGUKKyAgICAgICAgYWN0dWFs IERFUFMgZmlsZSBpcyBvbmx5IGF2YWlsYWJsZSBvdmVyIGdpdCwgd2UgY2Fubm90IGluaGVyaXQg dGhlCisgICAgICAgIHRvLWJlLXVzZWQgcmV2aXNpb24gbnVtYmVycyBmcm9tIG5vdy4gSG93ZXZl ciwgc2luY2UgdGhlIGZpbGUgd2lsbAorICAgICAgICBiZSB1cGRhdGVkIG9uIENocm9taXVtJ3Mg c2NoZWR1bGUgKHRodXMgaW5kZXBlbmRlbnQgb2YgQ2hyb21pdW0gcm9sbHMKKyAgICAgICAgaW50 byBXZWJLaXQpLCBkZXBlbmRpbmcgb24gdGhlIGZyZXF1ZW5jeSBvZiB1cGRhdGVzIHRoaXMgbWF5 IGJlCisgICAgICAgIGEgZ29vZCB0aGluZy4KKyAgICAgICAgCisgICAgICAgIFRoZSBvcmlnaW5h bCBERVBTIGZpbGUgaXMgYXZhaWxhYmxlIGhlcmU6CisgICAgICAgIGh0dHA6Ly9naXQuY2hyb21p dW0ub3JnL2dpdHdlYi8/cD1jaHJvbWl1bS90b29scy9hbmRyb2lkLmRlcHMuZ2l0O2E9YmxvYjtm PURFUFMKKworICAgICAgICAqIERFUFM6CisKIDIwMTItMDMtMTMgIERhbmEgSmFuc2VucyAgPGRh bmFrakBjaHJvbWl1bS5vcmc+CiAKICAgICAgICAgW2Nocm9taXVtXSBVc2UgcHJvamVjdFF1YWQg dG8gYXBwbHkgaW52ZXJzZSBtYXBSZWN0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9t aXVtL0RFUFMgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0RFUFMKaW5kZXggMjNlNTIxYWE3NTg3 OGIyNjZlOTA5ZjgxZTEzOGUyYTkwYTA3OTIxZS4uZGI0MGY5YzU1OWEzMjc2ZjFhYzg1NTMxNzUy ODIxOGIwNmE0MGRkYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9ERVBTCisr KyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vREVQUwpAQCAtMTY5LDYgKzE2OSwxMSBAQCBkZXBz X29zID0gewogICAnYW5kcm9pZCc6IHsKICAgICAndGhpcmRfcGFydHkvZnJlZXR5cGUnOgogICAg ICAgJ2h0dHBzOi8vZ2l0LmNocm9taXVtLm9yZy9jaHJvbWl1bS9zcmMvdGhpcmRfcGFydHkvZnJl ZXR5cGUuZ2l0JywKKyAgICAjIE1hbnVhbGx5IHVwZGF0ZSB0aGUgcmV2aXNpb24gd2hlbiB1cGRh dGVzIG9jY3VyIHRvIHRoZSBBbmRyb2lkIERFUFMKKyAgICAjIGZpbGUuIFdlIGNhbid0IHJlZmVy IHRvIHRoaXMgZmlsZSBkaXJlY3RseSBnaXZlbiB0aGF0IGl0J3Mgb25seSBhdmFpbGFibGUKKyAg ICAjIG9uIGdpdCwgYW5kIHRoZXJlIGFyZSBubyBwbGFucyB0byBhbHNvIG1vdmUgdGhpcyB0byBz dWJ2ZXJzaW9uIGZvciBub3cuCisgICAgJ3RoaXJkX3BhcnR5L2Fvc3AnOgorICAgICAgJ2h0dHA6 Ly9zcmMuY2hyb21pdW0ub3JnL3N2bi90cnVuay9kZXBzL3RoaXJkX3BhcnR5L2Fvc3BAMTIyMTU2 JywKICAgfSwKIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdl TG9nCmluZGV4IGI2YWU4ZjMzMzYzYjMyMWM4MGQxMzNmOTMxYTM5OTU1OTcyOTdjMmYuLmQwYTZi NTFmZTg0NjQzYTE0MGQ1N2NkNTA5OTNkYzg3MjNmYWVmZDcgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0No YW5nZUxvZworKysgYi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAxMi0wMy0x MyAgUGV0ZXIgQmV2ZXJsb28gIDxwZXRlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9t aXVtXSBBdXRvbWF0aWNhbGx5IGluc3RhbGwgNjQtYml0IGxpbmtlciBmb3IgQW5kcm9pZAorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzk3ODAKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGQgdHdvIHJvdXRp bmVzIHRvIGRldGVjdCB3aGV0aGVyIHRoZSA2NC1iaXQgbGlua2VyIChhbiBhbHRlcm5hdGl2ZSB0 bworICAgICAgICB0aGUgQW5kcm9pZCBOREsncyBvd24gbGlua2VyKSBpcyBhdmFpbGFibGUgYW5k IGluc3RhbGwgaXQgaWYgdGhhdCBoYXNuJ3QKKyAgICAgICAgYmVlbiBkb25lIHlldC4gVGhpcyBo YXMgYmVlbiB0ZXN0ZWQgZm9yIGJvdGggTkRLIHI3IGFuZCByN2IuCisKKyAgICAgICAgKiBTY3Jp cHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW06CisgICAgICAgICogU2NyaXB0cy93ZWJraXRkaXJz LnBtOgorICAgICAgICAoY2hyb21pdW1JbnN0YWxsNjRCaXRBbmRyb2lkTGlua2VySWZOZWVkZWQp OgorICAgICAgICAoY2hyb21pdW1SZXBsYWNlQW5kcm9pZExpbmtlcklmTmVlZGVkKToKKwogMjAx Mi0wMy0xMyAgVG9yIEFybmUgVmVzdGLDuCAgPHRvci5hcm5lLnZlc3Rib0Bub2tpYS5jb20+CiAK ICAgICAgICAgW1F0XSBUd2VhayBtaW5pYnJvd3NlciBVSQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtIGIvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0 LWNocm9taXVtCmluZGV4IDg0MDZiMWQwMTgwNzRlYzUzNWZkYWQyNzBlYWE0ZjZiZjkxNTAyZWMu LjdiYWMzMjVhN2U0NzZkMmI3NWQ1NTNmNmFhMTQ1ZjJlMDQ4OGEyYjYgMTAwNzU1Ci0tLSBhL1Rv b2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bQorKysgYi9Ub29scy9TY3JpcHRzL3Vw ZGF0ZS13ZWJraXQtY2hyb21pdW0KQEAgLTcxLDcgKzcxLDEzIEBAIGlmIChpc0Nocm9taXVtQW5k cm9pZCgpKSB7CiAgICAgICAgIGRpZSAiQ291bGRuJ3QgZXh0cmFjdCB0aGUgQW5kcm9pZCBOREsu IiBpZiAkcmVzdWx0OwogICAgIH0KIAotICAgICRFTlZ7QU5EUk9JRF9OREtfUk9PVH0gPSBzb3Vy Y2VEaXIoKSAuICIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9hbmRyb2lkLW5kay1yNyI7CisgICAg bXkgJGFuZHJvaWROZGtSb290ID0gc291cmNlRGlyKCkgLiAiL1NvdXJjZS9XZWJLaXQvY2hyb21p dW0vYW5kcm9pZC1uZGstcjciOworCisgICAgIyBBdHRlbXB0IHRvIHJlcGxhY2UgdGhlIE5ESydz IGxpbmtlciB3aXRoIGEgNjQtYml0IHZlcnNpb24gaWYgdGhlIGhvc3QKKyAgICAjIE9TIGlzIExp bnV4LiBUaGlzIHdpbGwgc2lnbmlmaWNhbnRseSBzcGVlZCB1cCBsaW5rIHRpbWVzLgorICAgIGNo cm9taXVtSW5zdGFsbDY0Qml0QW5kcm9pZExpbmtlcklmTmVlZGVkKCRhbmRyb2lkTmRrUm9vdCkg aWYgaXNMaW51eCgpOworCisgICAgJEVOVntBTkRST0lEX05ES19ST09UfSA9ICRhbmRyb2lkTmRr Um9vdDsKICAgICAkRU5We1dFQktJVF9BTkRST0lEX0JVSUxEfSA9IDE7CiB9CiAKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGly cy5wbQppbmRleCA3YTE1OGUzZjI3MmRkMjEzZTc1OWVjYjQ4Y2YyOTljNGEyNWU0NjhjLi5lYjI5 OGE5NWNmMWM4NTg0ZTNhYzAzYmVmZTUwMDA2NmZjNmEzOWZlIDEwMDc1NQotLS0gYS9Ub29scy9T Y3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBA IC0yNDAyLDYgKzI0MDIsNDkgQEAgc3ViIGJ1aWxkQ2hyb21pdW0oJEApCiAgICAgcmV0dXJuICRy ZXN1bHQ7CiB9CiAKK3N1YiBjaHJvbWl1bUluc3RhbGw2NEJpdEFuZHJvaWRMaW5rZXJJZk5lZWRl ZAoreworICAgIG15ICgkYW5kcm9pZE5ka1Jvb3QpID0gQF87CisKKyAgICAjIFJlc29sdmUgdGhl IHRvb2xjaGFpbiB2ZXJzaW9uIHRocm91Z2ggZ2xvYigpLgorICAgIG15ICRsaW5rZXJEaXJQcmVm aXggPSBnbG9iKCIkYW5kcm9pZE5ka1Jvb3QvdG9vbGNoYWlucy9hcm0tbGludXgtYW5kcm9pZGVh YmktKi9wcmVidWlsdC9saW51eC14ODYiKTsKKworICAgIG15ICRsaW5rZXJEaXJuYW1lMSA9ICIk bGlua2VyRGlyUHJlZml4L2JpbiI7CisgICAgbXkgJGxpbmtlckJhc2VuYW1lMSA9ICJhcm0tbGlu dXgtYW5kcm9pZGVhYmktbGQiOworICAgIG15ICRsaW5rZXJEaXJuYW1lMiA9ICIkbGlua2VyRGly UHJlZml4L2FybS1saW51eC1hbmRyb2lkZWFiaS9iaW4iOworICAgIG15ICRsaW5rZXJCYXNlbmFt ZTIgPSAibGQiOworICAgIG15ICRuZXdMaW5rZXIgPSAiYXJtLWxpbnV4LWFuZHJvaWRlYWJpLWxk LmU0ZGYzZTBhNWJiNjQwY2NmYTJmMzBlZTY3ZmU5YjMxNDZiMTUyZDYiOworCisgICAgIyBEbyBu b3QgY29udGludWUgaWYgdGhlIG5ldyBsaW5rZXIgaXMgbm90ICh5ZXQpIGF2YWlsYWJsZS4KKyAg ICBpZiAoISAtZSAidGhpcmRfcGFydHkvYW9zcC8kbmV3TGlua2VyIikgeworICAgICAgICByZXR1 cm47CisgICAgfQorCisgICAgY2hyb21pdW1SZXBsYWNlQW5kcm9pZExpbmtlcklmTmVlZGVkKCRs aW5rZXJEaXJuYW1lMSwgJGxpbmtlckJhc2VuYW1lMSwgJG5ld0xpbmtlcik7CisgICAgY2hyb21p dW1SZXBsYWNlQW5kcm9pZExpbmtlcklmTmVlZGVkKCRsaW5rZXJEaXJuYW1lMiwgJGxpbmtlckJh c2VuYW1lMiwgJG5ld0xpbmtlcik7Cit9CisKK3N1YiBjaHJvbWl1bVJlcGxhY2VBbmRyb2lkTGlu a2VySWZOZWVkZWQKK3sKKyAgICBteSAoJGxpbmtlckRpcm5hbWUsICRsaW5rZXJCYXNlbmFtZSwg JG5ld0xpbmtlcikgPSBAXzsKKworICAgICMgSWYgdGhlIGRlc3RpbmF0aW9uIGRpcmVjdG9yeSBk b2VzIG5vdCBleGlzdCwgb3IgdGhlIGxpbmtlciBoYXMgYWxyZWFkeQorICAgICMgYmVlbiBpbnN0 YWxsZWQsIHJlcGxhY2luZyBpdCB3aWxsIG5vdCBiZSBuZWNlc3NhcnkuCisgICAgaWYgKCEgLWQg IiRsaW5rZXJEaXJuYW1lIiB8fCAtZSAiJGxpbmtlckRpcm5hbWUvJG5ld0xpbmtlciIpIHsKKyAg ICAgICAgcmV0dXJuOworICAgIH0KKworICAgIHByaW50ICJJbnN0YWxsaW5nIDY0LWJpdCBBbmRy b2lkIGxpbmtlciBpbiAkbGlua2VyRGlybmFtZS4uXG4iOworICAgIHN5c3RlbSgiY3AiLCAidGhp cmRfcGFydHkvYW9zcC8kbmV3TGlua2VyIiwgIiRsaW5rZXJEaXJuYW1lLyRuZXdMaW5rZXIiKTsK KyAgICBzeXN0ZW0oIm12IiwgIiRsaW5rZXJEaXJuYW1lLyRsaW5rZXJCYXNlbmFtZSIsICIkbGlu a2VyRGlybmFtZS8kbGlua2VyQmFzZW5hbWUub3JpZyIpOworICAgIHN5c3RlbSgibG4iLCAiLXMi LCAiJG5ld0xpbmtlciIsICIkbGlua2VyRGlybmFtZS8kbGlua2VyQmFzZW5hbWUiKTsKKworICAg IGlmICghIC1lICIkbGlua2VyRGlybmFtZS8kbmV3TGlua2VyIikgeworICAgICAgICBwcmludCAi VW5hYmxlIHRvIGNvcHkgdGhlIGxpbmtlci5cbiI7CisgICAgICAgIGV4aXQgMTsKKyAgICB9Cit9 CisKIHN1YiBhcHBsZUFwcGxpY2F0aW9uU3VwcG9ydFBhdGgKIHsKICAgICBvcGVuIElOU1RBTExf RElSLCAiPC9wcm9jL3JlZ2lzdHJ5L0hLRVlfTE9DQUxfTUFDSElORS9TT0ZUV0FSRS9BcHBsZVwg SW5jLi9BcHBsZVwgQXBwbGljYXRpb25cIFN1cHBvcnQvSW5zdGFsbERpciI7Cg== 144802 2012-05-30 06:58:55 -0700 2012-05-30 11:36:08 -0700 Patch bug-79780-20120530145854.patch text/plain 6354 peter U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4OTEwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGRlYWM3MjA5YTExMTcxMGQ3MzhmODYyNzg1ZDkwZjljNjM0NzQ0MWYuLjVlZWQ5MjM5NmU3YzI1 ODBkMjczZGI5MWE3MDIwODAwNTA5MjhlZGEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTggQEAKKzIwMTItMDUtMzAgIFBldGVyIEJldmVybG9vICA8cGV0ZXJAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gQXV0b21hdGljYWxseSBpbnN0YWxsIDY0LWJp dCBsaW5rZXIgZm9yIEFuZHJvaWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc5NzgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgUm9sbCBDaHJvbWl1bSBERVBTIHRvIHIxMzk1MjkuCisgICAgICAgIENoYW5n ZSB0aGUgQW5kcm9pZC1zcGVjaWZpYyBkZXBlbmRlbmNpZXMgdG8gaW5oZXJpdCB0aGVpciByZXZp c2lvbiBmcm9tCisgICAgICAgIENocm9taXVtJ3MgREVQUyBmaWxlLCBsaWtlIG1hbnkgb3RoZXIg ZGVwZW5kZW5jaWVzIGRvLCBzb2x2aW5nIHRoZQorICAgICAgICB2ZXJzaW9uaW5nIHByb2JsZW0g dGhhdCB3ZSdyZSBydW5uaW5nIGluIHRvIHJpZ2h0IG5vdy4gVGhlc2UgYXJlIGxpc3RlZAorICAg ICAgICBpbiBDaHJvbWl1bSdzIG1haW4gREVQUyBmaWxlIHN0YXJ0aW5nIENocm9taXVtIHIxMzk1 MjkuCisKKyAgICAgICAgKiBERVBTOgorCiAyMDEyLTA1LTI5ICBNYXJrIFBpbGdyaW0gIDxwaWxn cmltQGNocm9taXVtLm9yZz4KIAogICAgICAgICBbQ2hyb21pdW1dIE1vdmUgZmlsZUV4aXN0cyB0 byBQbGF0Zm9ybS5oCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0RFUFMgYi9T b3VyY2UvV2ViS2l0L2Nocm9taXVtL0RFUFMKaW5kZXggN2ZmNWZiYzRkYzU0ODE3MGRkOGU1NTky NDM1NzgxMmZkYjU4Yjk2Yy4uMmQ5NTE3MTNlODlkNWUxOWE0MTY5ZDEyMjYxNDFkY2ZlMWU0ZWZl ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9ERVBTCisrKyBiL1NvdXJjZS9X ZWJLaXQvY2hyb21pdW0vREVQUwpAQCAtMzIsNyArMzIsNyBAQAogCiB2YXJzID0gewogICAnY2hy b21pdW1fc3ZuJzogJ2h0dHA6Ly9zcmMuY2hyb21pdW0ub3JnL3N2bi90cnVuay9zcmMnLAotICAn Y2hyb21pdW1fcmV2JzogJzEzOTMwMCcKKyAgJ2Nocm9taXVtX3Jldic6ICcxMzk1MjknCiB9CiAK IGRlcHMgPSB7CkBAIC0xNjcsMTAgKzE2NywxMiBAQCBkZXBzX29zID0gewogICAgICAgRnJvbSgn Y2hyb21pdW1fZGVwcycsICdzcmMvdGhpcmRfcGFydHkvb3BlbnNzbCcpLAogICB9LAogICAnYW5k cm9pZCc6IHsKLSAgICAndGhpcmRfcGFydHkvZnJlZXR5cGUnOgotICAgICAgJ2h0dHBzOi8vZ2l0 LmNocm9taXVtLm9yZy9jaHJvbWl1bS9zcmMvdGhpcmRfcGFydHkvZnJlZXR5cGUuZ2l0JywKICAg ICAndG9vbHMvYW5kcm9pZCc6Ci0gICAgICBWYXIoJ2Nocm9taXVtX3N2bicpKycvdG9vbHMvYW5k cm9pZEAnK1ZhcignY2hyb21pdW1fcmV2JyksCisgICAgICBWYXIoJ2Nocm9taXVtX3N2bicpICsg Jy90b29scy9hbmRyb2lkQCcgKyBWYXIoJ2Nocm9taXVtX3JldicpLAorICAgICd0aGlyZF9wYXJ0 eS9mcmVldHlwZSc6CisgICAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0 eS9mcmVldHlwZScpLAorICAgICd0aGlyZF9wYXJ0eS9hb3NwJzoKKyAgICAgIEZyb20oJ2Nocm9t aXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2Fvc3AnKSwKICAgfSwKIH0KIApkaWZmIC0tZ2l0 IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDI4NmM5M2MxYWE2ODJi YzVkMTNkNDU1MjE2ZWE3NjJjNmZkOTk3MjcuLmVmOGY4ZjFmOWNmNGM4YmVjMzI1NWVlMDIzYzc4 YzMwMTZjM2RlNGUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwyMyBAQAorMjAxMi0wNS0zMCAgUGV0ZXIgQmV2ZXJsb28gIDxwZXRl ckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBBdXRvbWF0aWNhbGx5IGluc3Rh bGwgNjQtYml0IGxpbmtlciBmb3IgQW5kcm9pZAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9Nzk3ODAKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBDaGFuZ2UgdGhlIHVwZGF0ZS13ZWJraXQtY2hyb21pdW0gc2Ny aXB0IHRvIGNoZWNrIHdoZXRoZXIgdGhlIDY0LWJpdAorICAgICAgICBsaW5rZXIgbmVlZHMgdG8g YmUgaW5zdGFsbGVkIGFzIHBhcnQgb2YgdGhlIHVwZGF0ZSBwcm9jZXNzLiBUaGUgYWN0dWFsCisg ICAgICAgIGNvZGUgZm9yIGRvaW5nIHRoZXNlIGNoZWNrcyBhbmQgImluc3RhbGxpbmciIGl0IGhh cyBiZWVuIGFkZGVkIHRvIHRoZQorICAgICAgICB3ZWJraXRkaXJzLnBtIHNjcmlwdC4KKworICAg ICAgICBUaGUgbGlua2VyIGl0c2VsZiBpcyBwYXJ0IG9mIHRoZSB0aGlyZF9wYXJ0eS9hb3NwIHJl cG9zaXRvcnksIHdoaWNoCisgICAgICAgIHdpbGwgYmUgcHVsbGVkIGluIHRocm91Z2ggdGhlIERF UFMgY2hhbmdlLgorCisgICAgICAgICogU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtOgor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgKGNocm9taXVtSW5zdGFs bDY0Qml0QW5kcm9pZExpbmtlcklmTmVlZGVkKToKKyAgICAgICAgKGNocm9taXVtUmVwbGFjZUFu ZHJvaWRMaW5rZXJJZk5lZWRlZCk6CisKIDIwMTItMDUtMjkgIErDoW5vcyBCYWRpY3MgIDxqYmFk aWNzQGluZi51LXN6ZWdlZC5odT4KIAogICAgICAgICBbUXRdIE1vZGlmaWVkIE9SV1QgYW5kIE5S V1QgdG8gY2hlY2sgZm9yIHRlc3QgZXhwZWN0YXRpb25zIGluIHBsYXRmb3JtL3F0LTUuMC13azEg dG9vCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW0gYi9U b29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW0KaW5kZXggNTUwODMwZTFjOWFlZjIw MDM1OTI4N2U0YWY2MzE3NTY4NDM1ZjcyZC4uYTVjMjQyNDQyOTBlMWEwZDk3OGFjZGNlNDQ3ZDI1 MTM3MzY3Mjk0YSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9t aXVtCisrKyBiL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bQpAQCAtNTUsNyAr NTUsNyBAQCBpZiAoISAtZSAiLmdjbGllbnQiKSB7CiAgICAgIyBJZiAuZ2NsaWVudCBjb25maWd1 cmF0aW9uIGZpbGUgZG9lc24ndCBleGlzdCwgY3JlYXRlIGl0LgogICAgIHByaW50ICJDb25maWd1 cmluZyBnY2xpZW50Li4uXG4iOwogICAgIHN5c3RlbSgkZ2NsaWVudFBhdGgsCi0gICAgICAgICAg ICJjb25maWciLCAKKyAgICAgICAgICAgImNvbmZpZyIsCiAgICAgICAgICAgICItLXNwZWM9c29s dXRpb25zPVt7J25hbWUnOicuLycsJ3VybCc6Tm9uZX1dIikgPT0gMCBvciBkaWUgJCE7CiB9CiAK QEAgLTcyLDcgKzcyLDEzIEBAIGlmIChpc0Nocm9taXVtQW5kcm9pZCgpKSB7CiAgICAgICAgIGRp ZSAiQ291bGRuJ3QgZXh0cmFjdCB0aGUgQW5kcm9pZCBOREsuIiBpZiAkcmVzdWx0OwogICAgIH0K IAotICAgICRFTlZ7QU5EUk9JRF9OREtfUk9PVH0gPSBzb3VyY2VEaXIoKSAuICIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9hbmRyb2lkLW5kay1yN2IiOworICAgIG15ICRhbmRyb2lkTmRrUm9vdCA9 IHNvdXJjZURpcigpIC4gIi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2FuZHJvaWQtbmRrLXI3YiI7 CisKKyAgICAjIEF0dGVtcHQgdG8gcmVwbGFjZSB0aGUgTkRLJ3MgbGlua2VyIHdpdGggYSA2NC1i aXQgdmVyc2lvbiBpZiB0aGUgaG9zdAorICAgICMgT1MgaXMgTGludXguIFRoaXMgd2lsbCBzaWdu aWZpY2FudGx5IHNwZWVkIHVwIGxpbmsgdGltZXMuCisgICAgY2hyb21pdW1JbnN0YWxsNjRCaXRB bmRyb2lkTGlua2VySWZOZWVkZWQoJGFuZHJvaWROZGtSb290KSBpZiBpc0xpbnV4KCk7CisKKyAg ICAkRU5We0FORFJPSURfTkRLX1JPT1R9ID0gJGFuZHJvaWROZGtSb290OwogICAgICRFTlZ7V0VC S0lUX0FORFJPSURfQlVJTER9ID0gMTsKIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IGIyMDhjYjQ0 MzU2MGIyNWZiZTRmZTUwMWRmZWMzODQ0ODExYjY4NjEuLmI3MjhiYWQwYjE4ZjliZjVhYTFjZTFh N2FkMTk4NjQyMDU5ZDJkMzQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5w bQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTI0OTQsNiArMjQ5NCw0OSBA QCBzdWIgYnVpbGRDaHJvbWl1bSgkQCkKICAgICByZXR1cm4gJHJlc3VsdDsKIH0KIAorc3ViIGNo cm9taXVtSW5zdGFsbDY0Qml0QW5kcm9pZExpbmtlcklmTmVlZGVkCit7CisgICAgbXkgKCRhbmRy b2lkTmRrUm9vdCkgPSBAXzsKKworICAgICMgUmVzb2x2ZSB0aGUgdG9vbGNoYWluIHZlcnNpb24g dGhyb3VnaCBnbG9iKCkuCisgICAgbXkgJGxpbmtlckRpclByZWZpeCA9IGdsb2IoIiRhbmRyb2lk TmRrUm9vdC90b29sY2hhaW5zL2FybS1saW51eC1hbmRyb2lkZWFiaS0qL3ByZWJ1aWx0L2xpbnV4 LXg4NiIpOworCisgICAgbXkgJGxpbmtlckRpcm5hbWUxID0gIiRsaW5rZXJEaXJQcmVmaXgvYmlu IjsKKyAgICBteSAkbGlua2VyQmFzZW5hbWUxID0gImFybS1saW51eC1hbmRyb2lkZWFiaS1sZCI7 CisgICAgbXkgJGxpbmtlckRpcm5hbWUyID0gIiRsaW5rZXJEaXJQcmVmaXgvYXJtLWxpbnV4LWFu ZHJvaWRlYWJpL2JpbiI7CisgICAgbXkgJGxpbmtlckJhc2VuYW1lMiA9ICJsZCI7CisgICAgbXkg JG5ld0xpbmtlciA9ICJhcm0tbGludXgtYW5kcm9pZGVhYmktbGQuZTRkZjNlMGE1YmI2NDBjY2Zh MmYzMGVlNjdmZTliMzE0NmIxNTJkNiI7CisKKyAgICAjIERvIG5vdCBjb250aW51ZSBpZiB0aGUg bmV3IGxpbmtlciBpcyBub3QgKHlldCkgYXZhaWxhYmxlLgorICAgIGlmICghIC1lICJ0aGlyZF9w YXJ0eS9hb3NwLyRuZXdMaW5rZXIiKSB7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAgICBj aHJvbWl1bVJlcGxhY2VBbmRyb2lkTGlua2VySWZOZWVkZWQoJGxpbmtlckRpcm5hbWUxLCAkbGlu a2VyQmFzZW5hbWUxLCAkbmV3TGlua2VyKTsKKyAgICBjaHJvbWl1bVJlcGxhY2VBbmRyb2lkTGlu a2VySWZOZWVkZWQoJGxpbmtlckRpcm5hbWUyLCAkbGlua2VyQmFzZW5hbWUyLCAkbmV3TGlua2Vy KTsKK30KKworc3ViIGNocm9taXVtUmVwbGFjZUFuZHJvaWRMaW5rZXJJZk5lZWRlZAoreworICAg IG15ICgkbGlua2VyRGlybmFtZSwgJGxpbmtlckJhc2VuYW1lLCAkbmV3TGlua2VyKSA9IEBfOwor CisgICAgIyBJZiB0aGUgZGVzdGluYXRpb24gZGlyZWN0b3J5IGRvZXMgbm90IGV4aXN0LCBvciB0 aGUgbGlua2VyIGhhcyBhbHJlYWR5CisgICAgIyBiZWVuIGluc3RhbGxlZCwgcmVwbGFjaW5nIGl0 IHdpbGwgbm90IGJlIG5lY2Vzc2FyeS4KKyAgICBpZiAoISAtZCAiJGxpbmtlckRpcm5hbWUiIHx8 IC1lICIkbGlua2VyRGlybmFtZS8kbmV3TGlua2VyIikgeworICAgICAgICByZXR1cm47CisgICAg fQorCisgICAgcHJpbnQgIkluc3RhbGxpbmcgNjQtYml0IEFuZHJvaWQgbGlua2VyIGluICRsaW5r ZXJEaXJuYW1lLi5cbiI7CisgICAgc3lzdGVtKCJjcCIsICJ0aGlyZF9wYXJ0eS9hb3NwLyRuZXdM aW5rZXIiLCAiJGxpbmtlckRpcm5hbWUvJG5ld0xpbmtlciIpOworICAgIHN5c3RlbSgibXYiLCAi JGxpbmtlckRpcm5hbWUvJGxpbmtlckJhc2VuYW1lIiwgIiRsaW5rZXJEaXJuYW1lLyRsaW5rZXJC YXNlbmFtZS5vcmlnIik7CisgICAgc3lzdGVtKCJsbiIsICItcyIsICIkbmV3TGlua2VyIiwgIiRs aW5rZXJEaXJuYW1lLyRsaW5rZXJCYXNlbmFtZSIpOworCisgICAgaWYgKCEgLWUgIiRsaW5rZXJE aXJuYW1lLyRuZXdMaW5rZXIiKSB7CisgICAgICAgIHByaW50ICJVbmFibGUgdG8gY29weSB0aGUg bGlua2VyLlxuIjsKKyAgICAgICAgZXhpdCAxOworICAgIH0KK30KKwogc3ViIGFwcGxlQXBwbGlj YXRpb25TdXBwb3J0UGF0aAogewogICAgIG9wZW4gSU5TVEFMTF9ESVIsICI8L3Byb2MvcmVnaXN0 cnkvSEtFWV9MT0NBTF9NQUNISU5FL1NPRlRXQVJFL0FwcGxlXCBJbmMuL0FwcGxlXCBBcHBsaWNh dGlvblwgU3VwcG9ydC9JbnN0YWxsRGlyIjsK 144881 2012-05-30 11:36:15 -0700 2012-05-30 11:36:15 -0700 Patch for landing bug-79780-20120530193614.patch text/plain 6186 peter U3VidmVyc2lvbiBSZXZpc2lvbjogMTE4OTQxCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDNkYjk4ZjdmMDk4ODVlNzdlM2VmNmRkM2E4ZjJlMTMxMTdiZDM4YTkuLmU1YTA3ZTlkMzY3ZDEw ZDRjY2ZmOWRkYmRhNTIxNDMyZTkzMmRmZWEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTcgQEAKKzIwMTItMDUtMzAgIFBldGVyIEJldmVybG9vICA8cGV0ZXJAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gQXV0b21hdGljYWxseSBpbnN0YWxsIDY0LWJp dCBsaW5rZXIgZm9yIEFuZHJvaWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTc5NzgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKwor ICAgICAgICBDaGFuZ2UgdGhlIEFuZHJvaWQtc3BlY2lmaWMgZGVwZW5kZW5jaWVzIHRvIGluaGVy aXQgdGhlaXIgcmV2aXNpb24gZnJvbQorICAgICAgICBDaHJvbWl1bSdzIERFUFMgZmlsZSwgbGlr ZSBtYW55IG90aGVyIGRlcGVuZGVuY2llcyBkbywgc29sdmluZyB0aGUKKyAgICAgICAgdmVyc2lv bmluZyBwcm9ibGVtIHRoYXQgd2UncmUgcnVubmluZyBpbiB0byByaWdodCBub3cuIFRoZXNlIGFy ZSBsaXN0ZWQKKyAgICAgICAgaW4gQ2hyb21pdW0ncyBtYWluIERFUFMgZmlsZSBzdGFydGluZyBD aHJvbWl1bSByMTM5NTI5LgorCisgICAgICAgICogREVQUzoKKwogMjAxMi0wNS0zMCAgSm9jaGVu IEVpc2luZ2VyICA8am9jaGVuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBNYXRjaCBGaXJlZm94 IHJlc3RyaWN0aW9ucyB0byB3aW5kb3cuYmx1ciBhbmQgd2luZG93LmZvY3VzCmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0RFUFMgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0RF UFMKaW5kZXggN2ZmNWZiYzRkYzU0ODE3MGRkOGU1NTkyNDM1NzgxMmZkYjU4Yjk2Yy4uOTczYmMw MmE2NDYwYzIyZWMxYjY4NDYzYTljOTZkMzIxNGEyYjc5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dl YktpdC9jaHJvbWl1bS9ERVBTCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vREVQUwpAQCAt MTY3LDEwICsxNjcsMTIgQEAgZGVwc19vcyA9IHsKICAgICAgIEZyb20oJ2Nocm9taXVtX2RlcHMn LCAnc3JjL3RoaXJkX3BhcnR5L29wZW5zc2wnKSwKICAgfSwKICAgJ2FuZHJvaWQnOiB7Ci0gICAg J3RoaXJkX3BhcnR5L2ZyZWV0eXBlJzoKLSAgICAgICdodHRwczovL2dpdC5jaHJvbWl1bS5vcmcv Y2hyb21pdW0vc3JjL3RoaXJkX3BhcnR5L2ZyZWV0eXBlLmdpdCcsCiAgICAgJ3Rvb2xzL2FuZHJv aWQnOgotICAgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSsnL3Rvb2xzL2FuZHJvaWRAJytWYXIoJ2No cm9taXVtX3JldicpLAorICAgICAgVmFyKCdjaHJvbWl1bV9zdm4nKSArICcvdG9vbHMvYW5kcm9p ZEAnICsgVmFyKCdjaHJvbWl1bV9yZXYnKSwKKyAgICAndGhpcmRfcGFydHkvZnJlZXR5cGUnOgor ICAgICAgRnJvbSgnY2hyb21pdW1fZGVwcycsICdzcmMvdGhpcmRfcGFydHkvZnJlZXR5cGUnKSwK KyAgICAndGhpcmRfcGFydHkvYW9zcCc6CisgICAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3Ny Yy90aGlyZF9wYXJ0eS9hb3NwJyksCiAgIH0sCiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5n ZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA1MDgzNmI4MmFjZTVmMDg3YTE5YWZlOGE4ZmEy NTZiY2RhZDFmOGM2Li5mNGE5ZDZkOTQyNDMyNTllODRiMzYzODMwMzJiODAxNWUxYTNmOTNmIDEw MDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMg KzEsMjMgQEAKKzIwMTItMDUtMzAgIFBldGVyIEJldmVybG9vICA8cGV0ZXJAY2hyb21pdW0ub3Jn PgorCisgICAgICAgIFtDaHJvbWl1bV0gQXV0b21hdGljYWxseSBpbnN0YWxsIDY0LWJpdCBsaW5r ZXIgZm9yIEFuZHJvaWQKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTc5NzgwCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKworICAgICAg ICBDaGFuZ2UgdGhlIHVwZGF0ZS13ZWJraXQtY2hyb21pdW0gc2NyaXB0IHRvIGNoZWNrIHdoZXRo ZXIgdGhlIDY0LWJpdAorICAgICAgICBsaW5rZXIgbmVlZHMgdG8gYmUgaW5zdGFsbGVkIGFzIHBh cnQgb2YgdGhlIHVwZGF0ZSBwcm9jZXNzLiBUaGUgYWN0dWFsCisgICAgICAgIGNvZGUgZm9yIGRv aW5nIHRoZXNlIGNoZWNrcyBhbmQgImluc3RhbGxpbmciIGl0IGhhcyBiZWVuIGFkZGVkIHRvIHRo ZQorICAgICAgICB3ZWJraXRkaXJzLnBtIHNjcmlwdC4KKworICAgICAgICBUaGUgbGlua2VyIGl0 c2VsZiBpcyBwYXJ0IG9mIHRoZSB0aGlyZF9wYXJ0eS9hb3NwIHJlcG9zaXRvcnksIHdoaWNoCisg ICAgICAgIHdpbGwgYmUgcHVsbGVkIGluIHRocm91Z2ggdGhlIERFUFMgY2hhbmdlLgorCisgICAg ICAgICogU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtOgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0ZGlycy5wbToKKyAgICAgICAgKGNocm9taXVtSW5zdGFsbDY0Qml0QW5kcm9pZExpbmtl cklmTmVlZGVkKToKKyAgICAgICAgKGNocm9taXVtUmVwbGFjZUFuZHJvaWRMaW5rZXJJZk5lZWRl ZCk6CisKIDIwMTItMDUtMzAgIFh1ZXFpbmcgSHVhbmcgIDxodWFuZ3h1ZXFpbmdAYmFpZHUuY29t PgogCiAgICAgICAgIGV2ZW50U2VuZGVyLmJlZ2luRHJhZ1dpdGhGaWxlcyBzaG91bGQgYmUgaW1w bGVtZW50ZWQgaW4gV2luZG93cywgd2hpY2ggYmxvY2tlZCBkcmFnIGFuZCBkcm9wIHJlbGF0ZWQg dGVzdHMuCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW0g Yi9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW0KaW5kZXggNTUwODMwZTFjOWFl ZjIwMDM1OTI4N2U0YWY2MzE3NTY4NDM1ZjcyZC4uYTVjMjQyNDQyOTBlMWEwZDk3OGFjZGNlNDQ3 ZDI1MTM3MzY3Mjk0YSAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWNo cm9taXVtCisrKyBiL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bQpAQCAtNTUs NyArNTUsNyBAQCBpZiAoISAtZSAiLmdjbGllbnQiKSB7CiAgICAgIyBJZiAuZ2NsaWVudCBjb25m aWd1cmF0aW9uIGZpbGUgZG9lc24ndCBleGlzdCwgY3JlYXRlIGl0LgogICAgIHByaW50ICJDb25m aWd1cmluZyBnY2xpZW50Li4uXG4iOwogICAgIHN5c3RlbSgkZ2NsaWVudFBhdGgsCi0gICAgICAg ICAgICJjb25maWciLCAKKyAgICAgICAgICAgImNvbmZpZyIsCiAgICAgICAgICAgICItLXNwZWM9 c29sdXRpb25zPVt7J25hbWUnOicuLycsJ3VybCc6Tm9uZX1dIikgPT0gMCBvciBkaWUgJCE7CiB9 CiAKQEAgLTcyLDcgKzcyLDEzIEBAIGlmIChpc0Nocm9taXVtQW5kcm9pZCgpKSB7CiAgICAgICAg IGRpZSAiQ291bGRuJ3QgZXh0cmFjdCB0aGUgQW5kcm9pZCBOREsuIiBpZiAkcmVzdWx0OwogICAg IH0KIAotICAgICRFTlZ7QU5EUk9JRF9OREtfUk9PVH0gPSBzb3VyY2VEaXIoKSAuICIvU291cmNl L1dlYktpdC9jaHJvbWl1bS9hbmRyb2lkLW5kay1yN2IiOworICAgIG15ICRhbmRyb2lkTmRrUm9v dCA9IHNvdXJjZURpcigpIC4gIi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2FuZHJvaWQtbmRrLXI3 YiI7CisKKyAgICAjIEF0dGVtcHQgdG8gcmVwbGFjZSB0aGUgTkRLJ3MgbGlua2VyIHdpdGggYSA2 NC1iaXQgdmVyc2lvbiBpZiB0aGUgaG9zdAorICAgICMgT1MgaXMgTGludXguIFRoaXMgd2lsbCBz aWduaWZpY2FudGx5IHNwZWVkIHVwIGxpbmsgdGltZXMuCisgICAgY2hyb21pdW1JbnN0YWxsNjRC aXRBbmRyb2lkTGlua2VySWZOZWVkZWQoJGFuZHJvaWROZGtSb290KSBpZiBpc0xpbnV4KCk7CisK KyAgICAkRU5We0FORFJPSURfTkRLX1JPT1R9ID0gJGFuZHJvaWROZGtSb290OwogICAgICRFTlZ7 V0VCS0lUX0FORFJPSURfQlVJTER9ID0gMTsKIH0KIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRkaXJzLnBtIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCmluZGV4IGIyMDhj YjQ0MzU2MGIyNWZiZTRmZTUwMWRmZWMzODQ0ODExYjY4NjEuLmI3MjhiYWQwYjE4ZjliZjVhYTFj ZTFhN2FkMTk4NjQyMDU5ZDJkMzQgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGly cy5wbQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KQEAgLTI0OTQsNiArMjQ5NCw0 OSBAQCBzdWIgYnVpbGRDaHJvbWl1bSgkQCkKICAgICByZXR1cm4gJHJlc3VsdDsKIH0KIAorc3Vi IGNocm9taXVtSW5zdGFsbDY0Qml0QW5kcm9pZExpbmtlcklmTmVlZGVkCit7CisgICAgbXkgKCRh bmRyb2lkTmRrUm9vdCkgPSBAXzsKKworICAgICMgUmVzb2x2ZSB0aGUgdG9vbGNoYWluIHZlcnNp b24gdGhyb3VnaCBnbG9iKCkuCisgICAgbXkgJGxpbmtlckRpclByZWZpeCA9IGdsb2IoIiRhbmRy b2lkTmRrUm9vdC90b29sY2hhaW5zL2FybS1saW51eC1hbmRyb2lkZWFiaS0qL3ByZWJ1aWx0L2xp bnV4LXg4NiIpOworCisgICAgbXkgJGxpbmtlckRpcm5hbWUxID0gIiRsaW5rZXJEaXJQcmVmaXgv YmluIjsKKyAgICBteSAkbGlua2VyQmFzZW5hbWUxID0gImFybS1saW51eC1hbmRyb2lkZWFiaS1s ZCI7CisgICAgbXkgJGxpbmtlckRpcm5hbWUyID0gIiRsaW5rZXJEaXJQcmVmaXgvYXJtLWxpbnV4 LWFuZHJvaWRlYWJpL2JpbiI7CisgICAgbXkgJGxpbmtlckJhc2VuYW1lMiA9ICJsZCI7CisgICAg bXkgJG5ld0xpbmtlciA9ICJhcm0tbGludXgtYW5kcm9pZGVhYmktbGQuZTRkZjNlMGE1YmI2NDBj Y2ZhMmYzMGVlNjdmZTliMzE0NmIxNTJkNiI7CisKKyAgICAjIERvIG5vdCBjb250aW51ZSBpZiB0 aGUgbmV3IGxpbmtlciBpcyBub3QgKHlldCkgYXZhaWxhYmxlLgorICAgIGlmICghIC1lICJ0aGly ZF9wYXJ0eS9hb3NwLyRuZXdMaW5rZXIiKSB7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKKyAg ICBjaHJvbWl1bVJlcGxhY2VBbmRyb2lkTGlua2VySWZOZWVkZWQoJGxpbmtlckRpcm5hbWUxLCAk bGlua2VyQmFzZW5hbWUxLCAkbmV3TGlua2VyKTsKKyAgICBjaHJvbWl1bVJlcGxhY2VBbmRyb2lk TGlua2VySWZOZWVkZWQoJGxpbmtlckRpcm5hbWUyLCAkbGlua2VyQmFzZW5hbWUyLCAkbmV3TGlu a2VyKTsKK30KKworc3ViIGNocm9taXVtUmVwbGFjZUFuZHJvaWRMaW5rZXJJZk5lZWRlZAorewor ICAgIG15ICgkbGlua2VyRGlybmFtZSwgJGxpbmtlckJhc2VuYW1lLCAkbmV3TGlua2VyKSA9IEBf OworCisgICAgIyBJZiB0aGUgZGVzdGluYXRpb24gZGlyZWN0b3J5IGRvZXMgbm90IGV4aXN0LCBv ciB0aGUgbGlua2VyIGhhcyBhbHJlYWR5CisgICAgIyBiZWVuIGluc3RhbGxlZCwgcmVwbGFjaW5n IGl0IHdpbGwgbm90IGJlIG5lY2Vzc2FyeS4KKyAgICBpZiAoISAtZCAiJGxpbmtlckRpcm5hbWUi IHx8IC1lICIkbGlua2VyRGlybmFtZS8kbmV3TGlua2VyIikgeworICAgICAgICByZXR1cm47Cisg ICAgfQorCisgICAgcHJpbnQgIkluc3RhbGxpbmcgNjQtYml0IEFuZHJvaWQgbGlua2VyIGluICRs aW5rZXJEaXJuYW1lLi5cbiI7CisgICAgc3lzdGVtKCJjcCIsICJ0aGlyZF9wYXJ0eS9hb3NwLyRu ZXdMaW5rZXIiLCAiJGxpbmtlckRpcm5hbWUvJG5ld0xpbmtlciIpOworICAgIHN5c3RlbSgibXYi LCAiJGxpbmtlckRpcm5hbWUvJGxpbmtlckJhc2VuYW1lIiwgIiRsaW5rZXJEaXJuYW1lLyRsaW5r ZXJCYXNlbmFtZS5vcmlnIik7CisgICAgc3lzdGVtKCJsbiIsICItcyIsICIkbmV3TGlua2VyIiwg IiRsaW5rZXJEaXJuYW1lLyRsaW5rZXJCYXNlbmFtZSIpOworCisgICAgaWYgKCEgLWUgIiRsaW5r ZXJEaXJuYW1lLyRuZXdMaW5rZXIiKSB7CisgICAgICAgIHByaW50ICJVbmFibGUgdG8gY29weSB0 aGUgbGlua2VyLlxuIjsKKyAgICAgICAgZXhpdCAxOworICAgIH0KK30KKwogc3ViIGFwcGxlQXBw bGljYXRpb25TdXBwb3J0UGF0aAogewogICAgIG9wZW4gSU5TVEFMTF9ESVIsICI8L3Byb2MvcmVn aXN0cnkvSEtFWV9MT0NBTF9NQUNISU5FL1NPRlRXQVJFL0FwcGxlXCBJbmMuL0FwcGxlXCBBcHBs aWNhdGlvblwgU3VwcG9ydC9JbnN0YWxsRGlyIjsK