135815 2014-08-11 14:22:00 -0700 update-webkit should not check for the presence of Apple’s Internal directory 2014-08-19 20:02:40 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz webkit-unassigned bfulgham darin dbates oldest_to_newest 1028310 0 mitz 2014-08-11 14:22:00 -0700 The update-webkit script behaves differently in the presence of an Internal directory next to the root of the WebKit source tree. 1028315 1 236400 mitz 2014-08-11 14:25:01 -0700 Created attachment 236400 I. Add --[no-]auxiliary-libs option 1028317 2 236401 mitz 2014-08-11 14:27:19 -0700 Created attachment 236401 I. Add --[no-]auxiliary-libs option 1028358 3 mitz 2014-08-11 16:41:53 -0700 Committed attachment 236401 as http://trac.webkit.org/r172419. 1029028 4 dbates 2014-08-13 21:51:19 -0700 Marking Resolved Fixed since the patch was committed in <http://trac.webkit.org/r172419> per comment 3. 1029029 5 mitz 2014-08-13 21:51:42 -0700 I was just getting started. 1029862 6 236783 mitz 2014-08-18 13:58:46 -0700 Created attachment 236783 II. Add --[no-]internal option 1029872 7 236783 thorton 2014-08-18 14:18:39 -0700 Comment on attachment 236783 II. Add --[no-]internal option View in context: https://bugs.webkit.org/attachment.cgi?id=236783&action=review > Tools/Scripts/update-webkit:52 > +# FIXME: http://webkit.org/b/135815 update-webkit should not check for the presence of Apple’s Internal directory It may be best not to use smart quotes in source. 1029893 8 mitz 2014-08-18 14:45:03 -0700 Committed attachment 236783 as http://trac.webkit.org/r172728. 1030121 9 236826 mitz 2014-08-19 15:10:10 -0700 Created attachment 236826 III. Remove code that deals with ../Internal 1030200 10 mitz 2014-08-19 20:02:40 -0700 Fixed in http://trac.webkit.org/r172795. 236400 2014-08-11 14:25:01 -0700 2014-08-11 14:26:10 -0700 I. Add --[no-]auxiliary-libs option add-option.diff text/plain 2264 mitz SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3MjQxMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE0LTA4LTExICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisK KyAgICAgICAgQWRkZWQgYW4gdXBkYXRlLXdlYmtpdCBvcHRpb24gdG8gdXBkYXRlIHRoZSBhdXhp bGlhcnkgbGlicmFyaWVzIG9yIG5vdC4KKyAgICAgICAgUGFydCBvZiBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1ODE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3VwZGF0ZS13ZWJraXQ6IEFkZGVkIC0t W25vLV1hdXhpbGlhcnktbGlicyBvcHRpb24sIHdoaWNoIGRlZmF1bHRzIHRvIHllcyB1bmxlc3MK KyAgICAgICAgYW4gSW50ZXJuYWwgZGlyZWN0b3J5IGV4aXN0cyBhbG9uZ3NpZGUgdGhlIFdlYktp dCByb290IGRpcmVjdG9yeS4KKwogMjAxNC0wOC0xMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxj Z2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IEdUSysgbWFrZSBk aXN0Y2hlY2suCkluZGV4OiBUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0CShyZXZpc2lvbiAxNzIzODEpCisrKyBUb29s cy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQJKHdvcmtpbmcgY29weSkKQEAgLTUwLDE3ICs1MCwyMiBA QCBkZXRlcm1pbmVJc1dpbkNhaXJvKCk7CiAKIGNoZGlyV2ViS2l0KCk7CiAKKyMgRklYTUU6IFJl bW92ZSB0aGUgY2hlY2sgZm9yIC4uL0ludGVybmFsIG9uY2UgQXBwbGUtaW50ZXJuYWwgdXNlcnMg b2YgdGhpcyBzY3JpcHQgcGFzcyAtLW5vLWF1eGlsaWFyeS1saWJzCitteSAkYXV4aWxpYXJ5TGli cyA9ICEgLWQgIi4uL0ludGVybmFsIjsKKwogbXkgJGdldE9wdGlvbnNSZXN1bHQgPSBHZXRPcHRp b25zKAogICAgICdofGhlbHAnICA9PiBcJHNob3dIZWxwLAogICAgICdxfHF1aWV0JyA9PiBcJHF1 aWV0LAorICAgICdhdXhpbGlhcnktbGlicyEnID0+IFwkYXV4aWxpYXJ5TGlicywKICk7IAogCiBp ZiAoISRnZXRPcHRpb25zUmVzdWx0IHx8ICRzaG93SGVscCkgewogICAgIHByaW50IFNUREVSUiA8 PF9fRU5EX187CiBVc2FnZTogQHtbIGJhc2VuYW1lKCQwKSBdfSBbb3B0aW9uc10KLSAgLWh8LS1o ZWxwICAgICAgICAgICBzaG93IHRoZSBoZWxwIG1lc3NhZ2UKLSAgLXF8LS1xdWlldCAgICAgICAg ICBwYXNzIC1xIHRvIHN2biB1cGRhdGUgZm9yIHF1aWV0IHVwZGF0ZXMKLSAgLS13aW5jYWlybyAg ICAgICAgICBhbHNvIHVwZGF0ZSBkZXBlbmRlbmNpZXMgb2YgdGhlIFdpbkNhaXJvIHBvcnQKKyAg LWh8LS1oZWxwICAgICAgICAgICAgICAgICBzaG93IHRoZSBoZWxwIG1lc3NhZ2UKKyAgLXF8LS1x dWlldCAgICAgICAgICAgICAgICBwYXNzIC1xIHRvIHN2biB1cGRhdGUgZm9yIHF1aWV0IHVwZGF0 ZXMKKyAgLS1bbm8tXWF1eGlsaWFyeS1saWJzICAgICBbZG9uXCd0XSB1cGRhdGUgdGhlIGF1eGls aWFyeSBsaWJyYXJpZXMgZm9yIFdpbmRvd3MgKGRlZmF1bHQ6IHVwZGF0ZSkKKyAgLS13aW5jYWly byAgICAgICAgICAgICAgICBhbHNvIHVwZGF0ZSBkZXBlbmRlbmNpZXMgb2YgdGhlIFdpbkNhaXJv IHBvcnQKIF9fRU5EX18KICAgICBleGl0IDE7CiB9CkBAIC04MCw3ICs4NSw5IEBAIGlmICgtZCAi Li4vSW50ZXJuYWwiKSB7CiAgICAgcHJpbnQgIlVwZGF0aW5nIEludGVybmFsXG4iIHVubGVzcyAk cXVpZXQ7CiAgICAgcnVuU3ZuVXBkYXRlKCkgaWYgaXNTVk5EaXJlY3RvcnkoIi4iKTsKICAgICBy dW5HaXRVcGRhdGUoKSBpZiBpc0dpdERpcmVjdG9yeSgiLiIpOwotfSBlbHNpZiAoaXNBcHBsZVdp bldlYktpdCgpKSB7Cit9CisKK2lmICgkYXV4aWxpYXJ5TGlicykgewogICAgIHN5c3RlbSgicGVy bCIsICJUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtYXV4aWxpYXJ5LWxpYnMiKSA9PSAwIG9y IGRpZTsKICAgICBpZiAoaXNXaW5DYWlybygpKSB7CiAgICAgICAgICMgV2luQ2Fpcm8gc2hhcmVz IHRoZSBhdXhpbGlhcnkgbGlicyBmcm9tIHRoZSBBcHBsZSBwb3J0Lgo= 236401 2014-08-11 14:27:19 -0700 2014-08-11 16:12:28 -0700 I. Add --[no-]auxiliary-libs option add-option.diff text/plain 2286 mitz SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3MjQxMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE0LTA4LTExICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisK KyAgICAgICAgQWRkZWQgYW4gdXBkYXRlLXdlYmtpdCBvcHRpb24gdG8gdXBkYXRlIHRoZSBhdXhp bGlhcnkgbGlicmFyaWVzIG9yIG5vdC4KKyAgICAgICAgUGFydCBvZiBodHRwczovL2J1Z3Mud2Vi a2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM1ODE1CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9C T0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRzL3VwZGF0ZS13ZWJraXQ6IEFkZGVkIC0t W25vLV1hdXhpbGlhcnktbGlicyBvcHRpb24sIHdoaWNoIGRlZmF1bHRzIHRvIHllcyB1bmxlc3MK KyAgICAgICAgYW4gSW50ZXJuYWwgZGlyZWN0b3J5IGV4aXN0cyBhbG9uZ3NpZGUgdGhlIFdlYktp dCByb290IGRpcmVjdG9yeS4KKwogMjAxNC0wOC0xMSAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxj Z2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gRml4IEdUSysgbWFrZSBk aXN0Y2hlY2suCkluZGV4OiBUb29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQKPT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQot LS0gVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0CShyZXZpc2lvbiAxNzIzODEpCisrKyBUb29s cy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQJKHdvcmtpbmcgY29weSkKQEAgLTUwLDE3ICs1MCwyMiBA QCBkZXRlcm1pbmVJc1dpbkNhaXJvKCk7CiAKIGNoZGlyV2ViS2l0KCk7CiAKKyMgRklYTUU6IFJl bW92ZSB0aGUgY2hlY2sgZm9yIC4uL0ludGVybmFsIG9uY2UgQXBwbGUtaW50ZXJuYWwgdXNlcnMg b2YgdGhpcyBzY3JpcHQgcGFzcyAtLW5vLWF1eGlsaWFyeS1saWJzCitteSAkYXV4aWxpYXJ5TGli cyA9ICEgLWQgIi4uL0ludGVybmFsIjsKKwogbXkgJGdldE9wdGlvbnNSZXN1bHQgPSBHZXRPcHRp b25zKAogICAgICdofGhlbHAnICA9PiBcJHNob3dIZWxwLAogICAgICdxfHF1aWV0JyA9PiBcJHF1 aWV0LAorICAgICdhdXhpbGlhcnktbGlicyEnID0+IFwkYXV4aWxpYXJ5TGlicywKICk7IAogCiBp ZiAoISRnZXRPcHRpb25zUmVzdWx0IHx8ICRzaG93SGVscCkgewogICAgIHByaW50IFNUREVSUiA8 PF9fRU5EX187CiBVc2FnZTogQHtbIGJhc2VuYW1lKCQwKSBdfSBbb3B0aW9uc10KLSAgLWh8LS1o ZWxwICAgICAgICAgICBzaG93IHRoZSBoZWxwIG1lc3NhZ2UKLSAgLXF8LS1xdWlldCAgICAgICAg ICBwYXNzIC1xIHRvIHN2biB1cGRhdGUgZm9yIHF1aWV0IHVwZGF0ZXMKLSAgLS13aW5jYWlybyAg ICAgICAgICBhbHNvIHVwZGF0ZSBkZXBlbmRlbmNpZXMgb2YgdGhlIFdpbkNhaXJvIHBvcnQKKyAg LWh8LS1oZWxwICAgICAgICAgICAgICAgICBzaG93IHRoZSBoZWxwIG1lc3NhZ2UKKyAgLXF8LS1x dWlldCAgICAgICAgICAgICAgICBwYXNzIC1xIHRvIHN2biB1cGRhdGUgZm9yIHF1aWV0IHVwZGF0 ZXMKKyAgLS1bbm8tXWF1eGlsaWFyeS1saWJzICAgICBbZG9uXCd0XSB1cGRhdGUgdGhlIGF1eGls aWFyeSBsaWJyYXJpZXMgZm9yIFdpbmRvd3MgKGRlZmF1bHQ6IHVwZGF0ZSkKKyAgLS13aW5jYWly byAgICAgICAgICAgICAgICBhbHNvIHVwZGF0ZSBkZXBlbmRlbmNpZXMgb2YgdGhlIFdpbkNhaXJv IHBvcnQKIF9fRU5EX18KICAgICBleGl0IDE7CiB9CkBAIC04MCw3ICs4NSw5IEBAIGlmICgtZCAi Li4vSW50ZXJuYWwiKSB7CiAgICAgcHJpbnQgIlVwZGF0aW5nIEludGVybmFsXG4iIHVubGVzcyAk cXVpZXQ7CiAgICAgcnVuU3ZuVXBkYXRlKCkgaWYgaXNTVk5EaXJlY3RvcnkoIi4iKTsKICAgICBy dW5HaXRVcGRhdGUoKSBpZiBpc0dpdERpcmVjdG9yeSgiLiIpOwotfSBlbHNpZiAoaXNBcHBsZVdp bldlYktpdCgpKSB7Cit9CisKK2lmIChpc0FwcGxlV2luV2ViS2l0KCkgJiYgJGF1eGlsaWFyeUxp YnMpIHsKICAgICBzeXN0ZW0oInBlcmwiLCAiVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0LWF1 eGlsaWFyeS1saWJzIikgPT0gMCBvciBkaWU7CiAgICAgaWYgKGlzV2luQ2Fpcm8oKSkgewogICAg ICAgICAjIFdpbkNhaXJvIHNoYXJlcyB0aGUgYXV4aWxpYXJ5IGxpYnMgZnJvbSB0aGUgQXBwbGUg cG9ydC4K 236783 2014-08-18 13:58:46 -0700 2014-08-18 14:18:39 -0700 II. Add --[no-]internal option 135815-2.diff text/plain 6224 mitz SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3MjcyMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDE0LTA4LTE4ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisK KyAgICAgICAgQWRkZWQgYW4gdXBkYXRlLXdlYmtpdCBvcHRpb24gdG8gb3ZlcnJpZGUgdGhlIC4u L0ludGVybmFsIGNoZWNrLgorICAgICAgICBQYXJ0IG9mIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0xMzU4MTUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvdXBkYXRlLXdlYmtpdDoKKyAgICAgICAgQWRkZWQg YW4gZXhwbGljaXQgLS1pbnRlcm5hbCBvcHRpb24gdG8gY29udHJvbCB1cGRhdGluZyAuLi9JbnRl cm5hbCwgZGVmYXVsdGluZyB0byB3aGV0aGVyCisgICAgICAgIC4uL0ludGVybmFsIGV4aXN0cy4K KyAgICAgICAgKHJ1blN2blVwZGF0ZSk6IE1vdmVkIHRvIHdlYmtpdGRpcnMucG0uCisgICAgICAg IChydW5HaXRVcGRhdGUpOiBEaXR0by4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06 CisgICAgICAgIChydW5Tdm5VcGRhdGVBbmRSZXNvbHZlQ2hhbmdlTG9ncyk6IE1vdmVkIHJ1blN2 blVwZGF0ZSBmcm9tIHVwZGF0ZS13ZWJraXQgYW5kIHJlbmFtZWQgdG8gdGhpcy4KKyAgICAgICAg KHJ1bkdpdFVwZGF0ZSk6IE1vdmVkIGZyb20gdXBkYXRlLXdlYmtpdC4KKwogMjAxNC0wOC0xOCAg U2ltb24gRnJhc2VyICA8c2ltb24uZnJhc2VyQGFwcGxlLmNvbT4KIAogICAgICAgICBFbmFibGUg V2ViIEluc3BlY3RvciBpbiBNaW5pQnJvd3NlciBXSzIgd2luZG93cwpJbmRleDogVG9vbHMvU2Ny aXB0cy91cGRhdGUtd2Via2l0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdl YmtpdAkocmV2aXNpb24gMTcyNzA4KQorKysgVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0CSh3 b3JraW5nIGNvcHkpCkBAIC0xLDYgKzEsNiBAQAogIyEvdXNyL2Jpbi9wZXJsIC13CiAKLSMgQ29w eXJpZ2h0IChDKSAyMDA1LCAyMDA2LCAyMDA3LCAyMDA4LCAyMDA5LCAyMDEzIEFwcGxlIEluYy4g QWxsIHJpZ2h0cyByZXNlcnZlZC4KKyMgQ29weXJpZ2h0IChDKSAyMDA1LTIwMDksIDIwMTMsIDIw MTQgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgogIyBDb3B5cmlnaHQgKEMpIDIwMDkg R29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KICMgQ29weXJpZ2h0IChDKSAyMDExIEJy ZW50IEZ1bGdoYW0uIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCkBAIC0zOSw5ICszOSw2IEBAIHVz ZSBHZXRvcHQ6Okxvbmc7CiB1c2UgVkNTVXRpbHM7CiB1c2Ugd2Via2l0ZGlyczsKIAotc3ViIHJ1 blN2blVwZGF0ZSgpOwotc3ViIHJ1bkdpdFVwZGF0ZSgpOwotCiAjIEhhbmRsZSBvcHRpb25zCiBt eSAkcXVpZXQgPSAnJzsKIG15ICRzaG93SGVscDsKQEAgLTUyLDEyICs0OSwxNSBAQCBjaGRpcldl YktpdCgpOwogCiAjIEZJWE1FOiBSZW1vdmUgdGhlIGNoZWNrIGZvciAuLi9JbnRlcm5hbCBvbmNl IEFwcGxlLWludGVybmFsIHVzZXJzIG9mIHRoaXMgc2NyaXB0IHBhc3MgLS1uby1hdXhpbGlhcnkt bGlicwogbXkgJGF1eGlsaWFyeUxpYnMgPSAhIC1kICIuLi9JbnRlcm5hbCI7CisjIEZJWE1FOiBo dHRwOi8vd2Via2l0Lm9yZy9iLzEzNTgxNSB1cGRhdGUtd2Via2l0IHNob3VsZCBub3QgY2hlY2sg Zm9yIHRoZSBwcmVzZW5jZSBvZiBBcHBsZeKAmXMgSW50ZXJuYWwgZGlyZWN0b3J5CitteSAkaW50 ZXJuYWwgPSAtZCAiLi4vSW50ZXJuYWwiOwogCiBteSAkZ2V0T3B0aW9uc1Jlc3VsdCA9IEdldE9w dGlvbnMoCiAgICAgJ2h8aGVscCcgID0+IFwkc2hvd0hlbHAsCiAgICAgJ3F8cXVpZXQnID0+IFwk cXVpZXQsCiAgICAgJ2F1eGlsaWFyeS1saWJzIScgPT4gXCRhdXhpbGlhcnlMaWJzLAotKTsgCisg ICAgJ2ludGVybmFsIScgPT4gXCRpbnRlcm5hbCwKKyk7CiAKIGlmICghJGdldE9wdGlvbnNSZXN1 bHQgfHwgJHNob3dIZWxwKSB7CiAgICAgcHJpbnQgU1RERVJSIDw8X19FTkRfXzsKQEAgLTY1LDcg KzY1LDcgQEAgVXNhZ2U6IEB7WyBiYXNlbmFtZSgkMCkgXX0gW29wdGlvbnNdCiAgIC1ofC0taGVs cCAgICAgICAgICAgICAgICAgc2hvdyB0aGUgaGVscCBtZXNzYWdlCiAgIC1xfC0tcXVpZXQgICAg ICAgICAgICAgICAgcGFzcyAtcSB0byBzdm4gdXBkYXRlIGZvciBxdWlldCB1cGRhdGVzCiAgIC0t W25vLV1hdXhpbGlhcnktbGlicyAgICAgW2RvblwndF0gdXBkYXRlIHRoZSBhdXhpbGlhcnkgbGli cmFyaWVzIGZvciBXaW5kb3dzIChkZWZhdWx0OiB1cGRhdGUpCi0gIC0td2luY2Fpcm8gICAgICAg ICAgICAgICAgYWxzbyB1cGRhdGUgZGVwZW5kZW5jaWVzIG9mIHRoZSBXaW5DYWlybyBwb3J0Cisg IC0tW25vLV1pbnRlcm5hbCAgICAgICAgICAgW2RvblwndF0gdXBkYXRlIC4uL0ludGVybmFsIChk ZWZhdWx0OiB1cGRhdGUgaWYgaXQgZXhpc3RzKQogX19FTkRfXwogICAgIGV4aXQgMTsKIH0KQEAg LTc3LDEzICs3NywxMyBAQCBwdXNoIEBzdm5PcHRpb25zLCAnLXEnIGlmICRxdWlldDsKIHB1c2gg QHN2bk9wdGlvbnMsIHF3KC0tYWNjZXB0IHBvc3Rwb25lKSBpZiBpc1NWTlZlcnNpb24xNk9yTmV3 ZXIoKTsKIAogcHJpbnQgIlVwZGF0aW5nIE9wZW5Tb3VyY2VcbiIgdW5sZXNzICRxdWlldDsKLXJ1 blN2blVwZGF0ZSgpIGlmIGlzU1ZOKCk7CitydW5Tdm5VcGRhdGVBbmRSZXNvbHZlQ2hhbmdlTG9n cyhAc3ZuT3B0aW9ucykgaWYgaXNTVk4oKTsKIHJ1bkdpdFVwZGF0ZSgpIGlmIGlzR2l0KCk7CiAK LWlmICgtZCAiLi4vSW50ZXJuYWwiKSB7CitpZiAoJGludGVybmFsKSB7CiAgICAgY2hkaXIoIi4u L0ludGVybmFsIik7CiAgICAgcHJpbnQgIlVwZGF0aW5nIEludGVybmFsXG4iIHVubGVzcyAkcXVp ZXQ7Ci0gICAgcnVuU3ZuVXBkYXRlKCkgaWYgaXNTVk5EaXJlY3RvcnkoIi4iKTsKKyAgICBydW5T dm5VcGRhdGVBbmRSZXNvbHZlQ2hhbmdlTG9ncyhAc3ZuT3B0aW9ucykgaWYgaXNTVk5EaXJlY3Rv cnkoIi4iKTsKICAgICBydW5HaXRVcGRhdGUoKSBpZiBpc0dpdERpcmVjdG9yeSgiLiIpOwogfQog CkBAIC05OCwzOSArOTgsMyBAQCBpZiAoaXNBcHBsZVdpbldlYktpdCgpICYmICRhdXhpbGlhcnlM aWJzCiBzZXR1cEFwcGxlV2luRW52KCkgaWYgaXNBcHBsZVdpbldlYktpdCgpOwogCiBleGl0IDA7 Ci0KLXN1YiBydW5Tdm5VcGRhdGUoKQotewotICAgIG9wZW4gVVBEQVRFLCAiLXwiLCAic3ZuIiwg InVwZGF0ZSIsIEBzdm5PcHRpb25zIG9yIGRpZTsKLSAgICBteSBAY29uZmxpY3RlZENoYW5nZUxv Z3M7Ci0gICAgd2hpbGUgKG15ICRsaW5lID0gPFVQREFURT4pIHsKLSAgICAgICAgcHJpbnQgJGxp bmU7Ci0gICAgICAgICRsaW5lID1+IG0vXkNccysoLis/KVtcclxuXSokLzsKLSAgICAgICAgaWYg KCQxKSB7Ci0gICAgICAgICAgbXkgJGZpbGVuYW1lID0gbm9ybWFsaXplUGF0aCgkMSk7Ci0gICAg ICAgICAgcHVzaCBAY29uZmxpY3RlZENoYW5nZUxvZ3MsICRmaWxlbmFtZSBpZiBiYXNlbmFtZSgk ZmlsZW5hbWUpIGVxICJDaGFuZ2VMb2ciOwotICAgICAgICB9Ci0gICAgfQotICAgIGNsb3NlIFVQ REFURSBvciBkaWU7Ci0KLSAgICBpZiAoQGNvbmZsaWN0ZWRDaGFuZ2VMb2dzKSB7Ci0gICAgICAg IHByaW50ICJBdHRlbXB0aW5nIHRvIG1lcmdlIGNvbmZsaWN0ZWQgQ2hhbmdlTG9ncy5cbiI7Ci0g ICAgICAgIG15ICRyZXNvbHZlQ2hhbmdlTG9nc1BhdGggPSBGaWxlOjpTcGVjLT5jYXRmaWxlKGRp cm5hbWUoJDApLCAicmVzb2x2ZS1DaGFuZ2VMb2dzIik7Ci0gICAgICAgIChzeXN0ZW0oJHJlc29s dmVDaGFuZ2VMb2dzUGF0aCwgIi0tbm8td2FybmluZ3MiLCBAY29uZmxpY3RlZENoYW5nZUxvZ3Mp ID09IDApCi0gICAgICAgICAgICBvciBkaWUgIkNvdWxkIG5vdCBvcGVuIHJlc29sdmUtQ2hhbmdl TG9ncyBzY3JpcHQ6ICQhLlxuIjsKLSAgICB9Ci19Ci0KLXN1YiBydW5HaXRVcGRhdGUoKQotewot ICAgICMgRG9pbmcgYSBnaXQgZmV0Y2ggZmlyc3QgYWxsb3dzIHNldHVwcyB3aXRoIHN2bi1yZW1v dGUuc3ZuLmZldGNoID0gdHJ1bms6cmVmcy9yZW1vdGVzL29yaWdpbi9tYXN0ZXIKLSAgICAjIHRv IHBlcmZvcm0gdGhlIHJlYmFzZSBtdWNoIG11Y2ggZmFzdGVyLgotICAgIHN5c3RlbSgiZ2l0Iiwg ImZldGNoIikgPT0gMCBvciBkaWU7Ci0gICAgaWYgKGlzR2l0U1ZOKCkpIHsKLSAgICAgICAgc3lz dGVtKCJnaXQiLCAic3ZuIiwgInJlYmFzZSIpID09IDAgb3IgZGllOwotICAgIH0gZWxzZSB7Ci0g ICAgICAgICMgVGhpcyB3aWxsIGRpZSBpZiBicmFuY2guJEJSQU5DSE5BTUUubWVyZ2UgaXNuJ3Qg c2V0LCB3aGljaCBpcwotICAgICAgICAjIGFsbW9zdCBjZXJ0YWlubHkgd2hhdCB3ZSB3YW50Lgot ICAgICAgICBzeXN0ZW0oImdpdCIsICJwdWxsIikgPT0gMCBvciBkaWU7Ci0gICAgfQotfQpJbmRl eDogVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1Njcmlw dHMvd2Via2l0ZGlycy5wbQkocmV2aXNpb24gMTcyNzA4KQorKysgVG9vbHMvU2NyaXB0cy93ZWJr aXRkaXJzLnBtCSh3b3JraW5nIGNvcHkpCkBAIC0yNTIwLDQgKzI1MjAsNDEgQEAgc3ViIGZvcm1h dEJ1aWxkVGltZSgkKQogICAgIHJldHVybiBzcHJpbnRmKCIlMDJkbTolMDJkcyIsICRidWlsZE1p bnMsICRidWlsZFNlY3MpOwogfQogCitzdWIgcnVuU3ZuVXBkYXRlQW5kUmVzb2x2ZUNoYW5nZUxv Z3MoQCkKK3sKKyAgICBteSBAc3ZuT3B0aW9ucyA9IEBfOworICAgIG9wZW4gVVBEQVRFLCAiLXwi LCAic3ZuIiwgInVwZGF0ZSIsIEBzdm5PcHRpb25zIG9yIGRpZTsKKyAgICBteSBAY29uZmxpY3Rl ZENoYW5nZUxvZ3M7CisgICAgd2hpbGUgKG15ICRsaW5lID0gPFVQREFURT4pIHsKKyAgICAgICAg cHJpbnQgJGxpbmU7CisgICAgICAgICRsaW5lID1+IG0vXkNccysoLis/KVtcclxuXSokLzsKKyAg ICAgICAgaWYgKCQxKSB7CisgICAgICAgICAgbXkgJGZpbGVuYW1lID0gbm9ybWFsaXplUGF0aCgk MSk7CisgICAgICAgICAgcHVzaCBAY29uZmxpY3RlZENoYW5nZUxvZ3MsICRmaWxlbmFtZSBpZiBi YXNlbmFtZSgkZmlsZW5hbWUpIGVxICJDaGFuZ2VMb2ciOworICAgICAgICB9CisgICAgfQorICAg IGNsb3NlIFVQREFURSBvciBkaWU7CisKKyAgICBpZiAoQGNvbmZsaWN0ZWRDaGFuZ2VMb2dzKSB7 CisgICAgICAgIHByaW50ICJBdHRlbXB0aW5nIHRvIG1lcmdlIGNvbmZsaWN0ZWQgQ2hhbmdlTG9n cy5cbiI7CisgICAgICAgIG15ICRyZXNvbHZlQ2hhbmdlTG9nc1BhdGggPSBGaWxlOjpTcGVjLT5j YXRmaWxlKGRpcm5hbWUoJDApLCAicmVzb2x2ZS1DaGFuZ2VMb2dzIik7CisgICAgICAgIChzeXN0 ZW0oJHJlc29sdmVDaGFuZ2VMb2dzUGF0aCwgIi0tbm8td2FybmluZ3MiLCBAY29uZmxpY3RlZENo YW5nZUxvZ3MpID09IDApCisgICAgICAgICAgICBvciBkaWUgIkNvdWxkIG5vdCBvcGVuIHJlc29s dmUtQ2hhbmdlTG9ncyBzY3JpcHQ6ICQhLlxuIjsKKyAgICB9Cit9CisKK3N1YiBydW5HaXRVcGRh dGUoKQoreworICAgICMgRG9pbmcgYSBnaXQgZmV0Y2ggZmlyc3QgYWxsb3dzIHNldHVwcyB3aXRo IHN2bi1yZW1vdGUuc3ZuLmZldGNoID0gdHJ1bms6cmVmcy9yZW1vdGVzL29yaWdpbi9tYXN0ZXIK KyAgICAjIHRvIHBlcmZvcm0gdGhlIHJlYmFzZSBtdWNoIG11Y2ggZmFzdGVyLgorICAgIHN5c3Rl bSgiZ2l0IiwgImZldGNoIikgPT0gMCBvciBkaWU7CisgICAgaWYgKGlzR2l0U1ZOKCkpIHsKKyAg ICAgICAgc3lzdGVtKCJnaXQiLCAic3ZuIiwgInJlYmFzZSIpID09IDAgb3IgZGllOworICAgIH0g ZWxzZSB7CisgICAgICAgICMgVGhpcyB3aWxsIGRpZSBpZiBicmFuY2guJEJSQU5DSE5BTUUubWVy Z2UgaXNuJ3Qgc2V0LCB3aGljaCBpcworICAgICAgICAjIGFsbW9zdCBjZXJ0YWlubHkgd2hhdCB3 ZSB3YW50LgorICAgICAgICBzeXN0ZW0oImdpdCIsICJwdWxsIikgPT0gMCBvciBkaWU7CisgICAg fQorfQorCiAxOwo= 236826 2014-08-19 15:10:10 -0700 2014-08-19 15:11:33 -0700 III. Remove code that deals with ../Internal 135815-3.diff text/plain 2304 mitz SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDE3Mjc2NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEyIEBACisyMDE0LTA4LTE5ICBEYW4gQmVybnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisK KyAgICAgICAgdXBkYXRlLXdlYmtpdCBzaG91bGQgbm90IGNoZWNrIGZvciB0aGUgcHJlc2VuY2Ug b2YgQXBwbGXigJlzIEludGVybmFsIGRpcmVjdG9yeQorICAgICAgICBMYXN0IHBhcnQgb2YgaHR0 cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEzNTgxNQorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy91cGRhdGUtd2Vi a2l0OgorCiAyMDE0LTA4LTE5ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAKICAg ICAgICAgUmVtb3ZlIEVOQUJMRShTVUJQSVhFTF9MQVlPVVQpLgpJbmRleDogVG9vbHMvU2NyaXB0 cy91cGRhdGUtd2Via2l0Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtp dAkocmV2aXNpb24gMTcyNzY0KQorKysgVG9vbHMvU2NyaXB0cy91cGRhdGUtd2Via2l0CSh3b3Jr aW5nIGNvcHkpCkBAIC00NywxNSArNDcsMTQgQEAgZGV0ZXJtaW5lSXNXaW5DYWlybygpOwogCiBj aGRpcldlYktpdCgpOwogCi0jIEZJWE1FOiBSZW1vdmUgdGhlIGNoZWNrIGZvciAuLi9JbnRlcm5h bCBvbmNlIEFwcGxlLWludGVybmFsIHVzZXJzIG9mIHRoaXMgc2NyaXB0IHBhc3MgLS1uby1hdXhp bGlhcnktbGlicwotbXkgJGF1eGlsaWFyeUxpYnMgPSAhIC1kICIuLi9JbnRlcm5hbCI7Ci0jIEZJ WE1FOiBodHRwOi8vd2Via2l0Lm9yZy9iLzEzNTgxNSB1cGRhdGUtd2Via2l0IHNob3VsZCBub3Qg Y2hlY2sgZm9yIHRoZSBwcmVzZW5jZSBvZiBBcHBsZSdzIEludGVybmFsIGRpcmVjdG9yeQotbXkg JGludGVybmFsID0gLWQgIi4uL0ludGVybmFsIjsKK215ICRhdXhpbGlhcnlMaWJzOworbXkgJGlu dGVybmFsOwogCiBteSAkZ2V0T3B0aW9uc1Jlc3VsdCA9IEdldE9wdGlvbnMoCiAgICAgJ2h8aGVs cCcgID0+IFwkc2hvd0hlbHAsCiAgICAgJ3F8cXVpZXQnID0+IFwkcXVpZXQsCiAgICAgJ2F1eGls aWFyeS1saWJzIScgPT4gXCRhdXhpbGlhcnlMaWJzLAorICAgICMgRklYTUU6IFRoaXMgb3B0aW9u IGlzIGlnbm9yZWQuIFJlbW92ZSBpdCBvbmNlIG5vIG9uZSBpbiBwYXNzaW5nIGl0IGluLgogICAg ICdpbnRlcm5hbCEnID0+IFwkaW50ZXJuYWwsCiApOwogCkBAIC02NSw3ICs2NCw2IEBAIFVzYWdl OiBAe1sgYmFzZW5hbWUoJDApIF19IFtvcHRpb25zXQogICAtaHwtLWhlbHAgICAgICAgICAgICAg ICAgIHNob3cgdGhlIGhlbHAgbWVzc2FnZQogICAtcXwtLXF1aWV0ICAgICAgICAgICAgICAgIHBh c3MgLXEgdG8gc3ZuIHVwZGF0ZSBmb3IgcXVpZXQgdXBkYXRlcwogICAtLVtuby1dYXV4aWxpYXJ5 LWxpYnMgICAgIFtkb25cJ3RdIHVwZGF0ZSB0aGUgYXV4aWxpYXJ5IGxpYnJhcmllcyBmb3IgV2lu ZG93cyAoZGVmYXVsdDogdXBkYXRlKQotICAtLVtuby1daW50ZXJuYWwgICAgICAgICAgIFtkb25c J3RdIHVwZGF0ZSAuLi9JbnRlcm5hbCAoZGVmYXVsdDogdXBkYXRlIGlmIGl0IGV4aXN0cykKIF9f RU5EX18KICAgICBleGl0IDE7CiB9CkBAIC04MCwxMyArNzgsNiBAQCBwcmludCAiVXBkYXRpbmcg T3BlblNvdXJjZVxuIiB1bmxlc3MgJHF1CiBydW5Tdm5VcGRhdGVBbmRSZXNvbHZlQ2hhbmdlTG9n cyhAc3ZuT3B0aW9ucykgaWYgaXNTVk4oKTsKIHJ1bkdpdFVwZGF0ZSgpIGlmIGlzR2l0KCk7CiAK LWlmICgkaW50ZXJuYWwpIHsKLSAgICBjaGRpcigiLi4vSW50ZXJuYWwiKTsKLSAgICBwcmludCAi VXBkYXRpbmcgSW50ZXJuYWxcbiIgdW5sZXNzICRxdWlldDsKLSAgICBydW5Tdm5VcGRhdGVBbmRS ZXNvbHZlQ2hhbmdlTG9ncyhAc3ZuT3B0aW9ucykgaWYgaXNTVk5EaXJlY3RvcnkoIi4iKTsKLSAg ICBydW5HaXRVcGRhdGUoKSBpZiBpc0dpdERpcmVjdG9yeSgiLiIpOwotfQotCiBpZiAoaXNBcHBs ZVdpbldlYktpdCgpICYmICRhdXhpbGlhcnlMaWJzKSB7CiAgICAgc3lzdGVtKCJwZXJsIiwgIlRv b2xzL1NjcmlwdHMvdXBkYXRlLXdlYmtpdC1hdXhpbGlhcnktbGlicyIpID09IDAgb3IgZGllOwog ICAgIGlmIChpc1dpbkNhaXJvKCkpIHsK