67034 2011-08-26 06:14:12 -0700 Teach scripts how to handle the building env. for the Chromium port on OS(ANDROID) 2011-10-11 06:59:43 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 67032 1 peter webkit-unassigned abarth steveblock webkit.review.bot oldest_to_newest 457535 0 105355 peter 2011-08-26 06:14:12 -0700 Created attachment 105355 Patch Building WebKit for Android requires the toolchain from Android's NDK to be used. Furthermore, the project files need to be taught that OS=android and the DEPS file should be able to have custom dependencies for Android. This patch introduces the --chromium-android command line switch for update-webkit, update-webkit-chromium and build-webkit. It's a bit rough right now, and I'm mostly curious to your opinions about the environment variables being set in webkitdirs.pm. Is this the right approach? 457696 1 105355 abarth 2011-08-26 12:14:24 -0700 Comment on attachment 105355 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=105355&action=review > Tools/Scripts/update-webkit:103 > + push @chromiumUpdateArgs, "--chromium-android" if isChromiumAndroid(); Thus flag can probably just be --android b/c update-webkit-chromium already implies Chromium. > Tools/Scripts/update-webkit-chromium:37 > +determineIsChromiumAndroid(); I see, but you're just sharing code. Yeah, your way is better. > Tools/Scripts/update-webkit-chromium:63 > + # TODO(beverloo) Add code to automatically download the NDK TODO(beverloo) => FIXME ^^^ WebKit's style is to use FIXME rather than TODO. > Tools/Scripts/update-webkit-chromium:79 > +push @gclientArgs, "--deps=unix,android" if isChromiumAndroid(); We grab the unix deps, even on Mac? > Tools/Scripts/webkitdirs.pm:1912 > + my $ndkBaseDir = getcwd() . "/Source/WebKit/chromium/third_party/android-ndk-r6"; You sure getcwd() is right here? I would have expected sourceDir(). Please make sure this works when run from outside the root before landing. 457953 2 peter 2011-08-27 10:54:05 -0700 Thank you for the review! (In reply to comment #1) > (From update of attachment 105355 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=105355&action=review > > > Tools/Scripts/update-webkit-chromium:63 > > + # TODO(beverloo) Add code to automatically download the NDK > > TODO(beverloo) => FIXME > ^^^ WebKit's style is to use FIXME rather than TODO. Done. > > Tools/Scripts/update-webkit-chromium:79 > > +push @gclientArgs, "--deps=unix,android" if isChromiumAndroid(); > > We grab the unix deps, even on Mac? Yes, we're building for Android, which is based on Linux (gclient uses "unix" instead of "linux"). > > Tools/Scripts/webkitdirs.pm:1912 > > + my $ndkBaseDir = getcwd() . "/Source/WebKit/chromium/third_party/android-ndk-r6"; > > You sure getcwd() is right here? I would have expected sourceDir(). Please make sure this works when run from outside the root before landing. build-webkit (just like update-webkit and update-webkit-chrmoium) chdir as one of the first steps in their execution. Since sourceDir() ensures this, however, I've updated the line. 457955 3 105440 peter 2011-08-27 10:54:45 -0700 Created attachment 105440 Patch Updated patch 457960 4 105440 webkit.review.bot 2011-08-27 11:57:29 -0700 Comment on attachment 105440 Patch Clearing flags on attachment: 105440 Committed r93939: <http://trac.webkit.org/changeset/93939> 457961 5 webkit.review.bot 2011-08-27 11:57:34 -0700 All reviewed patches have been landed. Closing bug. 479072 6 steveblock 2011-10-06 04:57:02 -0700 Now that update-webkit and build-webkit work for chromium-android, are there plans to update the setup and build instructions for the Chromium Port to cover building on Android? For example, we should probably update http://trac.webkit.org/wiki/Chromium and http://www.webkit.org/building/tools.html. Let me know if I should file a bug. 481589 7 peter 2011-10-11 06:04:28 -0700 I think it's better to wait until we have DRT building and linking without local changes, as that's still not the case. Having unusable instructions wouldn't serve a lot of purpose. 481590 8 peter 2011-10-11 06:05:25 -0700 Addendum: filing a bug to make sure we don't forget it is fine, of course. Thanks. 481612 9 steveblock 2011-10-11 06:59:43 -0700 Filed Bug 69837. Let's continue discussion there. 105355 2011-08-26 06:14:12 -0700 2011-08-27 10:54:45 -0700 Patch patch-buildbot-scripts.patch text/plain 8267 peter ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggYTc0MGFkMC4uOGE0YTMyNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMS0wOC0yNiAgUGV0ZXIgQmV2 ZXJsb28gIDxwZXRlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgVGVhY2ggdGhlIHVwZGF0ZSBh bmQgYnVpbGQgc2NyaXB0cyBob3cgdG8gaGFuZGxlIGRlcGVuZGVuY2llcworICAgICAgICBhbmQg Y3Jvc3MtY29tcGlsaW5nIHJ1bGVzIGZvciB0aGUgQ2hyb21pdW0gcG9ydCBvbiBPUyhBTkRST0lE KS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2Njg3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBneXBf d2Via2l0OgorCiAyMDExLTA4LTI1ICBKZXJlbXkgQXB0aG9ycCAgPGplcmVteWFAZ29vZ2xlLmNv bT4KIAogICAgICAgICBFbmFibGUgZnVsbHNjcmVlbiBBUEkgaW4gQ2hyb21pdW0gYnkgZGVmYXVs dC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vZ3lwX3dlYmtpdCBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vZ3lwX3dlYmtpdAppbmRleCA1ZjlmMWFjLi41MjQ3NzU2IDEwMDc1 NQotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2d5cF93ZWJraXQKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9neXBfd2Via2l0CkBAIC05MCw3ICs5MCw3IEBAIGlmIF9fbmFtZV9fID09 ICdfX21haW5fXyc6CiAgICAgYXJncy5hcHBlbmQoJy0tbm8tY2lyY3VsYXItY2hlY2snKQogCiAg ICMgT24gbGludXgsIHdlIHdhbnQgZ3lwIHRvIG91dHB1dCBhIG1ha2VmaWxlIChkZWZhdWx0IGlz IHNjb25zKS4KLSAgaWYgc3lzLnBsYXRmb3JtLnN0YXJ0c3dpdGgoJ2xpbnV4Jyk6CisgIGlmIHN5 cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCdsaW51eCcpIG9yICdHWVBfQU5EUk9JRF9CVUlMRCcgaW4g b3MuZW52aXJvbjoKICAgICBhcmdzLmV4dGVuZChbJy1mbWFrZScsCiAgICAgICAgICAgICAgICAg ICctLXN1ZmZpeD0uY2hyb21pdW0nLAogICAgICAgICAgICAgICAgICAnLS10b3BsZXZlbC1kaXI9 Li4vLi4vLi4nLApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9n CmluZGV4IDU4ZTFlYmYuLjdjZGEyMWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysg Yi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMS0wOC0yNiAgUGV0ZXIgQmV2 ZXJsb28gIDxwZXRlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgVGVhY2ggdGhlIHVwZGF0ZSBh bmQgYnVpbGQgc2NyaXB0cyBob3cgdG8gaGFuZGxlIGRlcGVuZGVuY2llcworICAgICAgICBhbmQg Y3Jvc3MtY29tcGlsaW5nIHJ1bGVzIGZvciB0aGUgQ2hyb21pdW0gcG9ydCBvbiBPUyhBTkRST0lE KS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2Njg3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3Jp cHRzL2J1aWxkLXdlYmtpdDoKKyAgICAgICAgKiBTY3JpcHRzL3VwZGF0ZS13ZWJraXQ6CisgICAg ICAgICogU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtOgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0ZGlycy5wbToKKyAgICAgICAgKGFyZ3VtZW50c0ZvckNvbmZpZ3VyYXRpb24pOgorICAg ICAgICAoaXNDaHJvbWl1bSk6CisgICAgICAgIChpc0Nocm9taXVtQW5kcm9pZCk6CisgICAgICAg IChkZXRlcm1pbmVJc0Nocm9taXVtQW5kcm9pZCk6CisgICAgICAgIChidWlsZENocm9taXVtKToK KwogMjAxMS0wOC0yNiAgTm9lbCBHb3Jkb24gIDxub2VsLmdvcmRvbkBnbWFpbC5jb20+CiAKICAg ICAgICAgTWFrZSBzaG93LXByZXR0eS1kaWZmIHdvcmsgb24gbGludXgKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0IGIvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKaW5k ZXggYzFiYjNmOC4uZjZiMTVhMyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJr aXQKKysrIGIvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKQEAgLTM2NSw2ICszNjUsNyBAQCBV c2FnZTogJHByb2dyYW1OYW1lIFtvcHRpb25zXSBbb3B0aW9ucyB0byBwYXNzIHRvIGJ1aWxkIHN5 c3RlbV0KICAgLS1kc3ltICAgICAgICAgICAgICAgICAgICAgICAgICAgIENoYW5nZSBkZWJ1Z2dp bmcgZm9ybWF0IHRvIGR3YXJmLXdpdGgtZHN5bSAoTWFjIG9ubHkpCiAKICAgLS1jaHJvbWl1bSAg ICAgICAgICAgICAgICAgICAgICAgIEJ1aWxkIHRoZSBDaHJvbWl1bSBwb3J0IG9uIE1hYy9XaW4v TGludXgKKyAgLS1jaHJvbWl1bS1hbmRyb2lkICAgICAgICAgICAgICAgIEJ1aWxkIHRoZSBDaHJv bWl1bSBwb3J0IG9uIEFuZHJvaWQKICAgLS1lZmwgICAgICAgICAgICAgICAgICAgICAgICAgICAg IEJ1aWxkIHRoZSBFRkwgcG9ydAogICAtLWd0ayAgICAgICAgICAgICAgICAgICAgICAgICAgICAg QnVpbGQgdGhlIEdUSysgcG9ydAogICAtLXF0ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg QnVpbGQgdGhlIFF0IHBvcnQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtp dCBiL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdAppbmRleCBlMTkyNDM4Li4zMDVjMDQyIDEw MDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQKKysrIGIvVG9vbHMvU2NyaXB0 cy91cGRhdGUtd2Via2l0CkBAIC00OSw2ICs0OSw3IEBAIG15ICRzaG93SGVscDsKIG15ICR1c2VH WVAgPSAwOwogCiBkZXRlcm1pbmVJc0Nocm9taXVtKCk7CitkZXRlcm1pbmVJc0Nocm9taXVtQW5k cm9pZCgpOwogCiBkZXRlcm1pbmVJc1dpbkNhaXJvKCk7CiAKQEAgLTYzLDExICs2NCwxMiBAQCBt eSAkZ2V0T3B0aW9uc1Jlc3VsdCA9IEdldE9wdGlvbnMoCiBpZiAoISRnZXRPcHRpb25zUmVzdWx0 IHx8ICRzaG93SGVscCkgewogICAgIHByaW50IFNUREVSUiA8PF9fRU5EX187CiBVc2FnZTogQHtb IGJhc2VuYW1lKCQwKSBdfSBbb3B0aW9uc10KLSAgLS1jaHJvbWl1bSAgYWxzbyB1cGRhdGUgZGVw ZW5kZW5jaWVzIG9mIHRoZSBjaHJvbWl1bSBwb3J0Ci0gIC1ofC0taGVscCAgIHNob3cgdGhlIGhl bHAgbWVzc2FnZQotICAtcXwtLXF1aWV0ICBwYXNzIC1xIHRvIHN2biB1cGRhdGUgZm9yIHF1aWV0 IHVwZGF0ZXMKLSAgLS1neXAgICAgICAgZ2VuZXJhdGUgcHJvamVjdCBmaWxlcyBmcm9tIGd5cCBh ZnRlciB1cGRhdGUKLSAgLS13aW5jYWlybyAgYWxzbyB1cGRhdGUgZGVwZW5kZW5jaWVzIG9mIHRo ZSBXaW5DYWlybyBwb3J0CisgIC0tY2hyb21pdW0gICAgICAgICAgYWxzbyB1cGRhdGUgZGVwZW5k ZW5jaWVzIG9mIHRoZSBjaHJvbWl1bSBwb3J0CisgIC0tY2hyb21pdW0tYW5kcm9pZCAgYWxzbyB1 cGRhdGUgZGVwZW5kZW5jaWVzIG9mIHRoZSBjaHJvbWl1bSBwb3J0IGZvciBBbmRyb2lkCisgIC1o fC0taGVscCAgICAgICAgICAgc2hvdyB0aGUgaGVscCBtZXNzYWdlCisgIC1xfC0tcXVpZXQgICAg ICAgICAgcGFzcyAtcSB0byBzdm4gdXBkYXRlIGZvciBxdWlldCB1cGRhdGVzCisgIC0tZ3lwICAg ICAgICAgICAgICAgZ2VuZXJhdGUgcHJvamVjdCBmaWxlcyBmcm9tIGd5cCBhZnRlciB1cGRhdGUK KyAgLS13aW5jYWlybyAgICAgICAgICBhbHNvIHVwZGF0ZSBkZXBlbmRlbmNpZXMgb2YgdGhlIFdp bkNhaXJvIHBvcnQKIF9fRU5EX18KICAgICBleGl0IDE7CiB9CkBAIC05Nyw3ICs5OSw5IEBAIGlm ICgtZCAiLi4vSW50ZXJuYWwiKSB7CiAgICAgICAgIHJtdHJlZShbIldlYktpdC9jaHJvbWl1bS9E ZWJ1ZyIsICJXZWJLaXQvY2hyb21pdW0vUmVsZWFzZSJdKTsKICAgICB9CiAKLSAgICBzeXN0ZW0o InBlcmwiLCAiVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtIikgPT0gMCBvciBk aWUgJCE7CisgICAgbXkgQGNocm9taXVtVXBkYXRlQXJncyA9ICgicGVybCIsICJUb29scy9TY3Jp cHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW0iKTsKKyAgICBwdXNoIEBjaHJvbWl1bVVwZGF0ZUFy Z3MsICItLWNocm9taXVtLWFuZHJvaWQiIGlmIGlzQ2hyb21pdW1BbmRyb2lkKCk7CisgICAgc3lz dGVtKEBjaHJvbWl1bVVwZGF0ZUFyZ3MpID09IDAgb3IgZGllICQhOwogfSBlbHNpZiAoaXNBcHBs ZVdpbldlYktpdCgpKSB7CiAgICAgc3lzdGVtKCJwZXJsIiwgIlRvb2xzL1NjcmlwdHMvdXBkYXRl LXdlYmtpdC1hdXhpbGlhcnktbGlicyIpID09IDAgb3IgZGllOwogICAgIGlmIChpc1dpbkNhaXJv KCkpIHsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bSBi L1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bQppbmRleCBiM2YwYWUzLi43MDFk ZmRkIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW0KKysr IGIvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtCkBAIC0zNCw2ICszNCw4IEBA IHVzZSBHZXRvcHQ6Okxvbmc7CiB1c2UgbGliICRGaW5kQmluOjpCaW47CiB1c2Ugd2Via2l0ZGly czsKIAorZGV0ZXJtaW5lSXNDaHJvbWl1bUFuZHJvaWQoKTsKKwogY2hkaXIoIlNvdXJjZS9XZWJL aXQvY2hyb21pdW0iKSBvciBkaWUgJCE7CiAKICMgRmluZCBnY2xpZW50IG9yIGluc3RhbGwgaXQu CkBAIC01Niw2ICs1OCwxNCBAQCBpZiAoISAtZSAiLmdjbGllbnQiKSB7CiAgICAgICAgICAgICIt LXNwZWM9c29sdXRpb25zPVt7J25hbWUnOicuLycsJ3VybCc6Tm9uZX1dIikgPT0gMCBvciBkaWUg JCE7CiB9CiAKKyMgU2V0IGNlcnRhaW4gZ3lwIHNldHRpbmdzIGZvciB0aGUgQW5kcm9pZCBidWls ZAoraWYgKGlzQ2hyb21pdW1BbmRyb2lkKCkpIHsKKyAgICAjIFRPRE8oYmV2ZXJsb28pIEFkZCBj b2RlIHRvIGF1dG9tYXRpY2FsbHkgZG93bmxvYWQgdGhlIE5ESworICAgIG15ICRob3N0X29zID0g aXNMaW51eCgpID8gImxpbnV4IiA6ICJtYWMiOworICAgICRFTlZ7R1lQX0RFRklORVN9ID0gIk9T PWFuZHJvaWQgaG9zdF9vcz0iIC4gJGhvc3Rfb3MgLiAiIHRhcmdldF9hcmNoPWFybSBhcm1fbmVv bj0xIGFybXY3PTEgYXJtX3RodW1iPTEgbGludXhfZnBpYz0xIHVzZV9vcGVuc3NsPTEgdXNlX3N5 c3RlbV9saWJqcGVnPTAgbGludXhfdXNlX3RjbWFsbG9jPTAiOworICAgICRFTlZ7R1lQX0FORFJP SURfQlVJTER9ID0gMTsKK30KKwogbXkgJGZvcmNlID0gMDsKIEdldE9wdGlvbnMoCiAgICdmb3Jj ZScgPT4gXCRmb3JjZSwKQEAgLTY2LDQgKzc2LDUgQEAgcHJpbnQgIlVwZGF0aW5nIGNocm9taXVt IHBvcnQgZGVwZW5kZW5jaWVzIHVzaW5nIGdjbGllbnQuLi5cbiI7CiBteSBAZ2NsaWVudEFyZ3Mg PSAoJGdjbGllbnRQYXRoLCAic3luYyIpOwogcHVzaCBAZ2NsaWVudEFyZ3MsICItLWZvcmNlIiBp ZiAkZm9yY2U7CiBwdXNoIEBnY2xpZW50QXJncywgIi0tZGVsZXRlX3VudmVyc2lvbmVkX3RyZWVz IiBpZiAkZm9yY2U7CitwdXNoIEBnY2xpZW50QXJncywgIi0tZGVwcz11bml4LGFuZHJvaWQiIGlm IGlzQ2hyb21pdW1BbmRyb2lkKCk7CiBzeXN0ZW0oQGdjbGllbnRBcmdzKSA9PSAwIG9yIGRpZSAk ITsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbQppbmRleCBkM2Y3MzgxLi5iZjA4ZDVhIDEwMDY0NAotLS0gYS9Ub29s cy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBt CkBAIC03Miw2ICs3Miw3IEBAIG15ICRpc1d4OwogbXkgJGlzRWZsOwogbXkgQHd4QXJnczsKIG15 ICRpc0Nocm9taXVtOworbXkgJGlzQ2hyb21pdW1BbmRyb2lkOwogbXkgJGlzSW5zcGVjdG9yRnJv bnRlbmQ7CiBteSAkaXNXSzI7CiAKQEAgLTI4NCw3ICsyODUsOCBAQCBzdWIgYXJndW1lbnRzRm9y Q29uZmlndXJhdGlvbigpCiAgICAgcHVzaChAYXJncywgJy0tZWZsJykgaWYgaXNFZmwoKTsKICAg ICBwdXNoKEBhcmdzLCAnLS13aW5jZScpIGlmIGlzV2luQ0UoKTsKICAgICBwdXNoKEBhcmdzLCAn LS13eCcpIGlmIGlzV3goKTsKLSAgICBwdXNoKEBhcmdzLCAnLS1jaHJvbWl1bScpIGlmIGlzQ2hy b21pdW0oKTsKKyAgICBwdXNoKEBhcmdzLCAnLS1jaHJvbWl1bScpIGlmIGlzQ2hyb21pdW0oKSAm JiAhaXNDaHJvbWl1bUFuZHJvaWQoKTsKKyAgICBwdXNoKEBhcmdzLCAnLS1jaHJvbWl1bS1hbmRy b2lkJykgaWYgaXNDaHJvbWl1bUFuZHJvaWQoKTsKICAgICBwdXNoKEBhcmdzLCAnLS1pbnNwZWN0 b3ItZnJvbnRlbmQnKSBpZiBpc0luc3BlY3RvckZyb250ZW5kKCk7CiAgICAgcmV0dXJuIEBhcmdz OwogfQpAQCAtODcxLDcgKzg3Myw4IEBAIHN1YiBpc0ZlZG9yYUJhc2VkKCkKIHN1YiBpc0Nocm9t aXVtKCkKIHsKICAgICBkZXRlcm1pbmVJc0Nocm9taXVtKCk7Ci0gICAgcmV0dXJuICRpc0Nocm9t aXVtOworICAgIGRldGVybWluZUlzQ2hyb21pdW1BbmRyb2lkKCk7CisgICAgcmV0dXJuICRpc0No cm9taXVtIHx8ICRpc0Nocm9taXVtQW5kcm9pZDsKIH0KIAogc3ViIGRldGVybWluZUlzQ2hyb21p dW0oKQpAQCAtODgwLDYgKzg4MywxOCBAQCBzdWIgZGV0ZXJtaW5lSXNDaHJvbWl1bSgpCiAgICAg JGlzQ2hyb21pdW0gPSBjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tY2hyb21p dW0iKTsKIH0KIAorc3ViIGlzQ2hyb21pdW1BbmRyb2lkKCkKK3sKKyAgICBkZXRlcm1pbmVJc0No cm9taXVtQW5kcm9pZCgpOworICAgIHJldHVybiAkaXNDaHJvbWl1bUFuZHJvaWQ7Cit9CisKK3N1 YiBkZXRlcm1pbmVJc0Nocm9taXVtQW5kcm9pZCgpCit7CisgICAgcmV0dXJuIGlmIGRlZmluZWQo JGlzQ2hyb21pdW1BbmRyb2lkKTsKKyAgICAkaXNDaHJvbWl1bUFuZHJvaWQgPSBjaGVja0ZvckFy Z3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tY2hyb21pdW0tYW5kcm9pZCIpOworfQorCiBzdWIg aXNXaW5DYWlybygpCiB7CiAgICAgZGV0ZXJtaW5lSXNXaW5DYWlybygpOwpAQCAtMTg5MSw3ICsx OTA2LDIzIEBAIHN1YiBidWlsZENocm9taXVtKCRAKQogICAgIH0KIAogICAgIG15ICRyZXN1bHQg PSAxOwotICAgIGlmIChpc0RhcndpbigpKSB7CisgICAgaWYgKGlzQ2hyb21pdW1BbmRyb2lkKCkp IHsKKyAgICAgICAgIyBCdWlsZGluZyBXZWJLaXQncyBDaHJvbWl1bSBwb3J0IGZvciBBbmRyb2lk IG5lZWRzIHRvIGNyb3NzLWNvbXBpbGUKKyAgICAgICAgIyB1c2luZyB0aGUgdG9vbGNoYWlucyBz dXBwbGllZCBieSB0aGUgQW5kcm9pZCBOREsuCisgICAgICAgIG15ICRuZGtCYXNlRGlyID0gZ2V0 Y3dkKCkgLiAiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGhpcmRfcGFydHkvYW5kcm9pZC1uZGst cjYiOworICAgICAgICBteSAkcGxhdGZvcm0gPSBpc0RhcndpbigpID8gImRhcndpbi14ODYiIDog ImxpbnV4LXg4NiI7CisKKyAgICAgICAgbXkgJHRvb2xjaGFpbkJhc2UgPSAkbmRrQmFzZURpciAu ICIvdG9vbGNoYWlucy9hcm0tbGludXgtYW5kcm9pZGVhYmktNC40LjMvcHJlYnVpbHQvIiAuICRw bGF0Zm9ybSAuICIvYmluL2FybS1saW51eC1hbmRyb2lkZWFiaS0iOworCisgICAgICAgICRFTlZ7 QVJ9ID0gJHRvb2xjaGFpbkJhc2UgLiAiYXIiOworICAgICAgICAkRU5We0NDfSA9ICR0b29sY2hh aW5CYXNlIC4gImdjYyI7CisgICAgICAgICRFTlZ7Q1hYfSA9ICR0b29sY2hhaW5CYXNlIC4gImcr KyI7CisgICAgICAgICRFTlZ7TElOS30gPSAkdG9vbGNoYWluQmFzZSAuICJnY2MiOworICAgICAg ICAkRU5We1JBTkxJQn0gPSAkdG9vbGNoYWluQmFzZSAuICJyYW5saWIiOworICAgICAgICAkRU5W e1NUUklQfSA9ICR0b29sY2hhaW5CYXNlIC4gInN0cmlwIjsKKworICAgICAgICAkcmVzdWx0ID0g YnVpbGRDaHJvbWl1bU1ha2VmaWxlKCJhbGwiLCAkY2xlYW4pOworICAgIH0gZWxzaWYgKGlzRGFy d2luKCkpIHsKICAgICAgICAgIyBNYWMgYnVpbGQgLSBidWlsZHMgdGhlIHJvb3QgeGNvZGUgcHJv amVjdC4KICAgICAgICAgJHJlc3VsdCA9IGJ1aWxkWENvZGVQcm9qZWN0KCJTb3VyY2UvV2ViS2l0 L2Nocm9taXVtL1dlYktpdCIsICRjbGVhbiwgIi1jb25maWd1cmF0aW9uIiwgY29uZmlndXJhdGlv bigpLCBAb3B0aW9ucyk7CiAgICAgfSBlbHNpZiAoaXNDeWd3aW4oKSB8fCBpc1dpbmRvd3MoKSkg ewo= 105440 2011-08-27 10:54:45 -0700 2011-08-27 11:57:29 -0700 Patch script-patch-2.patch text/plain 8248 peter ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggYTc0MGFkMC4uOGE0YTMyNCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAxMS0wOC0yNiAgUGV0ZXIgQmV2 ZXJsb28gIDxwZXRlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgVGVhY2ggdGhlIHVwZGF0ZSBh bmQgYnVpbGQgc2NyaXB0cyBob3cgdG8gaGFuZGxlIGRlcGVuZGVuY2llcworICAgICAgICBhbmQg Y3Jvc3MtY29tcGlsaW5nIHJ1bGVzIGZvciB0aGUgQ2hyb21pdW0gcG9ydCBvbiBPUyhBTkRST0lE KS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2Njg3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBneXBf d2Via2l0OgorCiAyMDExLTA4LTI1ICBKZXJlbXkgQXB0aG9ycCAgPGplcmVteWFAZ29vZ2xlLmNv bT4KIAogICAgICAgICBFbmFibGUgZnVsbHNjcmVlbiBBUEkgaW4gQ2hyb21pdW0gYnkgZGVmYXVs dC4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vZ3lwX3dlYmtpdCBiL1NvdXJj ZS9XZWJLaXQvY2hyb21pdW0vZ3lwX3dlYmtpdAppbmRleCA1ZjlmMWFjLi41MjQ3NzU2IDEwMDc1 NQotLS0gYS9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2d5cF93ZWJraXQKKysrIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9neXBfd2Via2l0CkBAIC05MCw3ICs5MCw3IEBAIGlmIF9fbmFtZV9fID09 ICdfX21haW5fXyc6CiAgICAgYXJncy5hcHBlbmQoJy0tbm8tY2lyY3VsYXItY2hlY2snKQogCiAg ICMgT24gbGludXgsIHdlIHdhbnQgZ3lwIHRvIG91dHB1dCBhIG1ha2VmaWxlIChkZWZhdWx0IGlz IHNjb25zKS4KLSAgaWYgc3lzLnBsYXRmb3JtLnN0YXJ0c3dpdGgoJ2xpbnV4Jyk6CisgIGlmIHN5 cy5wbGF0Zm9ybS5zdGFydHN3aXRoKCdsaW51eCcpIG9yICdHWVBfQU5EUk9JRF9CVUlMRCcgaW4g b3MuZW52aXJvbjoKICAgICBhcmdzLmV4dGVuZChbJy1mbWFrZScsCiAgICAgICAgICAgICAgICAg ICctLXN1ZmZpeD0uY2hyb21pdW0nLAogICAgICAgICAgICAgICAgICAnLS10b3BsZXZlbC1kaXI9 Li4vLi4vLi4nLApkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9n CmluZGV4IDU4ZTFlYmYuLjdjZGEyMWIgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysg Yi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMSBAQAorMjAxMS0wOC0yNiAgUGV0ZXIgQmV2 ZXJsb28gIDxwZXRlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgVGVhY2ggdGhlIHVwZGF0ZSBh bmQgYnVpbGQgc2NyaXB0cyBob3cgdG8gaGFuZGxlIGRlcGVuZGVuY2llcworICAgICAgICBhbmQg Y3Jvc3MtY29tcGlsaW5nIHJ1bGVzIGZvciB0aGUgQ2hyb21pdW0gcG9ydCBvbiBPUyhBTkRST0lE KS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTY2Njg3 CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3Jp cHRzL2J1aWxkLXdlYmtpdDoKKyAgICAgICAgKiBTY3JpcHRzL3VwZGF0ZS13ZWJraXQ6CisgICAg ICAgICogU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtOgorICAgICAgICAqIFNjcmlwdHMv d2Via2l0ZGlycy5wbToKKyAgICAgICAgKGFyZ3VtZW50c0ZvckNvbmZpZ3VyYXRpb24pOgorICAg ICAgICAoaXNDaHJvbWl1bSk6CisgICAgICAgIChpc0Nocm9taXVtQW5kcm9pZCk6CisgICAgICAg IChkZXRlcm1pbmVJc0Nocm9taXVtQW5kcm9pZCk6CisgICAgICAgIChidWlsZENocm9taXVtKToK KwogMjAxMS0wOC0yNiAgTm9lbCBHb3Jkb24gIDxub2VsLmdvcmRvbkBnbWFpbC5jb20+CiAKICAg ICAgICAgTWFrZSBzaG93LXByZXR0eS1kaWZmIHdvcmsgb24gbGludXgKZGlmZiAtLWdpdCBhL1Rv b2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0IGIvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKaW5k ZXggYzFiYjNmOC4uZjZiMTVhMyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJr aXQKKysrIGIvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKQEAgLTM2NSw2ICszNjUsNyBAQCBV c2FnZTogJHByb2dyYW1OYW1lIFtvcHRpb25zXSBbb3B0aW9ucyB0byBwYXNzIHRvIGJ1aWxkIHN5 c3RlbV0KICAgLS1kc3ltICAgICAgICAgICAgICAgICAgICAgICAgICAgIENoYW5nZSBkZWJ1Z2dp bmcgZm9ybWF0IHRvIGR3YXJmLXdpdGgtZHN5bSAoTWFjIG9ubHkpCiAKICAgLS1jaHJvbWl1bSAg ICAgICAgICAgICAgICAgICAgICAgIEJ1aWxkIHRoZSBDaHJvbWl1bSBwb3J0IG9uIE1hYy9XaW4v TGludXgKKyAgLS1jaHJvbWl1bS1hbmRyb2lkICAgICAgICAgICAgICAgIEJ1aWxkIHRoZSBDaHJv bWl1bSBwb3J0IG9uIEFuZHJvaWQKICAgLS1lZmwgICAgICAgICAgICAgICAgICAgICAgICAgICAg IEJ1aWxkIHRoZSBFRkwgcG9ydAogICAtLWd0ayAgICAgICAgICAgICAgICAgICAgICAgICAgICAg QnVpbGQgdGhlIEdUSysgcG9ydAogICAtLXF0ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg QnVpbGQgdGhlIFF0IHBvcnQKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtp dCBiL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdAppbmRleCBlMTkyNDM4Li4zMDVjMDQyIDEw MDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQKKysrIGIvVG9vbHMvU2NyaXB0 cy91cGRhdGUtd2Via2l0CkBAIC00OSw2ICs0OSw3IEBAIG15ICRzaG93SGVscDsKIG15ICR1c2VH WVAgPSAwOwogCiBkZXRlcm1pbmVJc0Nocm9taXVtKCk7CitkZXRlcm1pbmVJc0Nocm9taXVtQW5k cm9pZCgpOwogCiBkZXRlcm1pbmVJc1dpbkNhaXJvKCk7CiAKQEAgLTYzLDExICs2NCwxMiBAQCBt eSAkZ2V0T3B0aW9uc1Jlc3VsdCA9IEdldE9wdGlvbnMoCiBpZiAoISRnZXRPcHRpb25zUmVzdWx0 IHx8ICRzaG93SGVscCkgewogICAgIHByaW50IFNUREVSUiA8PF9fRU5EX187CiBVc2FnZTogQHtb IGJhc2VuYW1lKCQwKSBdfSBbb3B0aW9uc10KLSAgLS1jaHJvbWl1bSAgYWxzbyB1cGRhdGUgZGVw ZW5kZW5jaWVzIG9mIHRoZSBjaHJvbWl1bSBwb3J0Ci0gIC1ofC0taGVscCAgIHNob3cgdGhlIGhl bHAgbWVzc2FnZQotICAtcXwtLXF1aWV0ICBwYXNzIC1xIHRvIHN2biB1cGRhdGUgZm9yIHF1aWV0 IHVwZGF0ZXMKLSAgLS1neXAgICAgICAgZ2VuZXJhdGUgcHJvamVjdCBmaWxlcyBmcm9tIGd5cCBh ZnRlciB1cGRhdGUKLSAgLS13aW5jYWlybyAgYWxzbyB1cGRhdGUgZGVwZW5kZW5jaWVzIG9mIHRo ZSBXaW5DYWlybyBwb3J0CisgIC0tY2hyb21pdW0gICAgICAgICAgYWxzbyB1cGRhdGUgZGVwZW5k ZW5jaWVzIG9mIHRoZSBjaHJvbWl1bSBwb3J0CisgIC0tY2hyb21pdW0tYW5kcm9pZCAgYWxzbyB1 cGRhdGUgZGVwZW5kZW5jaWVzIG9mIHRoZSBjaHJvbWl1bSBwb3J0IGZvciBBbmRyb2lkCisgIC1o fC0taGVscCAgICAgICAgICAgc2hvdyB0aGUgaGVscCBtZXNzYWdlCisgIC1xfC0tcXVpZXQgICAg ICAgICAgcGFzcyAtcSB0byBzdm4gdXBkYXRlIGZvciBxdWlldCB1cGRhdGVzCisgIC0tZ3lwICAg ICAgICAgICAgICAgZ2VuZXJhdGUgcHJvamVjdCBmaWxlcyBmcm9tIGd5cCBhZnRlciB1cGRhdGUK KyAgLS13aW5jYWlybyAgICAgICAgICBhbHNvIHVwZGF0ZSBkZXBlbmRlbmNpZXMgb2YgdGhlIFdp bkNhaXJvIHBvcnQKIF9fRU5EX18KICAgICBleGl0IDE7CiB9CkBAIC05Nyw3ICs5OSw5IEBAIGlm ICgtZCAiLi4vSW50ZXJuYWwiKSB7CiAgICAgICAgIHJtdHJlZShbIldlYktpdC9jaHJvbWl1bS9E ZWJ1ZyIsICJXZWJLaXQvY2hyb21pdW0vUmVsZWFzZSJdKTsKICAgICB9CiAKLSAgICBzeXN0ZW0o InBlcmwiLCAiVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtIikgPT0gMCBvciBk aWUgJCE7CisgICAgbXkgQGNocm9taXVtVXBkYXRlQXJncyA9ICgicGVybCIsICJUb29scy9TY3Jp cHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW0iKTsKKyAgICBwdXNoIEBjaHJvbWl1bVVwZGF0ZUFy Z3MsICItLWNocm9taXVtLWFuZHJvaWQiIGlmIGlzQ2hyb21pdW1BbmRyb2lkKCk7CisgICAgc3lz dGVtKEBjaHJvbWl1bVVwZGF0ZUFyZ3MpID09IDAgb3IgZGllICQhOwogfSBlbHNpZiAoaXNBcHBs ZVdpbldlYktpdCgpKSB7CiAgICAgc3lzdGVtKCJwZXJsIiwgIlRvb2xzL1NjcmlwdHMvdXBkYXRl LXdlYmtpdC1hdXhpbGlhcnktbGlicyIpID09IDAgb3IgZGllOwogICAgIGlmIChpc1dpbkNhaXJv KCkpIHsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bSBi L1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bQppbmRleCBiM2YwYWUzLi41ODE2 MDJhIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW0KKysr IGIvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtCkBAIC0zNCw2ICszNCw4IEBA IHVzZSBHZXRvcHQ6Okxvbmc7CiB1c2UgbGliICRGaW5kQmluOjpCaW47CiB1c2Ugd2Via2l0ZGly czsKIAorZGV0ZXJtaW5lSXNDaHJvbWl1bUFuZHJvaWQoKTsKKwogY2hkaXIoIlNvdXJjZS9XZWJL aXQvY2hyb21pdW0iKSBvciBkaWUgJCE7CiAKICMgRmluZCBnY2xpZW50IG9yIGluc3RhbGwgaXQu CkBAIC01Niw2ICs1OCwxNCBAQCBpZiAoISAtZSAiLmdjbGllbnQiKSB7CiAgICAgICAgICAgICIt LXNwZWM9c29sdXRpb25zPVt7J25hbWUnOicuLycsJ3VybCc6Tm9uZX1dIikgPT0gMCBvciBkaWUg JCE7CiB9CiAKKyMgU2V0IGNlcnRhaW4gZ3lwIHNldHRpbmdzIGZvciB0aGUgQW5kcm9pZCBidWls ZAoraWYgKGlzQ2hyb21pdW1BbmRyb2lkKCkpIHsKKyAgICAjIEZJWE1FOiBBZGQgY29kZSB0byBh dXRvbWF0aWNhbGx5IGRvd25sb2FkIHRoZSBOREsKKyAgICBteSAkaG9zdF9vcyA9IGlzTGludXgo KSA/ICJsaW51eCIgOiAibWFjIjsKKyAgICAkRU5We0dZUF9ERUZJTkVTfSA9ICJPUz1hbmRyb2lk IGhvc3Rfb3M9IiAuICRob3N0X29zIC4gIiB0YXJnZXRfYXJjaD1hcm0gYXJtX25lb249MSBhcm12 Nz0xIGFybV90aHVtYj0xIGxpbnV4X2ZwaWM9MSB1c2Vfb3BlbnNzbD0xIHVzZV9zeXN0ZW1fbGli anBlZz0wIGxpbnV4X3VzZV90Y21hbGxvYz0wIjsKKyAgICAkRU5We0dZUF9BTkRST0lEX0JVSUxE fSA9IDE7Cit9CisKIG15ICRmb3JjZSA9IDA7CiBHZXRPcHRpb25zKAogICAnZm9yY2UnID0+IFwk Zm9yY2UsCkBAIC02Niw0ICs3Niw1IEBAIHByaW50ICJVcGRhdGluZyBjaHJvbWl1bSBwb3J0IGRl cGVuZGVuY2llcyB1c2luZyBnY2xpZW50Li4uXG4iOwogbXkgQGdjbGllbnRBcmdzID0gKCRnY2xp ZW50UGF0aCwgInN5bmMiKTsKIHB1c2ggQGdjbGllbnRBcmdzLCAiLS1mb3JjZSIgaWYgJGZvcmNl OwogcHVzaCBAZ2NsaWVudEFyZ3MsICItLWRlbGV0ZV91bnZlcnNpb25lZF90cmVlcyIgaWYgJGZv cmNlOworcHVzaCBAZ2NsaWVudEFyZ3MsICItLWRlcHM9dW5peCxhbmRyb2lkIiBpZiBpc0Nocm9t aXVtQW5kcm9pZCgpOwogc3lzdGVtKEBnY2xpZW50QXJncykgPT0gMCBvciBkaWUgJCE7CmRpZmYg LS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtp dGRpcnMucG0KaW5kZXggZDNmNzM4MS4uZDZmNDY4ZCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0 cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtNzIs NiArNzIsNyBAQCBteSAkaXNXeDsKIG15ICRpc0VmbDsKIG15IEB3eEFyZ3M7CiBteSAkaXNDaHJv bWl1bTsKK215ICRpc0Nocm9taXVtQW5kcm9pZDsKIG15ICRpc0luc3BlY3RvckZyb250ZW5kOwog bXkgJGlzV0syOwogCkBAIC0yODQsNyArMjg1LDggQEAgc3ViIGFyZ3VtZW50c0ZvckNvbmZpZ3Vy YXRpb24oKQogICAgIHB1c2goQGFyZ3MsICctLWVmbCcpIGlmIGlzRWZsKCk7CiAgICAgcHVzaChA YXJncywgJy0td2luY2UnKSBpZiBpc1dpbkNFKCk7CiAgICAgcHVzaChAYXJncywgJy0td3gnKSBp ZiBpc1d4KCk7Ci0gICAgcHVzaChAYXJncywgJy0tY2hyb21pdW0nKSBpZiBpc0Nocm9taXVtKCk7 CisgICAgcHVzaChAYXJncywgJy0tY2hyb21pdW0nKSBpZiBpc0Nocm9taXVtKCkgJiYgIWlzQ2hy b21pdW1BbmRyb2lkKCk7CisgICAgcHVzaChAYXJncywgJy0tY2hyb21pdW0tYW5kcm9pZCcpIGlm IGlzQ2hyb21pdW1BbmRyb2lkKCk7CiAgICAgcHVzaChAYXJncywgJy0taW5zcGVjdG9yLWZyb250 ZW5kJykgaWYgaXNJbnNwZWN0b3JGcm9udGVuZCgpOwogICAgIHJldHVybiBAYXJnczsKIH0KQEAg LTg3MSw3ICs4NzMsOCBAQCBzdWIgaXNGZWRvcmFCYXNlZCgpCiBzdWIgaXNDaHJvbWl1bSgpCiB7 CiAgICAgZGV0ZXJtaW5lSXNDaHJvbWl1bSgpOwotICAgIHJldHVybiAkaXNDaHJvbWl1bTsKKyAg ICBkZXRlcm1pbmVJc0Nocm9taXVtQW5kcm9pZCgpOworICAgIHJldHVybiAkaXNDaHJvbWl1bSB8 fCAkaXNDaHJvbWl1bUFuZHJvaWQ7CiB9CiAKIHN1YiBkZXRlcm1pbmVJc0Nocm9taXVtKCkKQEAg LTg4MCw2ICs4ODMsMTggQEAgc3ViIGRldGVybWluZUlzQ2hyb21pdW0oKQogICAgICRpc0Nocm9t aXVtID0gY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLWNocm9taXVtIik7CiB9 CiAKK3N1YiBpc0Nocm9taXVtQW5kcm9pZCgpCit7CisgICAgZGV0ZXJtaW5lSXNDaHJvbWl1bUFu ZHJvaWQoKTsKKyAgICByZXR1cm4gJGlzQ2hyb21pdW1BbmRyb2lkOworfQorCitzdWIgZGV0ZXJt aW5lSXNDaHJvbWl1bUFuZHJvaWQoKQoreworICAgIHJldHVybiBpZiBkZWZpbmVkKCRpc0Nocm9t aXVtQW5kcm9pZCk7CisgICAgJGlzQ2hyb21pdW1BbmRyb2lkID0gY2hlY2tGb3JBcmd1bWVudEFu ZFJlbW92ZUZyb21BUkdWKCItLWNocm9taXVtLWFuZHJvaWQiKTsKK30KKwogc3ViIGlzV2luQ2Fp cm8oKQogewogICAgIGRldGVybWluZUlzV2luQ2Fpcm8oKTsKQEAgLTE4OTEsNyArMTkwNiwyMyBA QCBzdWIgYnVpbGRDaHJvbWl1bSgkQCkKICAgICB9CiAKICAgICBteSAkcmVzdWx0ID0gMTsKLSAg ICBpZiAoaXNEYXJ3aW4oKSkgeworICAgIGlmIChpc0Nocm9taXVtQW5kcm9pZCgpKSB7CisgICAg ICAgICMgQnVpbGRpbmcgQ2hyb21pdW0gZm9yIEFuZHJvaWQgbmVlZHMgdG8gY3Jvc3MtY29tcGls ZSB1c2luZyB0aGUKKyAgICAgICAgIyBUb29sY2hhaW5zIHN1cHBsaWVkIGJ5IHRoZSBBbmRyb2lk IE5ESy4KKyAgICAgICAgbXkgJG5ka0Jhc2VEaXIgPSBzb3VyY2VEaXIoKSAuICIvU291cmNlL1dl YktpdC9jaHJvbWl1bS90aGlyZF9wYXJ0eS9hbmRyb2lkLW5kay1yNiI7CisgICAgICAgIG15ICRw bGF0Zm9ybSA9IGlzRGFyd2luKCkgPyAiZGFyd2luLXg4NiIgOiAibGludXgteDg2IjsKKworICAg ICAgICBteSAkdG9vbGNoYWluQmFzZSA9ICRuZGtCYXNlRGlyIC4gIi90b29sY2hhaW5zL2FybS1s aW51eC1hbmRyb2lkZWFiaS00LjQuMy9wcmVidWlsdC8iIC4gJHBsYXRmb3JtIC4gIi9iaW4vYXJt LWxpbnV4LWFuZHJvaWRlYWJpLSI7CisKKyAgICAgICAgJEVOVntBUn0gPSAkdG9vbGNoYWluQmFz ZSAuICJhciI7CisgICAgICAgICRFTlZ7Q0N9ID0gJHRvb2xjaGFpbkJhc2UgLiAiZ2NjIjsKKyAg ICAgICAgJEVOVntDWFh9ID0gJHRvb2xjaGFpbkJhc2UgLiAiZysrIjsKKyAgICAgICAgJEVOVntM SU5LfSA9ICR0b29sY2hhaW5CYXNlIC4gImdjYyI7CisgICAgICAgICRFTlZ7UkFOTElCfSA9ICR0 b29sY2hhaW5CYXNlIC4gInJhbmxpYiI7CisgICAgICAgICRFTlZ7U1RSSVB9ID0gJHRvb2xjaGFp bkJhc2UgLiAic3RyaXAiOworCisgICAgICAgICRyZXN1bHQgPSBidWlsZENocm9taXVtTWFrZWZp bGUoImFsbCIsICRjbGVhbik7CisgICAgfSBlbHNpZiAoaXNEYXJ3aW4oKSkgewogICAgICAgICAj IE1hYyBidWlsZCAtIGJ1aWxkcyB0aGUgcm9vdCB4Y29kZSBwcm9qZWN0LgogICAgICAgICAkcmVz dWx0ID0gYnVpbGRYQ29kZVByb2plY3QoIlNvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0Iiwg JGNsZWFuLCAiLWNvbmZpZ3VyYXRpb24iLCBjb25maWd1cmF0aW9uKCksIEBvcHRpb25zKTsKICAg ICB9IGVsc2lmIChpc0N5Z3dpbigpIHx8IGlzV2luZG93cygpKSB7Cg==