93962 2012-08-14 06:18:33 -0700 [Chromium] Remove unneeded build logic for Android 2012-08-14 07:26:32 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 84843 1 peter peter abarth webkit.review.bot oldest_to_newest 694905 0 peter 2012-08-14 06:18:33 -0700 Now that we can use the in-tree SDK and NDK, a lot of the custom build logic used by Android can be removed. Patch upcoming. 694906 1 158312 peter 2012-08-14 06:21:37 -0700 Created attachment 158312 Patch 694944 2 158312 webkit.review.bot 2012-08-14 07:26:29 -0700 Comment on attachment 158312 Patch Clearing flags on attachment: 158312 Committed r125561: <http://trac.webkit.org/changeset/125561> 694945 3 webkit.review.bot 2012-08-14 07:26:32 -0700 All reviewed patches have been landed. Closing bug. 158312 2012-08-14 06:21:37 -0700 2012-08-14 07:26:29 -0700 Patch bug-93962-20120814142104.patch text/plain 7417 peter U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NTUzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IDFmMTNlZTQ5OWUzY2QxYWIzNWYwOTNiMjg5NjlhNjU5MjY1MjE4MWMuLjkxMjYwODlmNTczZGNm YTZmYzljOTljMDExM2ZkNzI3ZGJhNDM3Y2MgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDUgKzEsMjAgQEAKIDIwMTItMDgtMTQgIFBldGVyIEJldmVybG9vICA8cGV0ZXJAY2hyb21p dW0ub3JnPgogCisgICAgICAgIFtDaHJvbWl1bV0gUmVtb3ZlIHVubmVlZGVkIGJ1aWxkIGxvZ2lj IGZvciBBbmRyb2lkCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNn aT9pZD05Mzk2MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgIFRoZSBBbmRyb2lkIFNESyBhbmQgTkRLIGhhdmUgYmVlbiBjaGVja2VkIGluIHRvIHRoZSBD aHJvbWl1bSB0cmVlLCB3aGljaAorICAgICAgICBhbGxvd3MgV2ViS2l0IHRvIGxldmVyYWdlIHRo b3NlIGFzIHdlbGwuIFRoZXkgd2lsbCBhbHJlYWR5IGJlIHB1bGxlZCBpbgorICAgICAgICB0aHJv dWdoIGEgREVQUyBjaGFuZ2UgbWFkZSBsYXN0IHdlZWssIGFuZCBieSBub3Qgc2V0dGluZyB0aGUg QU5EUk9JRF9OREtfUk9PVAorICAgICAgICBlbnZpcm9ubWVudCB2YXJpYWJsZSwgdGhlIGVudnNl dHVwLnNoIHdpbGwgc2V0IHRoZSBwcm9qZWN0IGZpbGVzIHVwCisgICAgICAgIGFwcHJvcHJpYXRl bHkgZm9yIHVzLgorCisgICAgICAgICogREVQUzoKKworMjAxMi0wOC0xNCAgUGV0ZXIgQmV2ZXJs b28gIDxwZXRlckBjaHJvbWl1bS5vcmc+CisKICAgICAgICAgW0Nocm9taXVtXSBGaXggYXBrIGdl bmVyYXRpb24gZm9yIHRoZSBBbmRyb2lkIHBsYXRmb3JtCiAgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05Mzg0MQogCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0RFUFMgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL0RFUFMKaW5kZXggMWQw ZTczMTViNzU1ZGQzYjNjNmU2ZWYyM2YxMDcwNDg1OWY1NDdmOC4uMzkzMjk4YWFkMzFlZTM3MTFl YzgxYTM1ODc3NGU3MWQ0NmJmZGM1ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9jaHJvbWl1 bS9ERVBTCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vREVQUwpAQCAtMTgxLDggKzE4MSw2 IEBAIGRlcHNfb3MgPSB7CiAgICdhbmRyb2lkJzogewogICAgICd0aGlyZF9wYXJ0eS9hbmRyb2lk X3Rvb2xzJzoKICAgICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2Fu ZHJvaWRfdG9vbHMnKSwKLSAgICAndGhpcmRfcGFydHkvYW9zcCc6Ci0gICAgICBGcm9tKCdjaHJv bWl1bV9kZXBzJywgJ3NyYy90aGlyZF9wYXJ0eS9hb3NwJyksCiAgICAgJ3RoaXJkX3BhcnR5L2Zy ZWV0eXBlJzoKICAgICAgIEZyb20oJ2Nocm9taXVtX2RlcHMnLCAnc3JjL3RoaXJkX3BhcnR5L2Zy ZWV0eXBlJyksCiAgICAgJ3Rvb2xzL2FuZHJvaWQnOgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9jaHJvbWl1bS9neXBfd2Via2l0IGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9neXBfd2Via2l0 CmluZGV4IGZiNzIwZDk3YTJiODFhZDQ5YWM1MDM3YWJlNTNkNzgwMDU0OWIzMzIuLjM2ZjBmNDMx YmZiMzhlNjk4MzNmNjVjZTk0ZjI1MjZhZWIyMTA2ODAgMTAwNzU1Ci0tLSBhL1NvdXJjZS9XZWJL aXQvY2hyb21pdW0vZ3lwX3dlYmtpdAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2d5cF93 ZWJraXQKQEAgLTg3LDkgKzg3LDYgQEAgaWYgX19uYW1lX18gPT0gJ19fbWFpbl9fJzoKICAgICAg IGVudnNldHVwX2xvY2F0aW9uID0gb3MucGF0aC5qb2luKGNocm9tZV9zcmMsICdidWlsZCcsICdh bmRyb2lkJywgJ2VudnNldHVwLnNoJykKICAgICAgIGV4aXQoc3VicHJvY2Vzcy5jYWxsKFsnYmFz aCcsICctYycsICdzb3VyY2UgJXMgJiYgcHl0aG9uIGd5cF93ZWJraXQgLS1uby1lbnZzZXR1cC1y ZWN1cnNpb24gJXMnICUgKGVudnNldHVwX2xvY2F0aW9uLCAnICcuam9pbihhcmdzKSldKSkKICAg ICBlbHNlOgotICAgICAgIyBGSVhNRTogdjggcmVxdWlyZXMgdGhlIENYWF90YXJnZXQgdmFyaWFi bGUgdG8gZGV0ZXJtaW5lIHdoZXRoZXIgLW0zMiBzaG91bGQgYmUKLSAgICAgICMgc2V0LiBUaGUg Y3VycmVudCBBbmRyb2lkIGJ1aWxkIHNldC11cCBpcyBub3Qgc3VzdGFpbmFibGUgYW5kIGJyZWFr cyB0b28gb2Z0ZW4uCi0gICAgICBvcy5lbnZpcm9uWydDWFhfdGFyZ2V0J10gPSBnbG9iLmdsb2Io JyVzLyotZysrJyAlIG9zLmVudmlyb24uZ2V0KCdBTkRST0lEX1RPT0xDSEFJTicpKVswXQogICAg ICAgYXJncy5yZW1vdmUoJy0tbm8tZW52c2V0dXAtcmVjdXJzaW9uJykKIAogICAjIEFkZCBpbmNs dWRlcy4KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRl eCAxNzhlNjRmNzRhYjI4ZDZlNzdhMWQxNWEzMTQwNjkyZTYwNzIzNDYyLi41Zjg0ZWZlYjA5MTY0 ZDk3YWYxMTczNGZmMTQ1ZTU0OGFlYjRlZGI0IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cK KysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTItMDgtMTQgIFBldGVy IEJldmVybG9vICA8cGV0ZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gUmVt b3ZlIHVubmVlZGVkIGJ1aWxkIGxvZ2ljIGZvciBBbmRyb2lkCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD05Mzk2MgorCisgICAgICAgIFJldmlld2VkIGJ5 IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoZSBBbmRyb2lkIFNESyBhbmQgTkRLIGhhdmUg YmVlbiBjaGVja2VkIGluIHRvIHRoZSBDaHJvbWl1bSB0cmVlLCB3aGljaAorICAgICAgICBhbGxv d3MgV2ViS2l0IHRvIGxldmVyYWdlIHRob3NlIGFzIHdlbGwuIFRoZXkgd2lsbCBhbHJlYWR5IGJl IHB1bGxlZCBpbgorICAgICAgICB0aHJvdWdoIGEgREVQUyBjaGFuZ2UgbWFkZSBsYXN0IHdlZWss IGFuZCBieSBub3Qgc2V0dGluZyB0aGUgQU5EUk9JRF9OREtfUk9PVAorICAgICAgICBlbnZpcm9u bWVudCB2YXJpYWJsZSwgdGhlIGVudnNldHVwLnNoIHdpbGwgc2V0IHRoZSBwcm9qZWN0IGZpbGVz IHVwCisgICAgICAgIGFwcHJvcHJpYXRlbHkgZm9yIHVzLgorCisgICAgICAgICogU2NyaXB0cy93 ZWJraXRkaXJzLnBtOgorCiAyMDEyLTA4LTE0ICBTZXJnaW8gVmlsbGFyIFNlbmluICA8c3ZpbGxh ckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtXSzJdIFtHVEtdIFBsdWdpbiB0ZXN0cyBmYWlsaW5n IGluIFdLMiBib3QKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJv bWl1bSBiL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJvbWl1bQppbmRleCBhNWMyNDI0 NDI5MGUxYTBkOTc4YWNkY2U0NDdkMjUxMzczNjcyOTRhLi5iMjFkMDllYzU1YmEzMWVjODZkZjY3 MzIwZTIyYmJmZmExYzU4MTI4IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJr aXQtY2hyb21pdW0KKysrIGIvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtCkBA IC0xLDUgKzEsNCBAQAogIyEvdXNyL2Jpbi9wZXJsIC13Ci0KICMgQ29weXJpZ2h0IChDKSAyMDA5 IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFu ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dApAQCAtNTks MjYgKzU4LDEwIEBAIGlmICghIC1lICIuZ2NsaWVudCIpIHsKICAgICAgICAgICAgIi0tc3BlYz1z b2x1dGlvbnM9W3snbmFtZSc6Jy4vJywndXJsJzpOb25lfV0iKSA9PSAwIG9yIGRpZSAkITsKIH0K IAotIyBXaGVuIGJ1aWxkaW5nIFdlYktpdCdzIENocm9taXVtIHBvcnQgZm9yIEFuZHJvaWQsIHdl IG5lZWQgdGhlIEFuZHJvaWQgTkRLIGFzCi0jIGl0IHdpbGwgYWxsb3cgdXMgdG8gY3Jvc3MtY29t cGlsZSBhbGwgc291cmNlcyB0byB0aGUgdGFyZ2V0IGFyY2hpdGVjdHVyZS4KKyMgV2hlbiBidWls ZGluZyBDaHJvbWl1bSBmb3IgQW5kcm9pZCwgdGhlIGVudnNldHVwLnNoIHNjcmlwdCBuZWVkcyB0 byBiZQorIyBleGVjdXRlZCBwcmlvciB0byBwcm9qZWN0IGZpbGUgZ2VuZXJhdGlvbi4gV2UgbmVl ZCB0byB0ZWxsIGd5cF93ZWJraXQgdG8gZG8KKyMgdGhhdCwgYXMgaXQncyBhIENocm9taXVtIGZp bGUgYW5kIG1heSBub3QgYmUgYXZhaWxhYmxlIHlldCByaWdodCBub3cuCiBpZiAoaXNDaHJvbWl1 bUFuZHJvaWQoKSkgewotICAgIGlmICghIC1lICJhbmRyb2lkLW5kay1yN2IiKSB7Ci0gICAgICAg IHByaW50ICJJbnN0YWxsaW5nIHRoZSBBbmRyb2lkIE5ESywgdmVyc2lvbiA3Yi4uLlxuIjsKLSAg ICAgICAgbXkgJGhvc3Rfb3MgPSBpc0xpbnV4KCkgPyAibGludXgiIDogImRhcndpbiI7Ci0gICAg ICAgIG15ICRyZXN1bHQgPSBzeXN0ZW0oImN1cmwiLCAiLW8iLCAiYW5kcm9pZC1uZGstcjdiLnRh ci5iejIiLCAiaHR0cDovL2RsLmdvb2dsZS5jb20vYW5kcm9pZC9uZGsvYW5kcm9pZC1uZGstcjdi LSIgLiAkaG9zdF9vcyAuICIteDg2LnRhci5iejIiKTsKLSAgICAgICAgZGllICJDb3VsZG4ndCBk b3dubG9hZCB0aGUgQW5kcm9pZCBOREsuIiBpZiAkcmVzdWx0OwotCi0gICAgICAgICRyZXN1bHQg PSBzeXN0ZW0oInRhciIsICJqeCIsICItZiIsICJhbmRyb2lkLW5kay1yN2IudGFyLmJ6MiIpOwot ICAgICAgICBkaWUgIkNvdWxkbid0IGV4dHJhY3QgdGhlIEFuZHJvaWQgTkRLLiIgaWYgJHJlc3Vs dDsKLSAgICB9Ci0KLSAgICBteSAkYW5kcm9pZE5ka1Jvb3QgPSBzb3VyY2VEaXIoKSAuICIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9hbmRyb2lkLW5kay1yN2IiOwotCi0gICAgIyBBdHRlbXB0IHRv IHJlcGxhY2UgdGhlIE5ESydzIGxpbmtlciB3aXRoIGEgNjQtYml0IHZlcnNpb24gaWYgdGhlIGhv c3QKLSAgICAjIE9TIGlzIExpbnV4LiBUaGlzIHdpbGwgc2lnbmlmaWNhbnRseSBzcGVlZCB1cCBs aW5rIHRpbWVzLgotICAgIGNocm9taXVtSW5zdGFsbDY0Qml0QW5kcm9pZExpbmtlcklmTmVlZGVk KCRhbmRyb2lkTmRrUm9vdCkgaWYgaXNMaW51eCgpOwotCi0gICAgJEVOVntBTkRST0lEX05ES19S T09UfSA9ICRhbmRyb2lkTmRrUm9vdDsKICAgICAkRU5We1dFQktJVF9BTkRST0lEX0JVSUxEfSA9 IDE7CiB9CiAKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0ZGlycy5wbQppbmRleCBlNWJmOTU3YzA1OTAyNzFiZGUwOTFiZjBiMmQ4 MTQ4NWViZmU0YjMwLi4xYzNhOTYwMThlYjU3YTMzZGRiMjIyZGQxZDQwMzY3NzI5MTkwMzg3IDEw MDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0 cy93ZWJraXRkaXJzLnBtCkBAIC0yNjE4LDQ5ICsyNjE4LDYgQEAgc3ViIGJ1aWxkQ2hyb21pdW0o JEApCiAgICAgcmV0dXJuICRyZXN1bHQ7CiB9CiAKLXN1YiBjaHJvbWl1bUluc3RhbGw2NEJpdEFu ZHJvaWRMaW5rZXJJZk5lZWRlZAotewotICAgIG15ICgkYW5kcm9pZE5ka1Jvb3QpID0gQF87Ci0K LSAgICAjIFJlc29sdmUgdGhlIHRvb2xjaGFpbiB2ZXJzaW9uIHRocm91Z2ggZ2xvYigpLgotICAg IG15ICRsaW5rZXJEaXJQcmVmaXggPSBnbG9iKCIkYW5kcm9pZE5ka1Jvb3QvdG9vbGNoYWlucy9h cm0tbGludXgtYW5kcm9pZGVhYmktKi9wcmVidWlsdC9saW51eC14ODYiKTsKLQotICAgIG15ICRs aW5rZXJEaXJuYW1lMSA9ICIkbGlua2VyRGlyUHJlZml4L2JpbiI7Ci0gICAgbXkgJGxpbmtlckJh c2VuYW1lMSA9ICJhcm0tbGludXgtYW5kcm9pZGVhYmktbGQiOwotICAgIG15ICRsaW5rZXJEaXJu YW1lMiA9ICIkbGlua2VyRGlyUHJlZml4L2FybS1saW51eC1hbmRyb2lkZWFiaS9iaW4iOwotICAg IG15ICRsaW5rZXJCYXNlbmFtZTIgPSAibGQiOwotICAgIG15ICRuZXdMaW5rZXIgPSAiYXJtLWxp bnV4LWFuZHJvaWRlYWJpLWxkLmU0ZGYzZTBhNWJiNjQwY2NmYTJmMzBlZTY3ZmU5YjMxNDZiMTUy ZDYiOwotCi0gICAgIyBEbyBub3QgY29udGludWUgaWYgdGhlIG5ldyBsaW5rZXIgaXMgbm90ICh5 ZXQpIGF2YWlsYWJsZS4KLSAgICBpZiAoISAtZSAidGhpcmRfcGFydHkvYW9zcC8kbmV3TGlua2Vy IikgewotICAgICAgICByZXR1cm47Ci0gICAgfQotCi0gICAgY2hyb21pdW1SZXBsYWNlQW5kcm9p ZExpbmtlcklmTmVlZGVkKCRsaW5rZXJEaXJuYW1lMSwgJGxpbmtlckJhc2VuYW1lMSwgJG5ld0xp bmtlcik7Ci0gICAgY2hyb21pdW1SZXBsYWNlQW5kcm9pZExpbmtlcklmTmVlZGVkKCRsaW5rZXJE aXJuYW1lMiwgJGxpbmtlckJhc2VuYW1lMiwgJG5ld0xpbmtlcik7Ci19Ci0KLXN1YiBjaHJvbWl1 bVJlcGxhY2VBbmRyb2lkTGlua2VySWZOZWVkZWQKLXsKLSAgICBteSAoJGxpbmtlckRpcm5hbWUs ICRsaW5rZXJCYXNlbmFtZSwgJG5ld0xpbmtlcikgPSBAXzsKLQotICAgICMgSWYgdGhlIGRlc3Rp bmF0aW9uIGRpcmVjdG9yeSBkb2VzIG5vdCBleGlzdCwgb3IgdGhlIGxpbmtlciBoYXMgYWxyZWFk eQotICAgICMgYmVlbiBpbnN0YWxsZWQsIHJlcGxhY2luZyBpdCB3aWxsIG5vdCBiZSBuZWNlc3Nh cnkuCi0gICAgaWYgKCEgLWQgIiRsaW5rZXJEaXJuYW1lIiB8fCAtZSAiJGxpbmtlckRpcm5hbWUv JG5ld0xpbmtlciIpIHsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQotICAgIHByaW50ICJJbnN0 YWxsaW5nIDY0LWJpdCBBbmRyb2lkIGxpbmtlciBpbiAkbGlua2VyRGlybmFtZS4uXG4iOwotICAg IHN5c3RlbSgiY3AiLCAidGhpcmRfcGFydHkvYW9zcC8kbmV3TGlua2VyIiwgIiRsaW5rZXJEaXJu YW1lLyRuZXdMaW5rZXIiKTsKLSAgICBzeXN0ZW0oIm12IiwgIiRsaW5rZXJEaXJuYW1lLyRsaW5r ZXJCYXNlbmFtZSIsICIkbGlua2VyRGlybmFtZS8kbGlua2VyQmFzZW5hbWUub3JpZyIpOwotICAg IHN5c3RlbSgibG4iLCAiLXMiLCAiJG5ld0xpbmtlciIsICIkbGlua2VyRGlybmFtZS8kbGlua2Vy QmFzZW5hbWUiKTsKLQotICAgIGlmICghIC1lICIkbGlua2VyRGlybmFtZS8kbmV3TGlua2VyIikg ewotICAgICAgICBwcmludCAiVW5hYmxlIHRvIGNvcHkgdGhlIGxpbmtlci5cbiI7Ci0gICAgICAg IGV4aXQgMTsKLSAgICB9Ci19Ci0KIHN1YiBhcHBsZUFwcGxpY2F0aW9uU3VwcG9ydFBhdGgKIHsK ICAgICBvcGVuIElOU1RBTExfRElSLCAiPC9wcm9jL3JlZ2lzdHJ5L0hLRVlfTE9DQUxfTUFDSElO RS9TT0ZUV0FSRS9BcHBsZVwgSW5jLi9BcHBsZVwgQXBwbGljYXRpb25cIFN1cHBvcnQvSW5zdGFs bERpciI7Cg==