33623 2010-01-13 13:54:49 -0800 [Android] Android build is broken by addition of second file named StringBuilder.h 2010-01-14 06:51:28 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Android Android RESOLVED FIXED P2 Normal --- 1 steveblock steveblock android-webkit-unforking barraclough steveblock oldest_to_newest 180389 0 steveblock 2010-01-13 13:54:49 -0800 http://trac.webkit.org/changeset/52075 added JavaScriptCore/runtime/StringBuilder.h WebCore/platform/text/StringBuilder.h already exists. The Android build is not set up to handle multiple include files with the same name. Should multiple files with the same name be avoided? I'm not aware of any other examples of this (other than config.h). If not, the Android build system will need updating to handle this. 180398 1 46503 steveblock 2010-01-13 14:05:07 -0800 Created attachment 46503 Patch 1 for Bug 33623 Updates Android build system 180659 2 steveblock 2010-01-14 03:25:50 -0800 Landed manually as http://trac.webkit.org/changeset/53254 46503 2010-01-13 14:05:07 -0800 2010-01-14 03:22:32 -0800 Patch 1 for Bug 33623 stringBuilderMakefile.txt text/plain 5585 steveblock SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDUzMTk5 KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMTggQEAKKzIwMTAtMDEt MTMgIFN0ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29nbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIE1vdmVzIGdlbmVyYWwgaW5jbHVkZXMg YmVmb3JlIGJpbmRpbmdzIGluY2x1ZGVzIGluIEFuZHJvaWQgYnVpbGQgc3lzdGVtLgorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MzM2MjMKKworICAgICAg ICBUaGlzIGF2b2lkcyBwcm9ibGVtcyB3aXRoIGNvbGxpc2lvbnMgYmV0d2VlbiBXZWJDb3JlL3Bs YXRmb3JtL3RleHQvU3RyaW5nQnVpbGRlci5oCisgICAgICAgIGFuZCB0aGUgbmV3IEphdmFTY3Jp cHRDb3JlL3J1bnRpbWUvU3RyaW5nQnVpbGRlci5oLiBUaGlzIGNoYW5nZSBwdXRzCisgICAgICAg IEphdmFTY3JpcHRDb3JlL3J1bnRpbWUgYW5kIG90aGVyIGJpbmRpbmdzIGluY2x1ZGVzIGFmdGVy IHRoZSBXZWJDb3JlIGFuZCBvdGhlcgorICAgICAgICBnZW5lcmFsIGluY2x1ZGVzLCBzbyB0aGF0 IHRoZSBXZWJDb3JlIFN0cmluZ0J1aWxkZXIuaCBpcyBwaWNrZWQgdXAgd2hlbiBidWlsZGluZwor ICAgICAgICBXZWJDb3JlLgorCisgICAgICAgICogQW5kcm9pZC5tazogTW9kaWZpZWQuCisKIDIw MTAtMDEtMTMgIEpvY2VseW4gVHVyY290dGUgIDxqb2NlbHluLnR1cmNvdHRlQG5va2lhLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBTaW1vbiBIYXVzbWFubi4KSW5kZXg6IEFuZHJvaWQubWsK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gQW5kcm9pZC5tawkocmV2aXNpb24gNTMxOTkpCisrKyBBbmRyb2lkLm1r CSh3b3JraW5nIGNvcHkpCkBAIC02Miw3MCArNjIsNiBAQCBXRUJLSVRfU1JDX0ZJTEVTIDo9CiAj IFdlIGhhdmUgdG8gdXNlIGJpc29uIDIuMwogaW5jbHVkZSAkKEJBU0VfUEFUSCkvYmlzb25fY2hl Y2subWsKIAotaWZlcSAoJChKQVZBU0NSSVBUX0VOR0lORSksdjgpCi0jIEluY2x1ZGUgV1RGIHNv dXJjZSBmaWxlLgotZCA6PSBKYXZhU2NyaXB0Q29yZQotTE9DQUxfUEFUSCA6PSAkKEJBU0VfUEFU SCkvJGQKLWludGVybWVkaWF0ZXMgOj0gJChiYXNlX2ludGVybWVkaWF0ZXMpLyRkCi1pbmNsdWRl ICQoTE9DQUxfUEFUSCkvQW5kcm9pZC52OC53dGYubWsKLVdFQktJVF9TUkNfRklMRVMgKz0gJChh ZGRwcmVmaXggJGQvLCQoTE9DQUxfU1JDX0ZJTEVTKSkKLWVuZGlmICAjIEpBVkFTQ1JJUFRfRU5H SU5FID09IHY4Ci0KLSMgSW5jbHVkZSBzb3VyY2UgZmlsZXMgZm9yIFdlYkNvcmUKLWQgOj0gV2Vi Q29yZQotTE9DQUxfUEFUSCA6PSAkKEJBU0VfUEFUSCkvJGQKLUpBVkFTQ1JJUFRDT1JFX1BBVEgg Oj0gJChCQVNFX1BBVEgpL0phdmFTY3JpcHRDb3JlCi1pbnRlcm1lZGlhdGVzIDo9ICQoYmFzZV9p bnRlcm1lZGlhdGVzKS8kZAotaW5jbHVkZSAkKExPQ0FMX1BBVEgpL0FuZHJvaWQubWsKLWlmZXEg KCQoSkFWQVNDUklQVF9FTkdJTkUpLGpzYykKLWluY2x1ZGUgJChMT0NBTF9QQVRIKS9BbmRyb2lk LmpzY2JpbmRpbmdzLm1rCi1lbmRpZgotaWZlcSAoJChKQVZBU0NSSVBUX0VOR0lORSksdjgpCi1p bmNsdWRlICQoTE9DQUxfUEFUSCkvQW5kcm9pZC52OGJpbmRpbmdzLm1rCi1lbmRpZgotV0VCS0lU X1NSQ19GSUxFUyArPSAkKGFkZHByZWZpeCAkZC8sJChMT0NBTF9TUkNfRklMRVMpKQotTE9DQUxf Q19JTkNMVURFUyA6PSAkKEJJTkRJTkdfQ19JTkNMVURFUykKLQotIyBJbmNsdWRlIHRoZSBkZXJp dmVkIHNvdXJjZSBmaWxlcyBmb3IgV2ViQ29yZS4gVXNlcyB0aGUgc2FtZSBwYXRoIGFzCi0jIFdl YkNvcmUKLWluY2x1ZGUgJChMT0NBTF9QQVRIKS9BbmRyb2lkLmRlcml2ZWQubWsKLWlmZXEgKCQo SkFWQVNDUklQVF9FTkdJTkUpLGpzYykKLWluY2x1ZGUgJChMT0NBTF9QQVRIKS9BbmRyb2lkLmRl cml2ZWQuanNjYmluZGluZ3MubWsKLWVuZGlmCi1pZmVxICgkKEpBVkFTQ1JJUFRfRU5HSU5FKSx2 OCkKLWluY2x1ZGUgJChMT0NBTF9QQVRIKS9BbmRyb2lkLmRlcml2ZWQudjhiaW5kaW5ncy5tawot ZW5kaWYKLQotIyBSZWRlZmluZSBMT0NBTF9QQVRIIGhlcmUgc28gdGhlIGJ1aWxkIHN5c3RlbSBp cyBub3QgY29uZnVzZWQKLUxPQ0FMX1BBVEggOj0gJChCQVNFX1BBVEgpCi0KLSMgRGVmaW5lIG91 ciBjb21waWxlciBmbGFncwotTE9DQUxfQ0ZMQUdTICs9IC1Xbm8tZW5kaWYtbGFiZWxzIC1Xbm8t aW1wb3J0IC1Xbm8tZm9ybWF0Ci1MT0NBTF9DRkxBR1MgKz0gLWZuby1zdHJpY3QtYWxpYXNpbmcK LUxPQ0FMX0NGTEFHUyArPSAtaW5jbHVkZSAiV2ViQ29yZVByZWZpeC5oIgotTE9DQUxfQ0ZMQUdT ICs9IC1mdmlzaWJpbGl0eT1oaWRkZW4KLQotaWZlcSAoJChUQVJHRVRfQVJDSCksYXJtKQotTE9D QUxfQ0ZMQUdTICs9IC1EYXJtCi1lbmRpZgotCi1pZmVxICgkKEVOQUJMRV9TVkcpLHRydWUpCi1M T0NBTF9DRkxBR1MgKz0gLURFTkFCTEVfU1ZHPTEKLWVuZGlmCi0KLSMgVGVtcG9yYXJ5IGRpc2Fi bGUgU1ZHX0FOSU1BVElPTi4KLWlmZXEgKCQoRU5BQkxFX1NWR19BTklNQVRJT04pLHRydWUpCi1M T0NBTF9DRkxBR1MgKz0gLURFTkFCTEVfU1ZHX0FOSU1BVElPTj0xCi1lbmRpZgotCi1pZmVxICgk KFdFQkNPUkVfSU5TVFJVTUVOVEFUSU9OKSx0cnVlKQotTE9DQUxfQ0ZMQUdTICs9IC1EQU5EUk9J RF9JTlNUUlVNRU5UCi1lbmRpZgotCi0jIExPQ0FMX0xETElCUyBpcyB1c2VkIGluIHNpbXVsYXRv ciBidWlsZHMgb25seSBhbmQgc2ltdWxhdG9yIGJ1aWxkcyBhcmUgb25seQotIyB2YWxpZCBvbiBM aW51eAotTE9DQUxfTERMSUJTICs9IC1scHRocmVhZCAtbGRsCi0KICMgQnVpbGQgb3VyIGxpc3Qg b2YgaW5jbHVkZSBwYXRocy4gV2UgaW5jbHVkZSBXZWJLaXQvYW5kcm9pZC9pY3UgZmlyc3Qgc28g dGhhdAogIyBhbnkgZmlsZXMgdGhhdCBpbmNsdWRlIDx1bmljb2RlL3VjbnYuaD4gd2lsbCBpbmNs dWRlIG91ciB1Y252LmggZmlyc3QuIFdlCiAjIGFsc28gYWRkIGV4dGVybmFsLyBhcyBhbiBpbmNs dWRlIGRpcmVjdG9yeSBzbyB0aGF0IHdlIGNhbiBzcGVjaWZ5IHRoZSByZWFsCkBAIC0xMzMsNyAr NjksNyBAQCBMT0NBTF9MRExJQlMgKz0gLWxwdGhyZWFkIC1sZGwKICMKICMgTm90ZSB0aGF0IEph dmFzQ3JpcHRDb3JlLyBtdXN0IGJlIGluY2x1ZGVkIGFmdGVyIFdlYkNvcmUvLCBzbyB0aGF0IHdl IHBpY2sgdXAKICMgdGhlIHJpZ2h0IGNvbmZpZy5oLgotTE9DQUxfQ19JTkNMVURFUyA6PSAkKExP Q0FMX0NfSU5DTFVERVMpIFwKK0xPQ0FMX0NfSU5DTFVERVMgOj0gXAogCSQoSk5JX0hfSU5DTFVE RSkgXAogCSQoTE9DQUxfUEFUSCkvV2ViS2l0L2FuZHJvaWQvaWN1IFwKIAlleHRlcm5hbC8gXApA QCAtMjIwLDYgKzE1Niw3MCBAQCBMT0NBTF9DX0lOQ0xVREVTIDo9ICQoTE9DQUxfQ19JTkNMVURF UykgCiAJJChiYXNlX2ludGVybWVkaWF0ZXMpL1dlYkNvcmUvc3ZnCiBlbmRpZgogCitpZmVxICgk KEpBVkFTQ1JJUFRfRU5HSU5FKSx2OCkKKyMgSW5jbHVkZSBXVEYgc291cmNlIGZpbGUuCitkIDo9 IEphdmFTY3JpcHRDb3JlCitMT0NBTF9QQVRIIDo9ICQoQkFTRV9QQVRIKS8kZAoraW50ZXJtZWRp YXRlcyA6PSAkKGJhc2VfaW50ZXJtZWRpYXRlcykvJGQKK2luY2x1ZGUgJChMT0NBTF9QQVRIKS9B bmRyb2lkLnY4Lnd0Zi5taworV0VCS0lUX1NSQ19GSUxFUyArPSAkKGFkZHByZWZpeCAkZC8sJChM T0NBTF9TUkNfRklMRVMpKQorZW5kaWYgICMgSkFWQVNDUklQVF9FTkdJTkUgPT0gdjgKKworIyBJ bmNsdWRlIHNvdXJjZSBmaWxlcyBmb3IgV2ViQ29yZQorZCA6PSBXZWJDb3JlCitMT0NBTF9QQVRI IDo9ICQoQkFTRV9QQVRIKS8kZAorSkFWQVNDUklQVENPUkVfUEFUSCA6PSAkKEJBU0VfUEFUSCkv SmF2YVNjcmlwdENvcmUKK2ludGVybWVkaWF0ZXMgOj0gJChiYXNlX2ludGVybWVkaWF0ZXMpLyRk CitpbmNsdWRlICQoTE9DQUxfUEFUSCkvQW5kcm9pZC5taworaWZlcSAoJChKQVZBU0NSSVBUX0VO R0lORSksanNjKQoraW5jbHVkZSAkKExPQ0FMX1BBVEgpL0FuZHJvaWQuanNjYmluZGluZ3MubWsK K2VuZGlmCitpZmVxICgkKEpBVkFTQ1JJUFRfRU5HSU5FKSx2OCkKK2luY2x1ZGUgJChMT0NBTF9Q QVRIKS9BbmRyb2lkLnY4YmluZGluZ3MubWsKK2VuZGlmCitXRUJLSVRfU1JDX0ZJTEVTICs9ICQo YWRkcHJlZml4ICRkLywkKExPQ0FMX1NSQ19GSUxFUykpCitMT0NBTF9DX0lOQ0xVREVTICs9ICQo QklORElOR19DX0lOQ0xVREVTKQorCisjIEluY2x1ZGUgdGhlIGRlcml2ZWQgc291cmNlIGZpbGVz IGZvciBXZWJDb3JlLiBVc2VzIHRoZSBzYW1lIHBhdGggYXMKKyMgV2ViQ29yZQoraW5jbHVkZSAk KExPQ0FMX1BBVEgpL0FuZHJvaWQuZGVyaXZlZC5taworaWZlcSAoJChKQVZBU0NSSVBUX0VOR0lO RSksanNjKQoraW5jbHVkZSAkKExPQ0FMX1BBVEgpL0FuZHJvaWQuZGVyaXZlZC5qc2NiaW5kaW5n cy5taworZW5kaWYKK2lmZXEgKCQoSkFWQVNDUklQVF9FTkdJTkUpLHY4KQoraW5jbHVkZSAkKExP Q0FMX1BBVEgpL0FuZHJvaWQuZGVyaXZlZC52OGJpbmRpbmdzLm1rCitlbmRpZgorCisjIFJlZGVm aW5lIExPQ0FMX1BBVEggaGVyZSBzbyB0aGUgYnVpbGQgc3lzdGVtIGlzIG5vdCBjb25mdXNlZAor TE9DQUxfUEFUSCA6PSAkKEJBU0VfUEFUSCkKKworIyBEZWZpbmUgb3VyIGNvbXBpbGVyIGZsYWdz CitMT0NBTF9DRkxBR1MgKz0gLVduby1lbmRpZi1sYWJlbHMgLVduby1pbXBvcnQgLVduby1mb3Jt YXQKK0xPQ0FMX0NGTEFHUyArPSAtZm5vLXN0cmljdC1hbGlhc2luZworTE9DQUxfQ0ZMQUdTICs9 IC1pbmNsdWRlICJXZWJDb3JlUHJlZml4LmgiCitMT0NBTF9DRkxBR1MgKz0gLWZ2aXNpYmlsaXR5 PWhpZGRlbgorCitpZmVxICgkKFRBUkdFVF9BUkNIKSxhcm0pCitMT0NBTF9DRkxBR1MgKz0gLURh cm0KK2VuZGlmCisKK2lmZXEgKCQoRU5BQkxFX1NWRyksdHJ1ZSkKK0xPQ0FMX0NGTEFHUyArPSAt REVOQUJMRV9TVkc9MQorZW5kaWYKKworIyBUZW1wb3JhcnkgZGlzYWJsZSBTVkdfQU5JTUFUSU9O LgoraWZlcSAoJChFTkFCTEVfU1ZHX0FOSU1BVElPTiksdHJ1ZSkKK0xPQ0FMX0NGTEFHUyArPSAt REVOQUJMRV9TVkdfQU5JTUFUSU9OPTEKK2VuZGlmCisKK2lmZXEgKCQoV0VCQ09SRV9JTlNUUlVN RU5UQVRJT04pLHRydWUpCitMT0NBTF9DRkxBR1MgKz0gLURBTkRST0lEX0lOU1RSVU1FTlQKK2Vu ZGlmCisKKyMgTE9DQUxfTERMSUJTIGlzIHVzZWQgaW4gc2ltdWxhdG9yIGJ1aWxkcyBvbmx5IGFu ZCBzaW11bGF0b3IgYnVpbGRzIGFyZSBvbmx5CisjIHZhbGlkIG9uIExpbnV4CitMT0NBTF9MRExJ QlMgKz0gLWxwdGhyZWFkIC1sZGwKKwogIyBCdWlsZCB0aGUgbGlzdCBvZiBzaGFyZWQgbGlicmFy aWVzCiBMT0NBTF9TSEFSRURfTElCUkFSSUVTIDo9IFwKIAlsaWJhbmRyb2lkX3J1bnRpbWUgXAo=