29907 2009-09-29 17:31:30 -0700 [Chromium] Incorrect conditions in WebCore.gyp 2009-09-30 12:01:25 -0700 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 0 hawk webkit-unassigned commit-queue yaar oldest_to_newest 151113 0 hawk 2009-09-29 17:31:30 -0700 /trunk/WebCore/WebCore.gyp/WebCore.gyp has a single target ('webcore') with two 'conditions' values. The first one is ignored leaving out some needed definitions (namely, WEBCORE_NAVIGATOR_PLATFORM for Mac, Windows, and Linux). The problem stems from a merge at http://codereview.chromium.org/208029 151117 1 40336 hawk 2009-09-29 17:33:58 -0700 Created attachment 40336 Patch the collapses the two condition sections into one 151134 2 40336 eric 2009-09-29 18:27:52 -0700 Comment on attachment 40336 Patch the collapses the two condition sections into one Forgot to click the "patch" checkbox. Tools like "bugzilla-tool post-diff" will do all that for you. Also your ChangeLog should really have the bug number in it. prepare-ChangeLog --bug will do that. This is covered in http://webkit.org/coding/contributing.html 151266 3 40336 dglazkov 2009-09-30 09:14:16 -0700 Comment on attachment 40336 Patch the collapses the two condition sections into one This looks great, except: > + Fix for conditionals in the WebCore gyp file, which contained two separate > + 'conditions' values for the webcore target. The first entry was ignored, > + resulting in some missine defines. Need bug URL. 151307 4 40385 hawk 2009-09-30 11:41:31 -0700 Created attachment 40385 Previous patch + bug URL 151309 5 40385 dglazkov 2009-09-30 11:42:53 -0700 Comment on attachment 40385 Previous patch + bug URL r=me. 151314 6 40385 commit-queue 2009-09-30 12:01:21 -0700 Comment on attachment 40385 Previous patch + bug URL Clearing flags on attachment: 40385 Committed r48940: <http://trac.webkit.org/changeset/48940> 151315 7 commit-queue 2009-09-30 12:01:25 -0700 All reviewed patches have been landed. Closing bug. 40336 2009-09-29 17:33:58 -0700 2009-09-30 11:41:31 -0700 Patch the collapses the two condition sections into one webcore_gyp_patch.txt text/plain 5904 hawk SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODkxMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTMgQEAKKzIwMDktMDktMjkgIENocmlzIEhhd2sgIDxoYXdrQGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXgg Zm9yIGNvbmRpdGlvbmFscyBpbiB0aGUgV2ViQ29yZSBneXAgZmlsZSwgd2hpY2ggY29udGFpbmVk IHR3byBzZXBhcmF0ZQorICAgICAgICAnY29uZGl0aW9ucycgdmFsdWVzIGZvciB0aGUgd2ViY29y ZSB0YXJnZXQuIFRoZSBmaXJzdCBlbnRyeSB3YXMgaWdub3JlZCwKKyAgICAgICAgcmVzdWx0aW5n IGluIHNvbWUgbWlzc2luZSBkZWZpbmVzLgorCisgICAgICAgICogV2ViQ29yZS5neXAvV2ViQ29y ZS5neXA6CisKIDIwMDktMDktMjkgIEVucmljYSBDYXN1Y2NpICA8ZW5yaWNhQGFwcGxlLmNvbT4K IAogICAgICAgICBSZXZpZXdlZCBieSBBZGVsZSBQZXRlcnNvbi4KSW5kZXg6IFdlYkNvcmUvV2Vi Q29yZS5neXAvV2ViQ29yZS5neXAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gV2ViQ29yZS9XZWJDb3JlLmd5cC9X ZWJDb3JlLmd5cAkocmV2aXNpb24gNDg5MTApCisrKyBXZWJDb3JlL1dlYkNvcmUuZ3lwL1dlYkNv cmUuZ3lwCSh3b3JraW5nIGNvcHkpCkBAIC0xNTksNTQgKzE1OSw2IEBACiAgICAgICAnZGVmaW5l cyc6IFsKICAgICAgICAgJ1dFQkNPUkVfTkFWSUdBVE9SX1ZFTkRPUj0iR29vZ2xlIEluYy4iJywg CiAgICAgICBdLAotICAgICAgJ2NvbmRpdGlvbnMnOiBbCi0gICAgICAgIFsnT1M9PSJsaW51eCIn LCB7Ci0gICAgICAgICAgJ2RlZmluZXMnOiBbCi0gICAgICAgICAgICAjIE1vemlsbGEgb24gTGlu dXggZWZmZWN0aXZlbHkgdXNlcyB1bmFtZSAtc20sIGJ1dCB3aGVuIHJ1bm5pbmcKLSAgICAgICAg ICAgICMgMzItYml0IHg4NiBjb2RlIG9uIGFuIHg4Nl82NCBwcm9jZXNzb3IsIGl0IHVzZXMKLSAg ICAgICAgICAgICMgIkxpbnV4IGk2ODYgKHg4Nl82NCkiLiAgTWF0Y2hpbmcgdGhhdCB3b3VsZCBy ZXF1aXJlIG1ha2luZyBhCi0gICAgICAgICAgICAjIHJ1bi10aW1lIGRldGVybWluYXRpb24uCi0g ICAgICAgICAgICAnV0VCQ09SRV9OQVZJR0FUT1JfUExBVEZPUk09IkxpbnV4IGk2ODYiJywKLSAg ICAgICAgICBdLAotICAgICAgICB9XSwKLSAgICAgICAgWydPUz09Im1hYyInLCB7Ci0gICAgICAg ICAgJ2RlZmluZXMnOiBbCi0gICAgICAgICAgICAjIE1hdGNoIFNhZmFyaSBhbmQgTW96aWxsYSBv biBNYWMgeDg2LgotICAgICAgICAgICAgJ1dFQkNPUkVfTkFWSUdBVE9SX1BMQVRGT1JNPSJNYWNJ bnRlbCInLAotCi0gICAgICAgICAgICAjIENocm9taXVtJ3MgdmVyc2lvbiBvZiBXZWJDb3JlIGlu Y2x1ZGVzIHRoZSBmb2xsb3dpbmcgT2JqZWN0aXZlLUMKLSAgICAgICAgICAgICMgY2xhc3Nlcy4g VGhlIHN5c3RlbS1wcm92aWRlZCBXZWJDb3JlIGZyYW1ld29yayBtYXkgYWxzbyBwcm92aWRlCi0g ICAgICAgICAgICAjIHRoZXNlIGNsYXNzZXMuIEJlY2F1c2Ugb2YgdGhlIG5hdHVyZSBvZiBPYmpl Y3RpdmUtQyBiaW5kaW5nCi0gICAgICAgICAgICAjIChkeW5hbWljYWxseSBhdCBydW50aW1lKSwg aXQncyBwb3NzaWJsZSBmb3IgdGhlIENocm9taXVtLXByb3ZpZGVkCi0gICAgICAgICAgICAjIHZl cnNpb25zIHRvIGludGVyZmVyZSB3aXRoIHRoZSBzeXN0ZW0tcHJvdmlkZWQgdmVyc2lvbnMuICBU aGlzIG1heQotICAgICAgICAgICAgIyBoYXBwZW4gd2hlbiBhIHN5c3RlbSBmcmFtZXdvcmsgYXR0 ZW1wdHMgdG8gdXNlIFdlYkNvcmUuZnJhbWV3b3JrLAotICAgICAgICAgICAgIyBzdWNoIGFzIHdo ZW4gY29udmVydGluZyBhbiBIVE1MLWZsYXZvcmVkIHN0cmluZyB0byBhbgotICAgICAgICAgICAg IyBOU0F0dHJpYnV0ZWRTdHJpbmcuICBUaGUgc29sdXRpb24gaXMgdG8gZm9yY2UgT2JqZWN0aXZl LUMgY2xhc3MKLSAgICAgICAgICAgICMgbmFtZXMgdGhhdCB3b3VsZCBjb25mbGljdCB0byB1c2Ug YWx0ZXJuYXRlIG5hbWVzLgotCi0gICAgICAgICAgICAjIEZJWE1FOiBUaGlzIGxpc3Qgd2lsbCBo b3BlZnVsbHkgc2hyaW5rIGJ1dCBtYXkgYWxzbyBncm93LgotICAgICAgICAgICAgIyBQZXJpb2Rp Y2FsbHkgcnVuOgotICAgICAgICAgICAgIyBubSBsaWJ3ZWJjb3JlLmEgfCBncmVwIC1FICdbYXRz QVRTXSAoWystXVxbfFwub2JqY19jbGFzc19uYW1lKScKLSAgICAgICAgICAgICMgYW5kIG1ha2Ug c3VyZSB0aGF0IGV2ZXJ5dGhpbmcgbGlzdGVkIHRoZXJlIGhhcyB0aGUgYWx0ZXJuYXRlCi0gICAg ICAgICAgICAjIENocm9taXVtV2ViQ29yZU9iakMgbmFtZSwgYW5kIHRoYXQgbm90aGluZyBleHRy YW5lb3VzIGlzIGxpc3RlZAotICAgICAgICAgICAgIyBoZXJlLiBJZiBhbGwgT2JqZWN0aXZlLUMg Y2FuIGJlIGVsaW1pbmF0ZWQgZnJvbSBDaHJvbWl1bSdzIFdlYkNvcmUKLSAgICAgICAgICAgICMg bGlicmFyeSwgdGhlc2UgZGVmaW5lcyBzaG91bGQgYmUgcmVtb3ZlZCBlbnRpcmVseS4KLSAgICAg ICAgICAgICdTY3JvbGxiYXJQcmVmc09ic2VydmVyPUNocm9taXVtV2ViQ29yZU9iakNTY3JvbGxi YXJQcmVmc09ic2VydmVyJywKLSAgICAgICAgICAgICdXZWJDb3JlUmVuZGVyVGhlbWVOb3RpZmlj YXRpb25PYnNlcnZlcj1DaHJvbWl1bVdlYkNvcmVPYmpDV2ViQ29yZVJlbmRlclRoZW1lTm90aWZp Y2F0aW9uT2JzZXJ2ZXInLAotICAgICAgICAgICAgJ1dlYkZvbnRDYWNoZT1DaHJvbWl1bVdlYkNv cmVPYmpDV2ViRm9udENhY2hlJywKLSAgICAgICAgICBdLAotICAgICAgICB9XSwKLSAgICAgICAg WydPUz09IndpbiInLCB7Ci0gICAgICAgICAgJ2RlZmluZXMnOiBbCi0gICAgICAgICAgICAjIE1h dGNoIFNhZmFyaSBhbmQgTW96aWxsYSBvbiBXaW5kb3dzLgotICAgICAgICAgICAgJ1dFQkNPUkVf TkFWSUdBVE9SX1BMQVRGT1JNPSJXaW4zMiInLAotICAgICAgICAgIF0sCi0gICAgICAgICAgJ2Rl cGVuZGVuY2llcyc6IFsKLSAgICAgICAgICAgICMgTmVlZGVkIG9uIHdpbmRvd3MgZm9yIHNvbWUg YWN0aW9ucyBhbmQgcnVsZXMKLSAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL2J1aWxk L3dpbi9zeXN0ZW0uZ3lwOmN5Z3dpbicKLSAgICAgICAgICBdLAotICAgICAgICB9XSwKLSAgICAg IF0sIAogICAgICAgJ2FjdGlvbnMnOiBbCiAgICAgICAgICMgQWN0aW9ucyB0byBidWlsZCBkZXJp dmVkIHNvdXJjZXMuCiAgICAgICAgIHsKQEAgLTYzNyw3ICs1ODksNDEgQEAKICAgICAgICAgICAg ICctZm5vLXN0cmljdC1hbGlhc2luZycsCiAgICAgICAgICAgXSwKICAgICAgICAgfV0sCisgICAg ICAgIFsnT1M9PSJsaW51eCInLCB7CisgICAgICAgICAgJ2RlZmluZXMnOiBbCisgICAgICAgICAg ICAjIE1vemlsbGEgb24gTGludXggZWZmZWN0aXZlbHkgdXNlcyB1bmFtZSAtc20sIGJ1dCB3aGVu IHJ1bm5pbmcKKyAgICAgICAgICAgICMgMzItYml0IHg4NiBjb2RlIG9uIGFuIHg4Nl82NCBwcm9j ZXNzb3IsIGl0IHVzZXMKKyAgICAgICAgICAgICMgIkxpbnV4IGk2ODYgKHg4Nl82NCkiLiAgTWF0 Y2hpbmcgdGhhdCB3b3VsZCByZXF1aXJlIG1ha2luZyBhCisgICAgICAgICAgICAjIHJ1bi10aW1l IGRldGVybWluYXRpb24uCisgICAgICAgICAgICAnV0VCQ09SRV9OQVZJR0FUT1JfUExBVEZPUk09 IkxpbnV4IGk2ODYiJywKKyAgICAgICAgICBdLAorICAgICAgICB9XSwKICAgICAgICAgWydPUz09 Im1hYyInLCB7CisgICAgICAgICAgJ2RlZmluZXMnOiBbCisgICAgICAgICAgICAjIE1hdGNoIFNh ZmFyaSBhbmQgTW96aWxsYSBvbiBNYWMgeDg2LgorICAgICAgICAgICAgJ1dFQkNPUkVfTkFWSUdB VE9SX1BMQVRGT1JNPSJNYWNJbnRlbCInLAorCisgICAgICAgICAgICAjIENocm9taXVtJ3MgdmVy c2lvbiBvZiBXZWJDb3JlIGluY2x1ZGVzIHRoZSBmb2xsb3dpbmcgT2JqZWN0aXZlLUMKKyAgICAg ICAgICAgICMgY2xhc3Nlcy4gVGhlIHN5c3RlbS1wcm92aWRlZCBXZWJDb3JlIGZyYW1ld29yayBt YXkgYWxzbyBwcm92aWRlCisgICAgICAgICAgICAjIHRoZXNlIGNsYXNzZXMuIEJlY2F1c2Ugb2Yg dGhlIG5hdHVyZSBvZiBPYmplY3RpdmUtQyBiaW5kaW5nCisgICAgICAgICAgICAjIChkeW5hbWlj YWxseSBhdCBydW50aW1lKSwgaXQncyBwb3NzaWJsZSBmb3IgdGhlIENocm9taXVtLXByb3ZpZGVk CisgICAgICAgICAgICAjIHZlcnNpb25zIHRvIGludGVyZmVyZSB3aXRoIHRoZSBzeXN0ZW0tcHJv dmlkZWQgdmVyc2lvbnMuICBUaGlzIG1heQorICAgICAgICAgICAgIyBoYXBwZW4gd2hlbiBhIHN5 c3RlbSBmcmFtZXdvcmsgYXR0ZW1wdHMgdG8gdXNlIFdlYkNvcmUuZnJhbWV3b3JrLAorICAgICAg ICAgICAgIyBzdWNoIGFzIHdoZW4gY29udmVydGluZyBhbiBIVE1MLWZsYXZvcmVkIHN0cmluZyB0 byBhbgorICAgICAgICAgICAgIyBOU0F0dHJpYnV0ZWRTdHJpbmcuICBUaGUgc29sdXRpb24gaXMg dG8gZm9yY2UgT2JqZWN0aXZlLUMgY2xhc3MKKyAgICAgICAgICAgICMgbmFtZXMgdGhhdCB3b3Vs ZCBjb25mbGljdCB0byB1c2UgYWx0ZXJuYXRlIG5hbWVzLgorCisgICAgICAgICAgICAjIEZJWE1F OiBUaGlzIGxpc3Qgd2lsbCBob3BlZnVsbHkgc2hyaW5rIGJ1dCBtYXkgYWxzbyBncm93LgorICAg ICAgICAgICAgIyBQZXJpb2RpY2FsbHkgcnVuOgorICAgICAgICAgICAgIyBubSBsaWJ3ZWJjb3Jl LmEgfCBncmVwIC1FICdbYXRzQVRTXSAoWystXVxbfFwub2JqY19jbGFzc19uYW1lKScKKyAgICAg ICAgICAgICMgYW5kIG1ha2Ugc3VyZSB0aGF0IGV2ZXJ5dGhpbmcgbGlzdGVkIHRoZXJlIGhhcyB0 aGUgYWx0ZXJuYXRlCisgICAgICAgICAgICAjIENocm9taXVtV2ViQ29yZU9iakMgbmFtZSwgYW5k IHRoYXQgbm90aGluZyBleHRyYW5lb3VzIGlzIGxpc3RlZAorICAgICAgICAgICAgIyBoZXJlLiBJ ZiBhbGwgT2JqZWN0aXZlLUMgY2FuIGJlIGVsaW1pbmF0ZWQgZnJvbSBDaHJvbWl1bSdzIFdlYkNv cmUKKyAgICAgICAgICAgICMgbGlicmFyeSwgdGhlc2UgZGVmaW5lcyBzaG91bGQgYmUgcmVtb3Zl ZCBlbnRpcmVseS4KKyAgICAgICAgICAgICdTY3JvbGxiYXJQcmVmc09ic2VydmVyPUNocm9taXVt V2ViQ29yZU9iakNTY3JvbGxiYXJQcmVmc09ic2VydmVyJywKKyAgICAgICAgICAgICdXZWJDb3Jl UmVuZGVyVGhlbWVOb3RpZmljYXRpb25PYnNlcnZlcj1DaHJvbWl1bVdlYkNvcmVPYmpDV2ViQ29y ZVJlbmRlclRoZW1lTm90aWZpY2F0aW9uT2JzZXJ2ZXInLAorICAgICAgICAgICAgJ1dlYkZvbnRD YWNoZT1DaHJvbWl1bVdlYkNvcmVPYmpDV2ViRm9udENhY2hlJywKKyAgICAgICAgICBdLAogICAg ICAgICAgICdhY3Rpb25zJzogWwogICAgICAgICAgICAgewogICAgICAgICAgICAgICAjIEFsbG93 IGZyYW1ld29yay1zdHlsZSAjaW5jbHVkZSBvZgpAQCAtNzcwLDYgKzc1Niw4IEBACiAgICAgICAg ICAgICBbJ2luY2x1ZGUnLCAnL1NraWFGb250V2luXFwuY3BwJCddLAogICAgICAgICAgIF0sCiAg ICAgICAgICAgJ2RlZmluZXMnOiBbCisgICAgICAgICAgICAjIE1hdGNoIFNhZmFyaSBhbmQgTW96 aWxsYSBvbiBXaW5kb3dzLgorICAgICAgICAgICAgJ1dFQkNPUkVfTkFWSUdBVE9SX1BMQVRGT1JN PSJXaW4zMiInLAogICAgICAgICAgICAgJ19fUFJFVFRZX0ZVTkNUSU9OX189X19GVU5DVElPTl9f JywKICAgICAgICAgICBdLAogICAgICAgICAgICMgVGhpcyBpcyBuZWVkZWQgYmVjYXVzZSBFdmVu dC5oIGluIHRoaXMgZGlyZWN0b3J5IGlzIGJsb2NrZWQK 40385 2009-09-30 11:41:31 -0700 2009-09-30 12:01:21 -0700 Previous patch + bug URL webcore_gyp_patch_2.txt text/plain 5959 hawk SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA0ODkxMSkKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMTQgQEAKKzIwMDktMDktMjkgIENocmlzIEhhd2sgIDxoYXdrQGNocm9taXVtLm9y Zz4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXgg Zm9yIGNvbmRpdGlvbmFscyBpbiB0aGUgV2ViQ29yZSBneXAgZmlsZSwgd2hpY2ggY29udGFpbmVk IHR3byBzZXBhcmF0ZQorICAgICAgICAnY29uZGl0aW9ucycgdmFsdWVzIGZvciB0aGUgd2ViY29y ZSB0YXJnZXQuIFRoZSBmaXJzdCBlbnRyeSB3YXMgaWdub3JlZCwKKyAgICAgICAgcmVzdWx0aW5n IGluIHNvbWUgbWlzc2luZSBkZWZpbmVzLgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9Mjk5MDcKKworICAgICAgICAqIFdlYkNvcmUuZ3lwL1dlYkNvcmUu Z3lwOgorCiAyMDA5LTA5LTI5ICBFbnJpY2EgQ2FzdWNjaSAgPGVucmljYUBhcHBsZS5jb20+CiAK ICAgICAgICAgUmV2aWV3ZWQgYnkgQWRlbGUgUGV0ZXJzb24uCkluZGV4OiBXZWJDb3JlL1dlYkNv cmUuZ3lwL1dlYkNvcmUuZ3lwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvV2ViQ29yZS5neXAvV2Vi Q29yZS5neXAJKHJldmlzaW9uIDQ4OTEwKQorKysgV2ViQ29yZS9XZWJDb3JlLmd5cC9XZWJDb3Jl Lmd5cAkod29ya2luZyBjb3B5KQpAQCAtMTU5LDU0ICsxNTksNiBAQAogICAgICAgJ2RlZmluZXMn OiBbCiAgICAgICAgICdXRUJDT1JFX05BVklHQVRPUl9WRU5ET1I9Ikdvb2dsZSBJbmMuIicsIAog ICAgICAgXSwKLSAgICAgICdjb25kaXRpb25zJzogWwotICAgICAgICBbJ09TPT0ibGludXgiJywg ewotICAgICAgICAgICdkZWZpbmVzJzogWwotICAgICAgICAgICAgIyBNb3ppbGxhIG9uIExpbnV4 IGVmZmVjdGl2ZWx5IHVzZXMgdW5hbWUgLXNtLCBidXQgd2hlbiBydW5uaW5nCi0gICAgICAgICAg ICAjIDMyLWJpdCB4ODYgY29kZSBvbiBhbiB4ODZfNjQgcHJvY2Vzc29yLCBpdCB1c2VzCi0gICAg ICAgICAgICAjICJMaW51eCBpNjg2ICh4ODZfNjQpIi4gIE1hdGNoaW5nIHRoYXQgd291bGQgcmVx dWlyZSBtYWtpbmcgYQotICAgICAgICAgICAgIyBydW4tdGltZSBkZXRlcm1pbmF0aW9uLgotICAg ICAgICAgICAgJ1dFQkNPUkVfTkFWSUdBVE9SX1BMQVRGT1JNPSJMaW51eCBpNjg2IicsCi0gICAg ICAgICAgXSwKLSAgICAgICAgfV0sCi0gICAgICAgIFsnT1M9PSJtYWMiJywgewotICAgICAgICAg ICdkZWZpbmVzJzogWwotICAgICAgICAgICAgIyBNYXRjaCBTYWZhcmkgYW5kIE1vemlsbGEgb24g TWFjIHg4Ni4KLSAgICAgICAgICAgICdXRUJDT1JFX05BVklHQVRPUl9QTEFURk9STT0iTWFjSW50 ZWwiJywKLQotICAgICAgICAgICAgIyBDaHJvbWl1bSdzIHZlcnNpb24gb2YgV2ViQ29yZSBpbmNs dWRlcyB0aGUgZm9sbG93aW5nIE9iamVjdGl2ZS1DCi0gICAgICAgICAgICAjIGNsYXNzZXMuIFRo ZSBzeXN0ZW0tcHJvdmlkZWQgV2ViQ29yZSBmcmFtZXdvcmsgbWF5IGFsc28gcHJvdmlkZQotICAg ICAgICAgICAgIyB0aGVzZSBjbGFzc2VzLiBCZWNhdXNlIG9mIHRoZSBuYXR1cmUgb2YgT2JqZWN0 aXZlLUMgYmluZGluZwotICAgICAgICAgICAgIyAoZHluYW1pY2FsbHkgYXQgcnVudGltZSksIGl0 J3MgcG9zc2libGUgZm9yIHRoZSBDaHJvbWl1bS1wcm92aWRlZAotICAgICAgICAgICAgIyB2ZXJz aW9ucyB0byBpbnRlcmZlcmUgd2l0aCB0aGUgc3lzdGVtLXByb3ZpZGVkIHZlcnNpb25zLiAgVGhp cyBtYXkKLSAgICAgICAgICAgICMgaGFwcGVuIHdoZW4gYSBzeXN0ZW0gZnJhbWV3b3JrIGF0dGVt cHRzIHRvIHVzZSBXZWJDb3JlLmZyYW1ld29yaywKLSAgICAgICAgICAgICMgc3VjaCBhcyB3aGVu IGNvbnZlcnRpbmcgYW4gSFRNTC1mbGF2b3JlZCBzdHJpbmcgdG8gYW4KLSAgICAgICAgICAgICMg TlNBdHRyaWJ1dGVkU3RyaW5nLiAgVGhlIHNvbHV0aW9uIGlzIHRvIGZvcmNlIE9iamVjdGl2ZS1D IGNsYXNzCi0gICAgICAgICAgICAjIG5hbWVzIHRoYXQgd291bGQgY29uZmxpY3QgdG8gdXNlIGFs dGVybmF0ZSBuYW1lcy4KLQotICAgICAgICAgICAgIyBGSVhNRTogVGhpcyBsaXN0IHdpbGwgaG9w ZWZ1bGx5IHNocmluayBidXQgbWF5IGFsc28gZ3Jvdy4KLSAgICAgICAgICAgICMgUGVyaW9kaWNh bGx5IHJ1bjoKLSAgICAgICAgICAgICMgbm0gbGlid2ViY29yZS5hIHwgZ3JlcCAtRSAnW2F0c0FU U10gKFsrLV1cW3xcLm9iamNfY2xhc3NfbmFtZSknCi0gICAgICAgICAgICAjIGFuZCBtYWtlIHN1 cmUgdGhhdCBldmVyeXRoaW5nIGxpc3RlZCB0aGVyZSBoYXMgdGhlIGFsdGVybmF0ZQotICAgICAg ICAgICAgIyBDaHJvbWl1bVdlYkNvcmVPYmpDIG5hbWUsIGFuZCB0aGF0IG5vdGhpbmcgZXh0cmFu ZW91cyBpcyBsaXN0ZWQKLSAgICAgICAgICAgICMgaGVyZS4gSWYgYWxsIE9iamVjdGl2ZS1DIGNh biBiZSBlbGltaW5hdGVkIGZyb20gQ2hyb21pdW0ncyBXZWJDb3JlCi0gICAgICAgICAgICAjIGxp YnJhcnksIHRoZXNlIGRlZmluZXMgc2hvdWxkIGJlIHJlbW92ZWQgZW50aXJlbHkuCi0gICAgICAg ICAgICAnU2Nyb2xsYmFyUHJlZnNPYnNlcnZlcj1DaHJvbWl1bVdlYkNvcmVPYmpDU2Nyb2xsYmFy UHJlZnNPYnNlcnZlcicsCi0gICAgICAgICAgICAnV2ViQ29yZVJlbmRlclRoZW1lTm90aWZpY2F0 aW9uT2JzZXJ2ZXI9Q2hyb21pdW1XZWJDb3JlT2JqQ1dlYkNvcmVSZW5kZXJUaGVtZU5vdGlmaWNh dGlvbk9ic2VydmVyJywKLSAgICAgICAgICAgICdXZWJGb250Q2FjaGU9Q2hyb21pdW1XZWJDb3Jl T2JqQ1dlYkZvbnRDYWNoZScsCi0gICAgICAgICAgXSwKLSAgICAgICAgfV0sCi0gICAgICAgIFsn T1M9PSJ3aW4iJywgewotICAgICAgICAgICdkZWZpbmVzJzogWwotICAgICAgICAgICAgIyBNYXRj aCBTYWZhcmkgYW5kIE1vemlsbGEgb24gV2luZG93cy4KLSAgICAgICAgICAgICdXRUJDT1JFX05B VklHQVRPUl9QTEFURk9STT0iV2luMzIiJywKLSAgICAgICAgICBdLAotICAgICAgICAgICdkZXBl bmRlbmNpZXMnOiBbCi0gICAgICAgICAgICAjIE5lZWRlZCBvbiB3aW5kb3dzIGZvciBzb21lIGFj dGlvbnMgYW5kIHJ1bGVzCi0gICAgICAgICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS9idWlsZC93 aW4vc3lzdGVtLmd5cDpjeWd3aW4nCi0gICAgICAgICAgXSwKLSAgICAgICAgfV0sCi0gICAgICBd LCAKICAgICAgICdhY3Rpb25zJzogWwogICAgICAgICAjIEFjdGlvbnMgdG8gYnVpbGQgZGVyaXZl ZCBzb3VyY2VzLgogICAgICAgICB7CkBAIC02MzcsNyArNTg5LDQxIEBACiAgICAgICAgICAgICAn LWZuby1zdHJpY3QtYWxpYXNpbmcnLAogICAgICAgICAgIF0sCiAgICAgICAgIH1dLAorICAgICAg ICBbJ09TPT0ibGludXgiJywgeworICAgICAgICAgICdkZWZpbmVzJzogWworICAgICAgICAgICAg IyBNb3ppbGxhIG9uIExpbnV4IGVmZmVjdGl2ZWx5IHVzZXMgdW5hbWUgLXNtLCBidXQgd2hlbiBy dW5uaW5nCisgICAgICAgICAgICAjIDMyLWJpdCB4ODYgY29kZSBvbiBhbiB4ODZfNjQgcHJvY2Vz c29yLCBpdCB1c2VzCisgICAgICAgICAgICAjICJMaW51eCBpNjg2ICh4ODZfNjQpIi4gIE1hdGNo aW5nIHRoYXQgd291bGQgcmVxdWlyZSBtYWtpbmcgYQorICAgICAgICAgICAgIyBydW4tdGltZSBk ZXRlcm1pbmF0aW9uLgorICAgICAgICAgICAgJ1dFQkNPUkVfTkFWSUdBVE9SX1BMQVRGT1JNPSJM aW51eCBpNjg2IicsCisgICAgICAgICAgXSwKKyAgICAgICAgfV0sCiAgICAgICAgIFsnT1M9PSJt YWMiJywgeworICAgICAgICAgICdkZWZpbmVzJzogWworICAgICAgICAgICAgIyBNYXRjaCBTYWZh cmkgYW5kIE1vemlsbGEgb24gTWFjIHg4Ni4KKyAgICAgICAgICAgICdXRUJDT1JFX05BVklHQVRP Ul9QTEFURk9STT0iTWFjSW50ZWwiJywKKworICAgICAgICAgICAgIyBDaHJvbWl1bSdzIHZlcnNp b24gb2YgV2ViQ29yZSBpbmNsdWRlcyB0aGUgZm9sbG93aW5nIE9iamVjdGl2ZS1DCisgICAgICAg ICAgICAjIGNsYXNzZXMuIFRoZSBzeXN0ZW0tcHJvdmlkZWQgV2ViQ29yZSBmcmFtZXdvcmsgbWF5 IGFsc28gcHJvdmlkZQorICAgICAgICAgICAgIyB0aGVzZSBjbGFzc2VzLiBCZWNhdXNlIG9mIHRo ZSBuYXR1cmUgb2YgT2JqZWN0aXZlLUMgYmluZGluZworICAgICAgICAgICAgIyAoZHluYW1pY2Fs bHkgYXQgcnVudGltZSksIGl0J3MgcG9zc2libGUgZm9yIHRoZSBDaHJvbWl1bS1wcm92aWRlZAor ICAgICAgICAgICAgIyB2ZXJzaW9ucyB0byBpbnRlcmZlcmUgd2l0aCB0aGUgc3lzdGVtLXByb3Zp ZGVkIHZlcnNpb25zLiAgVGhpcyBtYXkKKyAgICAgICAgICAgICMgaGFwcGVuIHdoZW4gYSBzeXN0 ZW0gZnJhbWV3b3JrIGF0dGVtcHRzIHRvIHVzZSBXZWJDb3JlLmZyYW1ld29yaywKKyAgICAgICAg ICAgICMgc3VjaCBhcyB3aGVuIGNvbnZlcnRpbmcgYW4gSFRNTC1mbGF2b3JlZCBzdHJpbmcgdG8g YW4KKyAgICAgICAgICAgICMgTlNBdHRyaWJ1dGVkU3RyaW5nLiAgVGhlIHNvbHV0aW9uIGlzIHRv IGZvcmNlIE9iamVjdGl2ZS1DIGNsYXNzCisgICAgICAgICAgICAjIG5hbWVzIHRoYXQgd291bGQg Y29uZmxpY3QgdG8gdXNlIGFsdGVybmF0ZSBuYW1lcy4KKworICAgICAgICAgICAgIyBGSVhNRTog VGhpcyBsaXN0IHdpbGwgaG9wZWZ1bGx5IHNocmluayBidXQgbWF5IGFsc28gZ3Jvdy4KKyAgICAg ICAgICAgICMgUGVyaW9kaWNhbGx5IHJ1bjoKKyAgICAgICAgICAgICMgbm0gbGlid2ViY29yZS5h IHwgZ3JlcCAtRSAnW2F0c0FUU10gKFsrLV1cW3xcLm9iamNfY2xhc3NfbmFtZSknCisgICAgICAg ICAgICAjIGFuZCBtYWtlIHN1cmUgdGhhdCBldmVyeXRoaW5nIGxpc3RlZCB0aGVyZSBoYXMgdGhl IGFsdGVybmF0ZQorICAgICAgICAgICAgIyBDaHJvbWl1bVdlYkNvcmVPYmpDIG5hbWUsIGFuZCB0 aGF0IG5vdGhpbmcgZXh0cmFuZW91cyBpcyBsaXN0ZWQKKyAgICAgICAgICAgICMgaGVyZS4gSWYg YWxsIE9iamVjdGl2ZS1DIGNhbiBiZSBlbGltaW5hdGVkIGZyb20gQ2hyb21pdW0ncyBXZWJDb3Jl CisgICAgICAgICAgICAjIGxpYnJhcnksIHRoZXNlIGRlZmluZXMgc2hvdWxkIGJlIHJlbW92ZWQg ZW50aXJlbHkuCisgICAgICAgICAgICAnU2Nyb2xsYmFyUHJlZnNPYnNlcnZlcj1DaHJvbWl1bVdl YkNvcmVPYmpDU2Nyb2xsYmFyUHJlZnNPYnNlcnZlcicsCisgICAgICAgICAgICAnV2ViQ29yZVJl bmRlclRoZW1lTm90aWZpY2F0aW9uT2JzZXJ2ZXI9Q2hyb21pdW1XZWJDb3JlT2JqQ1dlYkNvcmVS ZW5kZXJUaGVtZU5vdGlmaWNhdGlvbk9ic2VydmVyJywKKyAgICAgICAgICAgICdXZWJGb250Q2Fj aGU9Q2hyb21pdW1XZWJDb3JlT2JqQ1dlYkZvbnRDYWNoZScsCisgICAgICAgICAgXSwKICAgICAg ICAgICAnYWN0aW9ucyc6IFsKICAgICAgICAgICAgIHsKICAgICAgICAgICAgICAgIyBBbGxvdyBm cmFtZXdvcmstc3R5bGUgI2luY2x1ZGUgb2YKQEAgLTc3MCw2ICs3NTYsOCBAQAogICAgICAgICAg ICAgWydpbmNsdWRlJywgJy9Ta2lhRm9udFdpblxcLmNwcCQnXSwKICAgICAgICAgICBdLAogICAg ICAgICAgICdkZWZpbmVzJzogWworICAgICAgICAgICAgIyBNYXRjaCBTYWZhcmkgYW5kIE1vemls bGEgb24gV2luZG93cy4KKyAgICAgICAgICAgICdXRUJDT1JFX05BVklHQVRPUl9QTEFURk9STT0i V2luMzIiJywKICAgICAgICAgICAgICdfX1BSRVRUWV9GVU5DVElPTl9fPV9fRlVOQ1RJT05fXycs CiAgICAgICAgICAgXSwKICAgICAgICAgICAjIFRoaXMgaXMgbmVlZGVkIGJlY2F1c2UgRXZlbnQu aCBpbiB0aGlzIGRpcmVjdG9yeSBpcyBibG9ja2VkCg==