74401 2011-12-13 04:49:10 -0800 [Chromium] Pull in FreeType and decrease check-out complexity for Android 2011-12-13 13:23:27 -0800 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 66689 1 peter peter abarth jrg webkit.review.bot oldest_to_newest 520035 0 peter 2011-12-13 04:49:10 -0800 Source/WebKit/chromium/ Pull in FreeType in the third_party/ directory from a separate git repository at Chromium. This introduces a new prerequisite for checking out the Chromium WebKit port for Android, namely that git needs to be available on the system. gclient can handle this just fine. Since only one git-dependency is required in the case of the Android version, I chose not to create an "chromium_git" variable (similar to "chromium_svn") in order to keep it isolated. Tools/ Decrease the check-out complexity by removing the need to first run "update-webkit-chromium --chromium" prior to running it with "--chromium-android", which was caused by an unversioned third_party/ directory being created. This moves the Android NDK to Source/WebKit/ chromium/, coming from third_party/ in that directory. 520036 1 119007 peter 2011-12-13 04:50:08 -0800 Created attachment 119007 Patch 520332 2 119007 webkit.review.bot 2011-12-13 13:23:19 -0800 Comment on attachment 119007 Patch Clearing flags on attachment: 119007 Committed r102700: <http://trac.webkit.org/changeset/102700> 520333 3 webkit.review.bot 2011-12-13 13:23:27 -0800 All reviewed patches have been landed. Closing bug. 119007 2011-12-13 04:50:08 -0800 2011-12-13 13:23:19 -0800 Patch webkit-build-patch.patch text/plain 4537 peter ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKaW5kZXggOGU0YTA3MC4uZTM3YTQxYSAxMDA2NDQKLS0t IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYktpdC9j aHJvbWl1bS9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNyBAQAorMjAxMS0xMi0xMyAgUGV0ZXIgQmV2 ZXJsb28gIDxwZXRlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBQdWxsIGlu IEZyZWVUeXBlIGFuZCBkZWNyZWFzZSBjaGVjay1vdXQgY29tcGxleGl0eSBmb3IgQW5kcm9pZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQ0MDEKKwor ICAgICAgICBQdWxsIGluIEZyZWVUeXBlIGluIHRoZSB0aGlyZF9wYXJ0eS8gZGlyZWN0b3J5IGZy b20gYSBzZXBhcmF0ZSBnaXQKKyAgICAgICAgcmVwb3NpdG9yeSBhdCBDaHJvbWl1bS4gVGhpcyBp bnRyb2R1Y2VzIGEgbmV3IHByZXJlcXVpc2l0ZSBmb3IgY2hlY2tpbmcKKyAgICAgICAgb3V0IHRo ZSBDaHJvbWl1bSBXZWJLaXQgcG9ydCBmb3IgQW5kcm9pZCwgbmFtZWx5IHRoYXQgZ2l0IG5lZWRz IHRvIGJlCisgICAgICAgIGF2YWlsYWJsZSBvbiB0aGUgc3lzdGVtLiBnY2xpZW50IGNhbiBoYW5k bGUgdGhpcyBqdXN0IGZpbmUuCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiBERVBTOgorCiAyMDExLTEyLTEyICBSeW9zdWtlIE5pd2EgIDxybml3YUB3 ZWJraXQub3JnPgogCiAgICAgICAgIFdlYktpdCBjb2RlIHNob3VsZG4ndCBiZSBjYWxsaW5nIGFw cGx5Q29tbWFuZCBkaXJlY3RseQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9E RVBTIGIvU291cmNlL1dlYktpdC9jaHJvbWl1bS9ERVBTCmluZGV4IDNhYWZiNmMuLmQ5ODc3ODIg MTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vREVQUworKysgYi9Tb3VyY2UvV2Vi S2l0L2Nocm9taXVtL0RFUFMKQEAgLTE3Niw2ICsxNzYsMTAgQEAgZGVwc19vcyA9IHsKICAgICAn dGhpcmRfcGFydHkvb3BlbnNzbCc6CiAgICAgICBGcm9tKCdjaHJvbWl1bV9kZXBzJywgJ3NyYy90 aGlyZF9wYXJ0eS9vcGVuc3NsJyksCiAgIH0sCisgICdhbmRyb2lkJzogeworICAgICd0aGlyZF9w YXJ0eS9mcmVldHlwZSc6CisgICAgICAnaHR0cHM6Ly9naXQuY2hyb21pdW0ub3JnL2Nocm9taXVt L3NyYy90aGlyZF9wYXJ0eS9mcmVldHlwZS5naXQnLAorICB9LAogfQogCiBza2lwX2NoaWxkX2lu Y2x1ZGVzID0gWwpkaWZmIC0tZ2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9n CmluZGV4IDZmZWQyOTcuLjAxMzk5ZjUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysg Yi9Ub29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwyMCBAQAorMjAxMS0xMi0xMyAgUGV0ZXIgQmV2 ZXJsb28gIDxwZXRlckBjaHJvbWl1bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtXSBQdWxsIGlu IEZyZWVUeXBlIGFuZCBkZWNyZWFzZSBjaGVjay1vdXQgY29tcGxleGl0eSBmb3IgQW5kcm9pZAor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9NzQ0MDEKKwor ICAgICAgICBEZWNyZWFzZSB0aGUgY2hlY2stb3V0IGNvbXBsZXhpdHkgYnkgcmVtb3ZpbmcgdGhl IG5lZWQgdG8gZmlyc3QgcnVuCisgICAgICAgICJ1cGRhdGUtd2Via2l0LWNocm9taXVtIC0tY2hy b21pdW0iIHByaW9yIHRvIHJ1bm5pbmcgaXQgd2l0aAorICAgICAgICAiLS1jaHJvbWl1bS1hbmRy b2lkIiwgd2hpY2ggd2FzIGNhdXNlZCBieSBhbiB1bnZlcnNpb25lZCB0aGlyZF9wYXJ0eS8KKyAg ICAgICAgZGlyZWN0b3J5IGJlaW5nIGNyZWF0ZWQuIFRoaXMgbW92ZXMgdGhlIEFuZHJvaWQgTkRL IHRvIFNvdXJjZS9XZWJLaXQvCisgICAgICAgIGNocm9taXVtLywgY29taW5nIGZyb20gdGhpcmRf cGFydHkvIGluIHRoYXQgZGlyZWN0b3J5LgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy91cGRhdGUtd2Via2l0LWNocm9taXVtOgorICAg ICAgICAqIFNjcmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgKGJ1aWxkQ2hyb21pdW1NYWtl ZmlsZSk6CisKIDIwMTEtMTItMTMgIEtlbmljaGkgSXNoaWJhc2hpICA8YmFzaGlAY2hyb21pdW0u b3JnPgogCiAgICAgICAgIFJldmlld2VkLCByZW1vdmVkIG9uZSBvZiBteSBlbWFpbCBhZGRyZXNz ZXMgdG8gdXNlIHRoZSBhcHBycHJpYXRlIG9uZS4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMv dXBkYXRlLXdlYmtpdC1jaHJvbWl1bSBiL1Rvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1jaHJv bWl1bQppbmRleCAyZTZjMTViLi44NDA2YjFkIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3Vw ZGF0ZS13ZWJraXQtY2hyb21pdW0KKysrIGIvVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWNo cm9taXVtCkBAIC02MSwyMCArNjEsMTcgQEAgaWYgKCEgLWUgIi5nY2xpZW50IikgewogIyBXaGVu IGJ1aWxkaW5nIFdlYktpdCdzIENocm9taXVtIHBvcnQgZm9yIEFuZHJvaWQsIHdlIG5lZWQgdGhl IEFuZHJvaWQgTkRLIGFzCiAjIGl0IHdpbGwgYWxsb3cgdXMgdG8gY3Jvc3MtY29tcGlsZSBhbGwg c291cmNlcyB0byB0aGUgdGFyZ2V0IGFyY2hpdGVjdHVyZS4KIGlmIChpc0Nocm9taXVtQW5kcm9p ZCgpKSB7Ci0gICAgaWYgKCEgLWUgInRoaXJkX3BhcnR5L2FuZHJvaWQtbmRrLXI3IikgeworICAg IGlmICghIC1lICJhbmRyb2lkLW5kay1yNyIpIHsKICAgICAgICAgcHJpbnQgIkluc3RhbGxpbmcg dGhlIEFuZHJvaWQgTkRLLCB2ZXJzaW9uIDcuLi5cbiI7Ci0gICAgICAgIGlmICghIC1lICJ0aGly ZF9wYXJ0eS8iKSB7Ci0gICAgICAgICAgICBta2RpciAidGhpcmRfcGFydHkiOwotICAgICAgICB9 CiAgICAgICAgIG15ICRob3N0X29zID0gaXNMaW51eCgpID8gImxpbnV4IiA6ICJkYXJ3aW4iOwot ICAgICAgICBteSAkcmVzdWx0ID0gc3lzdGVtKCJjdXJsIiwgIi1vIiwgInRoaXJkX3BhcnR5L2Fu ZHJvaWQtbmRrLXI3LnRhci5iejIiLCAiaHR0cDovL2RsLmdvb2dsZS5jb20vYW5kcm9pZC9uZGsv YW5kcm9pZC1uZGstcjctIiAuICRob3N0X29zIC4gIi14ODYudGFyLmJ6MiIpOworICAgICAgICBt eSAkcmVzdWx0ID0gc3lzdGVtKCJjdXJsIiwgIi1vIiwgImFuZHJvaWQtbmRrLXI3LnRhci5iejIi LCAiaHR0cDovL2RsLmdvb2dsZS5jb20vYW5kcm9pZC9uZGsvYW5kcm9pZC1uZGstcjctIiAuICRo b3N0X29zIC4gIi14ODYudGFyLmJ6MiIpOwogICAgICAgICBkaWUgIkNvdWxkbid0IGRvd25sb2Fk IHRoZSBBbmRyb2lkIE5ESy4iIGlmICRyZXN1bHQ7CiAKLSAgICAgICAgJHJlc3VsdCA9IHN5c3Rl bSgidGFyIiwgImp4QyIsICJ0aGlyZF9wYXJ0eSIsICItZiIsICJ0aGlyZF9wYXJ0eS9hbmRyb2lk LW5kay1yNy50YXIuYnoyIik7CisgICAgICAgICRyZXN1bHQgPSBzeXN0ZW0oInRhciIsICJqeCIs ICItZiIsICJhbmRyb2lkLW5kay1yNy50YXIuYnoyIik7CiAgICAgICAgIGRpZSAiQ291bGRuJ3Qg ZXh0cmFjdCB0aGUgQW5kcm9pZCBOREsuIiBpZiAkcmVzdWx0OwogICAgIH0KIAotICAgICRFTlZ7 QU5EUk9JRF9OREtfUk9PVH0gPSBzb3VyY2VEaXIoKSAuICIvU291cmNlL1dlYktpdC9jaHJvbWl1 bS90aGlyZF9wYXJ0eS9hbmRyb2lkLW5kay1yNyI7CisgICAgJEVOVntBTkRST0lEX05ES19ST09U fSA9IHNvdXJjZURpcigpIC4gIi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL2FuZHJvaWQtbmRrLXI3 IjsKICAgICAkRU5We1dFQktJVF9BTkRST0lEX0JVSUxEfSA9IDE7CiB9CiAKZGlmZiAtLWdpdCBh L1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbSBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5w bQppbmRleCA4Y2VkNGYzLi5mNjk0MzMzIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3dlYmtp dGRpcnMucG0KKysrIGIvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCkBAIC0yMDE4LDcgKzIw MTgsNyBAQCBzdWIgYnVpbGRDaHJvbWl1bU1ha2VmaWxlKCQkQCkKICAgICAjIHdpbGwgdmVyaWZ5 IHRoYXQgdGhlIGluc3RhbGxlZCBOREsgaXMgaW5kZWVkIGF2YWlsYWJsZS4KICAgICBpZiAoaXND aHJvbWl1bUFuZHJvaWQoKSkgewogICAgICAgICAkY29tbWFuZCAuPSAiYmFzaCAtYyBcInNvdXJj ZSAiIC4gc291cmNlRGlyKCkgLiAiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vYnVpbGQvYW5kcm9p ZC9lbnZzZXR1cC5zaCAmJiAiOwotICAgICAgICAkRU5We0FORFJPSURfTkRLX1JPT1R9ID0gc291 cmNlRGlyKCkgLiAiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vdGhpcmRfcGFydHkvYW5kcm9pZC1u ZGstcjciOworICAgICAgICAkRU5We0FORFJPSURfTkRLX1JPT1R9ID0gc291cmNlRGlyKCkgLiAi L1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vYW5kcm9pZC1uZGstcjciOwogICAgICAgICAkRU5We1dF QktJVF9BTkRST0lEX0JVSUxEfSA9IDE7CiAgICAgfQogCg==