59893 2011-05-01 14:20:44 -0700 [android] Provide build-webkit integration for the CMake buildsystem 2011-09-05 11:52:03 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Other OS X 10.5 RESOLVED WONTFIX P2 Normal --- 60907 1 zecke zecke abarth eric steveblock oldest_to_newest 396045 0 zecke 2011-05-01 14:20:44 -0700 [android] Provide build-webkit integration for the CMake buildsystem 396047 1 91846 zecke 2011-05-01 14:27:15 -0700 Created attachment 91846 Patch 402629 2 91846 abarth 2011-05-11 21:03:56 -0700 Comment on attachment 91846 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91846&action=review > Tools/Scripts/build-webkit:569 > + buildCMakeProjectOrExit($clean, "Android", $prefixPath, $makeArgs, cMakeArgsFromFeatures()); Is CMake able to build the Android port? 402630 3 abarth 2011-05-11 21:04:14 -0700 +steveblock 402761 4 91846 steveblock 2011-05-12 02:25:59 -0700 Comment on attachment 91846 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=91846&action=review >> Tools/Scripts/build-webkit:569 >> + buildCMakeProjectOrExit($clean, "Android", $prefixPath, $makeArgs, cMakeArgsFromFeatures()); > > Is CMake able to build the Android port? See my comment in https://bugs.webkit.org/show_bug.cgi?id=59892#c6 414119 5 eric 2011-06-02 07:55:12 -0700 Steve, can you please r+ or r- this? 455335 6 91846 steveblock 2011-08-23 05:25:40 -0700 Comment on attachment 91846 Patch As I mentioned before, the Android port was never fully upstreamed, so won't build without major changes. Also, the existing incomplete port is now being removed, see Bug 66688. I'm not familiar with CMake, but it looks to me like this patch simply does some set-up for buildwebkit --android. I guess there's nothing wrong with it, but I'm hesitant to r+ because I don't know the plans for CMake. 462210 7 91846 abarth 2011-09-05 11:51:55 -0700 Comment on attachment 91846 Patch Android now uses GYP. 91846 2011-05-01 14:27:15 -0700 2011-09-05 11:51:55 -0700 Patch bug-59893-20110502052707.patch text/plain 5849 zecke U3VidmVyc2lvbiBSZXZpc2lvbjogODU0MTEKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBi L1Rvb2xzL0NoYW5nZUxvZwppbmRleCA2NmIyNjYxODkwMDVlNmI2YmIzYTJhN2M1NTU1MTYwOTA2 YmYyMTQzLi5jMTZjZWIzYzZhNjVkYzQzNzRhYjZlNjA4NzUzNzliMDAzYTRkNmJkIDEwMDY0NAot LS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMTEtMDUtMDEgIEhvbGdlciBIYW5zIFBldGVyIEZyZXl0aGVyICA8aG9sZ2VyQG1vaWpp LW1vYmlsZS5jb20+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAg ICAgICAgW2FuZHJvaWRdIFByb3ZpZGUgYnVpbGQtd2Via2l0IGludGVncmF0aW9uIGZvciB0aGUg Q01ha2UgYnVpbGRzeXN0ZW0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTU5ODkzCisKKyAgICAgICAgVGhlIHBlcmwgY29kZSBkZXNlcnZlcyByZWZhY3Rv cmluZy4gVGhpcyBwYXRjaCBpcyBtb3N0bHkgYWRkaW5nIGlzQW5kcm9pZCgpCisgICAgICAgIHRv IHBsYWNlcyB3aGVyZSBhbGwgb3RoZXIgcG9ydHMgYXJlIG9yIHdoZXJlIGFub3RoZXIgQ01ha2Ug YnVpbGRzeXN0ZW0KKyAgICAgICAgaXMgdXNlZC4gUmlnaHQgbm93IHRoaXMgcGF0Y2ggaXMgZG9p bmcgdGhlIGVhc3kgdGhpbmcuCisKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLXdlYmtpdDogQWRk IC0tYW5kcm9pZCBhbmQgQ01ha2UgaW52b2NhdGlvbgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0 ZGlycy5wbTogQWRkIGlzQW5kcm9pZCgpIGFuZCBhZGQgdG8gY29uZGl0aW9ucy4KKwogMjAxMS0w NC0yOSAgRXJpYyBTZWlkZWwgIDxlcmljQHdlYmtpdC5vcmc+CiAKICAgICAgICAgUmV2aWV3ZWQg YnkgQWRhbSBCYXJ0aC4KZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvYnVpbGQtd2Via2l0IGIv VG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKaW5kZXggMTE4MTlhMjMxNzJkNDRlOGI0Y2YyZDhh Yjg2ZjdkZTEzOWU0ZmQyMS4uMThmMmY1ZmFlYTI4YjkwYjNmOWUyZDZlNjk3ZjVhMzMwZDU1MWE3 NyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy9idWlsZC13ZWJraXQKKysrIGIvVG9vbHMvU2Ny aXB0cy9idWlsZC13ZWJraXQKQEAgLTIsNyArMiw3IEBACiAKICMgQ29weXJpZ2h0IChDKSAyMDA1 LCAyMDA2LCAyMDA3LCAyMDA4LCAyMDA5LCAyMDEwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KICMgQ29weXJpZ2h0IChDKSAyMDA5IEdvb2dsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2 ZWQuCi0jIENvcHlyaWdodCAoQykgMjAxMCBtb2lqaS1tb2JpbGUuY29tIEFsbCByaWdodHMgcmVz ZXJ2ZWQuCisjIENvcHlyaWdodCAoQykgMjAxMCwgMjAxMSBtb2lqaS1tb2JpbGUuY29tIEFsbCBy aWdodHMgcmVzZXJ2ZWQuCiAjIENvcHlyaWdodCAoQykgMjAxMSBSZXNlYXJjaCBJbiBNb3Rpb24g TGltaXRlZC4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMKICMgUmVkaXN0cmlidXRpb24gYW5kIHVz ZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CkBAIC0zNDcsNiAr MzQ3LDcgQEAgVXNhZ2U6ICRwcm9ncmFtTmFtZSBbb3B0aW9uc10gW29wdGlvbnMgdG8gcGFzcyB0 byBidWlsZCBzeXN0ZW1dCiAgIC0tZ3lwICAgICAgICAgICAgICAgICAgICAgICAgICAgICBVc2Ug R1lQLWdlbmVyYXRlZCBwcm9qZWN0IGZpbGVzCiAgIC0tZHN5bSAgICAgICAgICAgICAgICAgICAg ICAgICAgICBDaGFuZ2UgZGVidWdnaW5nIGZvcm1hdCB0byBkd2FyZi13aXRoLWRzeW0gKE1hYyBv bmx5KQogCisgIC0tYW5kcm9pZCAgICAgICAgICAgICAgICAgICAgICAgICBCdWlsZCB0aGUgQW5k cm9pZCBwb3J0CiAgIC0tY2hyb21pdW0gICAgICAgICAgICAgICAgICAgICAgICBCdWlsZCB0aGUg Q2hyb21pdW0gcG9ydCBvbiBNYWMvV2luL0xpbnV4CiAgIC0tZWZsICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBCdWlsZCB0aGUgRUZMIHBvcnQKICAgLS1ndGsgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIEJ1aWxkIHRoZSBHVEsrIHBvcnQKQEAgLTU2Miw2ICs1NjMsMTIgQEAgaWYgKGlz RWZsKCkpIHsKICAgICBidWlsZENNYWtlUHJvamVjdE9yRXhpdCgkY2xlYW4sICJFZmwiLCAkcHJl Zml4UGF0aCwgJG1ha2VBcmdzLCBjTWFrZUFyZ3NGcm9tRmVhdHVyZXMoKSk7CiB9CiAKK2lmIChp c0FuZHJvaWQoKSkgeworICAgICMgQnkgZGVmYXVsdCB3ZSBidWlsZCB1c2luZyBhbGwgb2YgdGhl IGF2YWlsYWJsZSBDUFVzLgorICAgICRtYWtlQXJncyAuPSAoJG1ha2VBcmdzID8gIiAiIDogIiIp IC4gIi1qIiAuIG51bWJlck9mQ1BVcygpIGlmICRtYWtlQXJncyAhfiAvLWpccypcZCsvOworICAg IGJ1aWxkQ01ha2VQcm9qZWN0T3JFeGl0KCRjbGVhbiwgIkFuZHJvaWQiLCAkcHJlZml4UGF0aCwg JG1ha2VBcmdzLCBjTWFrZUFyZ3NGcm9tRmVhdHVyZXMoKSk7Cit9CisKIGlmIChpc1dpbkNFKCkp IHsKICAgICBidWlsZENNYWtlUHJvamVjdE9yRXhpdCgkY2xlYW4sICJXaW5DRSIsICRwcmVmaXhQ YXRoLCAkbWFrZUFyZ3MsICgiLURDTUFLRV9XSU5DRV9TREs9XCJTVEFOREFSRFNES181MDAgKEFS TVY0SSlcIiIsIGNNYWtlQXJnc0Zyb21GZWF0dXJlcygpKSk7CiB9CmRpZmYgLS1naXQgYS9Ub29s cy9TY3JpcHRzL3dlYmtpdGRpcnMucG0gYi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5k ZXggYjAwNzhiMDQxNzM4YTdmNTE4NmU5NTYxNGMwNzc1MWQ0ODA1MmE5Yy4uYzE5OGQzMzU2YTVh NDQ2Yjc3NGYwNWZkOTJkYTYwMTIxZGY1NGUyNCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xzL1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtNzAsNiAr NzAsNyBAQCBteSAkaXNXaW5DRTsKIG15ICRpc1dpbkNhaXJvOwogbXkgJGlzV3g7CiBteSAkaXNF Zmw7CitteSAkaXNBbmRyb2lkOwogbXkgQHd4QXJnczsKIG15ICRpc0Nocm9taXVtOwogbXkgJGlz SW5zcGVjdG9yRnJvbnRlbmQ7CkBAIC0yODUsNiArMjg2LDcgQEAgc3ViIGFyZ3VtZW50c0ZvckNv bmZpZ3VyYXRpb24oKQogICAgIHB1c2goQGFyZ3MsICctLXdpbmNlJykgaWYgaXNXaW5DRSgpOwog ICAgIHB1c2goQGFyZ3MsICctLXd4JykgaWYgaXNXeCgpOwogICAgIHB1c2goQGFyZ3MsICctLWNo cm9taXVtJykgaWYgaXNDaHJvbWl1bSgpOworICAgIHB1c2goQGFyZ3MsICctLWFuZHJvaWQnKSBp ZiBpc0FuZHJvaWQoKTsKICAgICBwdXNoKEBhcmdzLCAnLS1pbnNwZWN0b3ItZnJvbnRlbmQnKSBp ZiBpc0luc3BlY3RvckZyb250ZW5kKCk7CiAgICAgcmV0dXJuIEBhcmdzOwogfQpAQCAtMzA1LDcg KzMwNyw3IEBAIHN1YiB1c2VzUGVyQ29uZmlndXJhdGlvbkJ1aWxkRGlyZWN0b3J5CiAgICAgIyBh bGxvd3MgdXMgdG8gcnVuIHJ1bi13ZWJraXQtdGVzdHMgd2l0aG91dCB1c2luZyBidWlsZC13ZWJr aXQuCiAgICAgIwogICAgICMgU3ltYmlhbiBidWlsZHMgZG8gbm90IGhhdmUgUmVsZWFzZS9EZWJ1 ZyBjb25maWd1cmF0aW9ucyBlaXRoZXIuCi0gICAgcmV0dXJuICgkRU5WeyJXRUJLSVRPVVRQVVRE SVIifSAmJiAoaXNHdGsoKSB8fCBpc0VmbCgpKSkgfHwgaXNTeW1iaWFuKCkgfHwgaXNBcHBsZVdp bldlYktpdCgpOworICAgIHJldHVybiAoJEVOVnsiV0VCS0lUT1VUUFVURElSIn0gJiYgKGlzR3Rr KCkgfHwgaXNFZmwoKSkgfHwgaXNBbmRyb2lkKCkpIHx8IGlzU3ltYmlhbigpIHx8IGlzQXBwbGVX aW5XZWJLaXQoKTsKIH0KIAogc3ViIGRldGVybWluZUNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyCkBA IC0zNjcsNyArMzY5LDcgQEAgc3ViIGpzY1Byb2R1Y3REaXIKICAgICBteSAkcHJvZHVjdERpciA9 IHByb2R1Y3REaXIoKTsKICAgICAkcHJvZHVjdERpciAuPSAiL0phdmFTY3JpcHRDb3JlIiBpZiBp c1F0KCk7CiAgICAgJHByb2R1Y3REaXIgLj0gIi8kY29uZmlndXJhdGlvbiIgaWYgKGlzUXQoKSAm JiBpc1dpbmRvd3MoKSk7Ci0gICAgJHByb2R1Y3REaXIgLj0gIi9Qcm9ncmFtcyIgaWYgKGlzR3Rr KCkgfHwgaXNFZmwoKSk7CisgICAgJHByb2R1Y3REaXIgLj0gIi9Qcm9ncmFtcyIgaWYgKGlzR3Rr KCkgfHwgaXNFZmwoKSB8fCBpc0FuZHJvaWQoKSk7CiAKICAgICByZXR1cm4gJHByb2R1Y3REaXI7 CiB9CkBAIC02MzgsNiArNjQwLDkgQEAgc3ViIGJ1aWx0RHlsaWJQYXRoRm9yTmFtZQogICAgIGlm IChpc0VmbCgpKSB7CiAgICAgICAgIHJldHVybiAiJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyLyRs aWJyYXJ5TmFtZS8uLi9XZWJLaXQvbGliZXdlYmtpdC5zbyI7CiAgICAgfQorICAgIGlmIChpc0Fu ZHJvaWQoKSkgeworICAgICAgICByZXR1cm4gIiRjb25maWd1cmF0aW9uUHJvZHVjdERpci8kbGli cmFyeU5hbWUvLi4vV2ViS2l0L2xpYmFuZHJvaWR3ZWJraXQuc28iOworICAgIH0KICAgICBpZiAo aXNXaW5DRSgpKSB7CiAgICAgICAgIHJldHVybiAiJGNvbmZpZ3VyYXRpb25Qcm9kdWN0RGlyLyRs aWJyYXJ5TmFtZSI7CiAgICAgfQpAQCAtNzY0LDcgKzc2OSw3IEBAIHN1YiBkZXRlcm1pbmVJc1F0 KCkKICAgICB9CiAKICAgICAjIFRoZSBwcmVzZW5jZSBvZiBRVERJUiBvbmx5IG1lYW5zIFF0IGlm IC0tZ3RrIG9yIC0td3ggb3IgLS1lZmwgYXJlIG5vdCBvbiB0aGUgY29tbWFuZC1saW5lCi0gICAg aWYgKGlzR3RrKCkgfHwgaXNXeCgpIHx8IGlzRWZsKCkpIHsKKyAgICBpZiAoaXNHdGsoKSB8fCBp c1d4KCkgfHwgaXNFZmwoKSB8fCBpc0FuZHJvaWQoKSkgewogICAgICAgICAkaXNRdCA9IDA7CiAg ICAgICAgIHJldHVybjsKICAgICB9CkBAIC03ODIsNiArNzg3LDE4IEBAIHN1YiBkZXRlcm1pbmVJ c1N5bWJpYW4oKQogICAgIH0KIH0KIAorc3ViIGRldGVybWluZUlzQW5kcm9pZCgpCit7CisgICAg cmV0dXJuIGlmIGRlZmluZWQoJGlzQW5kcm9pZCk7CisgICAgJGlzQW5kcm9pZCA9IGNoZWNrRm9y QXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS1hbmRyb2lkIik7Cit9CisKK3N1YiBpc0FuZHJv aWQoKQoreworICAgIGRldGVybWluZUlzQW5kcm9pZCgpOworICAgIHJldHVybiAkaXNBbmRyb2lk Cit9CisKIHN1YiBkZXRlcm1pbmVJc0VmbCgpCiB7CiAgICAgcmV0dXJuIGlmIGRlZmluZWQoJGlz RWZsKTsKQEAgLTk1OSw3ICs5NzYsNyBAQCBzdWIgaXNBUk0oKQogCiBzdWIgaXNBcHBsZVdlYktp dCgpCiB7Ci0gICAgcmV0dXJuICEoaXNRdCgpIG9yIGlzR3RrKCkgb3IgaXNXeCgpIG9yIGlzQ2hy b21pdW0oKSBvciBpc0VmbCgpIG9yIGlzV2luQ0UoKSk7CisgICAgcmV0dXJuICEoaXNRdCgpIG9y IGlzR3RrKCkgb3IgaXNXeCgpIG9yIGlzQ2hyb21pdW0oKSBvciBpc0VmbCgpIG9yIGlzV2luQ0Uo KSBvciBpc0FuZHJvaWQoKSk7CiB9CiAKIHN1YiBpc0FwcGxlTWFjV2ViS2l0KCkKQEAgLTEwOTMs NyArMTExMCw3IEBAIHN1YiBjaGVja1JlcXVpcmVkU3lzdGVtQ29uZmlnCiAgICAgICAgICAgICBw cmludCAiaHR0cDovL2RldmVsb3Blci5hcHBsZS5jb20vdG9vbHMveGNvZGVcbiI7CiAgICAgICAg ICAgICBwcmludCAiKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioqKioq KioqKioqKioqKioqKioqKlxuIjsKICAgICAgICAgfQotICAgIH0gZWxzaWYgKGlzR3RrKCkgb3Ig aXNRdCgpIG9yIGlzV3goKSBvciBpc0VmbCgpKSB7CisgICAgfSBlbHNpZiAoaXNHdGsoKSBvciBp c1F0KCkgb3IgaXNXeCgpIG9yIGlzRWZsKCkgb3IgaXNBbmRyb2lkKCkpIHsKICAgICAgICAgbXkg QGNtZHMgPSBxdyhmbGV4IGJpc29uIGdwZXJmKTsKICAgICAgICAgbXkgQG1pc3NpbmcgPSAoKTsK ICAgICAgICAgZm9yZWFjaCBteSAkY21kIChAY21kcykgewo=