151207 2015-11-12 11:14:53 -0800 Rename webkitdirs::willUseIOS{Device, Simulator}SDKWhenBuilding() to willUseIOS{Device, Simulator}SDK() 2015-11-12 11:22:04 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build All All RESOLVED FIXED P2 Normal --- 151076 1 dbates dbates ap ddkilzer lforschler oldest_to_newest 1141552 0 dbates 2015-11-12 11:14:53 -0800 Following up on Alexey Proskuryakov's remark bug #151076, comment 2, the functions webkitdirs::willUseIOS{Device, Simulator}SDKWhenBuilding() are not specific to building iOS software. We should rename them to convey that they can be used whenever a script wants to determine whether we are using the iphoneos or iphonesimulator SDK. 1141554 1 265410 dbates 2015-11-12 11:15:58 -0800 Created attachment 265410 Patch 1141556 2 265410 ap 2015-11-12 11:17:44 -0800 Comment on attachment 265410 Patch rs=me 1141559 3 dbates 2015-11-12 11:22:04 -0800 Committed r192371: <http://trac.webkit.org/changeset/192371> 265410 2015-11-12 11:15:58 -0800 2015-11-12 11:17:44 -0800 Patch bug-151207-20151112111552.patch text/plain 9822 dbates U3VidmVyc2lvbiBSZXZpc2lvbjogMTkyMzY3CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggMDk1MTllNmNkNzY0Yjk2MjRlMzA3YTAxMzQ4ZThhMzNi ZWNmYWYyOS4uNjFhZDI3NTIxODMyODhhNWQzODAyMGU3OGQ4ZmI2MDNkNWVjNTkxOCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDMz IEBACiAyMDE1LTExLTEyICBEYW5pZWwgQmF0ZXMgIDxkYWJhdGVzQGFwcGxlLmNvbT4KIAorICAg ICAgICBSZW5hbWUgd2Via2l0ZGlyczo6d2lsbFVzZUlPU3tEZXZpY2UsIFNpbXVsYXRvcn1TREtX aGVuQnVpbGRpbmcoKSB0byB3aWxsVXNlSU9Te0RldmljZSwgU2ltdWxhdG9yfVNESygpCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNTEyMDcKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgZnVuY3Rpb25z IHdlYmtpdGRpcnM6OndpbGxVc2VJT1N7RGV2aWNlLCBTaW11bGF0b3J9U0RLV2hlbkJ1aWxkaW5n KCkgYXJlIG5vdCBzcGVjaWZpYyB0byBidWlsZGluZworICAgICAgICBpT1Mgc29mdHdhcmUuIFdl IHNob3VsZCByZW5hbWUgdGhlc2UgZnVuY3Rpb25zIHRvIHdlYmtpdGRpcnM6OndpbGxVc2VJT1N7 RGV2aWNlLCBTaW11bGF0b3J9U0RLKCkgdG8KKyAgICAgICAgY29udmV5IHRoZWlyIGdlbmVyYWwt cHVycG9zZSBuYXR1cmUgb2YgZGV0ZXJtaW5pbmcgd2hldGhlciB3ZSBhcmUgdXNpbmcgdGhlIGlw aG9uZW9zIG9yIGlwaG9uZXNpbXVsYXRvciBTREsuCisKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxk LWpzYzoKKyAgICAgICAgKiBTY3JpcHRzL2J1aWxkLWxheW91dHRlc3RyZWxheToKKyAgICAgICAg KiBTY3JpcHRzL2J1aWxkLXdlYmtpdDoKKyAgICAgICAgKiBTY3JpcHRzL2NvcHktd2Via2l0bGli cmFyaWVzLXRvLXByb2R1Y3QtZGlyZWN0b3J5OgorICAgICAgICAqIFNjcmlwdHMvcnVuLWFwaS10 ZXN0czoKKyAgICAgICAgKHJ1blRlc3QpOgorICAgICAgICAocHJlcGFyZUVudmlyb25tZW50Rm9y UnVubmluZ1Rlc3RUb29sKToKKyAgICAgICAgKiBTY3JpcHRzL3J1bi1qYXZhc2NyaXB0Y29yZS10 ZXN0czoKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdGRpcnMucG06CisgICAgICAgIChYY29kZU9w dGlvbnMpOgorICAgICAgICAod2lsbFVzZUlPU0RldmljZVNESyk6IEZvcm1lcmx5IG5hbWVkIHdp bGxVc2VJT1NEZXZpY2VTREtXaGVuQnVpbGRpbmcuCisgICAgICAgICh3aWxsVXNlSU9TU2ltdWxh dG9yU0RLKTogRm9ybWVybHkgbmFtZSB3aWxsVXNlSU9TU2ltdWxhdG9yU0RLV2hlbkJ1aWxkaW5n LgorICAgICAgICAoaXNJT1NXZWJLaXQpOgorICAgICAgICAocnVuSU9TV2ViS2l0QXBwKToKKyAg ICAgICAgKHdpbGxVc2VJT1NEZXZpY2VTREtXaGVuQnVpbGRpbmcpOiBEZWxldGVkLgorICAgICAg ICAod2lsbFVzZUlPU1NpbXVsYXRvclNES1doZW5CdWlsZGluZyk6IERlbGV0ZWQuCisKKzIwMTUt MTEtMTIgIERhbmllbCBCYXRlcyAgPGRhYmF0ZXNAYXBwbGUuY29tPgorCiAgICAgICAgIHJ1bi1h cGktdGVzdHMgZmFpbHMgdG8gcnVuIHdpdGggcHVibGljIGlPUyBTREsKICAgICAgICAgaHR0cHM6 Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE1MTA3NgogCmRpZmYgLS1naXQgYS9U b29scy9TY3JpcHRzL2J1aWxkLWpzYyBiL1Rvb2xzL1NjcmlwdHMvYnVpbGQtanNjCmluZGV4IGY0 NzZiNzBjMzRhODMxYTZkZWNlZGFkYjU3M2VjZjE3MGIzYzkxMjYuLjQ2NjgwOGQwNTY1NDMyMThk NTY4NzQwYzNiMmJkZDkzNjUzYmVlZWEgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvYnVpbGQt anNjCisrKyBiL1Rvb2xzL1NjcmlwdHMvYnVpbGQtanNjCkBAIC00MCw3ICs0MCw3IEBAIHN1YiB3 cml0ZUNvbmdyYXRzKCk7CiBteSAkc2hvdWxkUnVuU3RhdGljQW5hbHl6ZXIgPSAwOwogbXkgJGNv dmVyYWdlU3VwcG9ydCA9IDA7CiBteSAkc2hvd0hlbHAgPSAwOwotbXkgJGZ0bEpJVCA9IGludChp c0FwcGxlTWFjV2ViS2l0KCkgJiYgIXdpbGxVc2VJT1NTaW11bGF0b3JTREtXaGVuQnVpbGRpbmco KSk7CitteSAkZnRsSklUID0gaW50KGlzQXBwbGVNYWNXZWJLaXQoKSAmJiAhd2lsbFVzZUlPU1Np bXVsYXRvclNESygpKTsKIG15ICRmb3JjZUNMb29wID0gMDsKIG15ICRjbGkgPSAwOwogbXkgJG1h a2VBcmdzID0gIiI7CkBAIC0xMjMsNyArMTIzLDcgQEAgaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSkg ewogCiAgICAgaWYgKCRjb3B5TGlicmFyaWVzKSB7CiAgICAgICAgIG15IEBjb3B5TGlicmFyaWVz QXJncyA9ICgicGVybCIsICJUb29scy9TY3JpcHRzL2NvcHktd2Via2l0bGlicmFyaWVzLXRvLXBy b2R1Y3QtZGlyZWN0b3J5Iik7Ci0gICAgICAgIHB1c2ggQGNvcHlMaWJyYXJpZXNBcmdzLCAiLS1k ZXZpY2UiIGlmIHdpbGxVc2VJT1NEZXZpY2VTREtXaGVuQnVpbGRpbmcoKTsKKyAgICAgICAgcHVz aCBAY29weUxpYnJhcmllc0FyZ3MsICItLWRldmljZSIgaWYgd2lsbFVzZUlPU0RldmljZVNESygp OwogICAgICAgICBpZiAoJGZ0bEpJVCkgewogICAgICAgICAgICAgcHVzaCBAY29weUxpYnJhcmll c0FyZ3MsICItLWxsdm0iOwogICAgICAgICB9CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2J1 aWxkLWxheW91dHRlc3RyZWxheSBiL1Rvb2xzL1NjcmlwdHMvYnVpbGQtbGF5b3V0dGVzdHJlbGF5 CmluZGV4IDEyOGE3Zjg0NWE5ZDliODU2NzNlY2E2NmIzYjM2MDQzZjJhNmI2ZGEuLmNlZWU4MDhh NjZkODg3MmJiZmY3NGUyOWRhZmIwMjc4MDNiYzIwNDUgMTAwNzU1Ci0tLSBhL1Rvb2xzL1Njcmlw dHMvYnVpbGQtbGF5b3V0dGVzdHJlbGF5CisrKyBiL1Rvb2xzL1NjcmlwdHMvYnVpbGQtbGF5b3V0 dGVzdHJlbGF5CkBAIC01OSw3ICs1OSw3IEBAIGNoZGlyICJUb29scy9MYXlvdXRUZXN0UmVsYXki IG9yIGRpZTsKICMgRklYTUU6IFRoaXMgdG9vbCBpcyBvbmx5IHVzZWZ1bCB3aGVuIGJ1aWxkaW5n IFdlYktpdCBmb3IgaU9TIFNpbXVsYXRvci4gRm9yIG5vdywKICMgICAgICAgIHRvIGF2b2lkIGJy ZWFraW5nIHNvbWUgQXBwbGUgSW50ZXJuYWwgdG9vbHMgd2Ugc3VwcG9ydCBjYWxsaW5nIHRoaXMg c2NyaXB0CiAjICAgICAgICB3aXRob3V0IC0taW9zLXNpbXVsYXRvciBzbyBsb25nIGFzIHdlIGFy ZSBidWlsZGluZyBvbiBhIE1hYy4KLWlmIChpc0FwcGxlTWFjV2ViS2l0KCkgJiYgIXdpbGxVc2VJ T1NEZXZpY2VTREtXaGVuQnVpbGRpbmcoKSkgeworaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSAmJiAh d2lsbFVzZUlPU0RldmljZVNESygpKSB7CiAgICAgc2V0WGNvZGVTREsodW5kZWYpOyAjIEZvcmNl IHVzZSBvZiBNYWMgU0RLIGlmIC0taW9zLXNpbXVsYXRvciB3YXMgcGFzc2VkCiAgICAgZXhpdCBl eGl0U3RhdHVzKGJ1aWxkWENvZGVQcm9qZWN0KCJMYXlvdXRUZXN0UmVsYXkiLCAkY2xlYW4sIFhj b2RlT3B0aW9ucygpLCBAQVJHVikpOwogfQpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9idWls ZC13ZWJraXQgYi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAppbmRleCBlYjM2Yjc5MTY1MjEx ODMyODgzZGY5M2I0Mjc2ZjM3ZTc2NTFhMGE3Li5kMDZhMTM3OGIxMDk1MjJlYzBjNGVkYzBmMTNi MzBhMjUxNWMwNGZiIDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdAorKysg Yi9Ub29scy9TY3JpcHRzL2J1aWxkLXdlYmtpdApAQCAtMTk0LDcgKzE5NCw3IEBAIGlmIChpc0Fw cGxlTWFjV2ViS2l0KCkpIHsKICAgICAgICAgKHN5c3RlbShAY29weUxpYnJhcmllc0FyZ3MpID09 IDApIG9yIGRpZTsKICAgICB9IGVsc2UgewogICAgICAgICBteSBAY29weUxpYnJhcmllc0FyZ3Mg PSAoInBlcmwiLCAiVG9vbHMvU2NyaXB0cy9jb3B5LXdlYmtpdGxpYnJhcmllcy10by1wcm9kdWN0 LWRpcmVjdG9yeSIsICItLXNkayIsIHhjb2RlU0RLKCksICItLXdrc2kiKTsKLSAgICAgICAgcHVz aCBAY29weUxpYnJhcmllc0FyZ3MsICItLWxsdm0iIGlmIHdpbGxVc2VJT1NEZXZpY2VTREtXaGVu QnVpbGRpbmcoKTsKKyAgICAgICAgcHVzaCBAY29weUxpYnJhcmllc0FyZ3MsICItLWxsdm0iIGlm IHdpbGxVc2VJT1NEZXZpY2VTREsoKTsKICAgICAgICAgaWYgKG15ICRoYXNJbnRlcm5hbFNESyA9 IHhjb2RlU0RLKCkgZXEgImlwaG9uZW9zLmludGVybmFsIikgewogICAgICAgICAgICAgcHVzaCBA Y29weUxpYnJhcmllc0FyZ3MsICgKICAgICAgICAgICAgICAgICAiLS1wcmVmZXItc3lzdGVtLWxs dm0iLApAQCAtMjA2LDcgKzIwNiw3IEBAIGlmIChpc0FwcGxlTWFjV2ViS2l0KCkpIHsKICAgICAg ICAgcHJpbnQoam9pbigiICIsIEBjb3B5TGlicmFyaWVzQXJncykgLiAiXG4iKTsKICAgICAgICAg KHN5c3RlbShAY29weUxpYnJhcmllc0FyZ3MpID09IDApIG9yIGRpZTsKIAotICAgICAgICBpZiAo d2lsbFVzZUlPU1NpbXVsYXRvclNES1doZW5CdWlsZGluZygpKSB7CisgICAgICAgIGlmICh3aWxs VXNlSU9TU2ltdWxhdG9yU0RLKCkpIHsKICAgICAgICAgICAgIChzeXN0ZW0oInBlcmwiLCAiVG9v bHMvU2NyaXB0cy9idWlsZC1sYXlvdXR0ZXN0cmVsYXkiLCBhcmd1bWVudHNGb3JDb25maWd1cmF0 aW9uKCkpID09IDApIG9yIGRpZTsKICAgICAgICAgfQogICAgIH0KZGlmZiAtLWdpdCBhL1Rvb2xz L1NjcmlwdHMvY29weS13ZWJraXRsaWJyYXJpZXMtdG8tcHJvZHVjdC1kaXJlY3RvcnkgYi9Ub29s cy9TY3JpcHRzL2NvcHktd2Via2l0bGlicmFyaWVzLXRvLXByb2R1Y3QtZGlyZWN0b3J5CmluZGV4 IDg5ZDUzNWUxOTlhY2JlMjNmNDdkOTZjMDJlZGZjNzE0MDBlZGNlMGIuLmMzMDZkZjBlNDMzNTUy MDc1ZTQ2YzQ5OWM3YjA5MTMxZWNhNmQ1ZDYgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvY29w eS13ZWJraXRsaWJyYXJpZXMtdG8tcHJvZHVjdC1kaXJlY3RvcnkKKysrIGIvVG9vbHMvU2NyaXB0 cy9jb3B5LXdlYmtpdGxpYnJhcmllcy10by1wcm9kdWN0LWRpcmVjdG9yeQpAQCAtNDIsNyArNDIs NyBAQCBteSAkbGx2bUxpYnJhcnlQYWNrYWdlID0gIiI7CiBteSAkdXNlRnVsbExpYlBhdGhzID0g MDsKIG15ICRwcmVmZXJTeXN0ZW1MTFZNT3ZlckRyb3BzID0gMDsKIG15ICRsbHZtU3ViZGlyZWN0 b3J5TmFtZSA9ICJsbHZtIjsKLW15ICRsbHZtUHJlZml4ID0gd2lsbFVzZUlPU0RldmljZVNES1do ZW5CdWlsZGluZygpID8gIi91c3IvbG9jYWwiIDogIi91c3IvbG9jYWwvTExWTUZvckphdmFTY3Jp cHRDb3JlIjsKK215ICRsbHZtUHJlZml4ID0gd2lsbFVzZUlPU0RldmljZVNESygpID8gIi91c3Iv bG9jYWwiIDogIi91c3IvbG9jYWwvTExWTUZvckphdmFTY3JpcHRDb3JlIjsKIG15ICRvc3hWZXJz aW9uOwogbXkgJGZvcmNlID0gMDsKIApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9ydW4tYXBp LXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9ydW4tYXBpLXRlc3RzCmluZGV4IGM3ZDI0NTViYTU4Yjlj MjQyMzlhMDM4NTc0NWEwMWExZWRmZDU0NjguLjEyNGIyYWQwZTc4ZTQyZWEyYmIwMzQyZGE1YzJm MDIxNWNkYTZmYjAgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvcnVuLWFwaS10ZXN0cworKysg Yi9Ub29scy9TY3JpcHRzL3J1bi1hcGktdGVzdHMKQEAgLTExMCw3ICsxMTAsNyBAQCBidWlsZFRl c3RUb29sKCkgaWYgJGJ1aWxkICYmICFkZWZpbmVkKCRyb290KTsKIHNldFBhdGhGb3JSdW5uaW5n V2ViS2l0QXBwKFwlRU5WKTsKIAogbXkgJHNpbXVsYXRvckRldmljZTsKLWlmICh3aWxsVXNlSU9T U2ltdWxhdG9yU0RLV2hlbkJ1aWxkaW5nKCkpIHsKK2lmICh3aWxsVXNlSU9TU2ltdWxhdG9yU0RL KCkpIHsKICAgICAkc2ltdWxhdG9yRGV2aWNlID0gZmluZE9yQ3JlYXRlU2ltdWxhdG9yRm9ySU9T RGV2aWNlKFNJTVVMQVRPUl9ERVZJQ0VfU1VGRklYX0ZPUl9XRUJLSVRfREVWRUxPUE1FTlQpOwog ICAgIHJlc3RhcnRJT1NTaW11bGF0b3JEZXZpY2UoJHNpbXVsYXRvckRldmljZSk7CiB9CkBAIC0y MDAsNyArMjAwLDcgQEAgc3ViIHJ1blRlc3QoJCQpCiAgICAgZm9yZWFjaCh0ZXN0VG9vbFBhdGhz KCkpIHsKICAgICAgICAgbXkgJHBpZDsKICAgICAgICAgbXkgQGNvbW1vbkFyZ3VtZW50cyA9ICgk XywgJGd0ZXN0QXJnLCBAQVJHVik7Ci0gICAgICAgIGlmICh3aWxsVXNlSU9TU2ltdWxhdG9yU0RL V2hlbkJ1aWxkaW5nKCkpIHsKKyAgICAgICAgaWYgKHdpbGxVc2VJT1NTaW11bGF0b3JTREsoKSkg ewogICAgICAgICAgICAgJHBpZCA9IG9wZW4zKCRjaGlsZEluLCAkY2hpbGRPdXQsICRjaGlsZEVy ciwgcXcoeGNydW4gLS1zZGsgaXBob25lc2ltdWxhdG9yIHNpbWN0bCBzcGF3biksICRzaW11bGF0 b3JEZXZpY2UtPntVRElEfSwgQGNvbW1vbkFyZ3VtZW50cykgb3IgZGllICJGYWlsZWQgdG8gcnVu IHRlc3Q6ICR0ZXN0LiI7CiAgICAgICAgIH0gZWxzaWYgKGlzQXBwbGVNYWNXZWJLaXQoKSAmJiBh cmNoaXRlY3R1cmUoKSkgewogICAgICAgICAgICAgJHBpZCA9IG9wZW4zKCRjaGlsZEluLCAkY2hp bGRPdXQsICRjaGlsZEVyciwgImFyY2giLCAiLSIgLiBhcmNoaXRlY3R1cmUoKSwgYXJjaENvbW1h bmRMaW5lQXJndW1lbnRzRm9yUmVzdHJpY3RlZEVudmlyb25tZW50VmFyaWFibGVzKCksIEBjb21t b25Bcmd1bWVudHMpIG9yIGRpZSAiRmFpbGVkIHRvIHJ1biB0ZXN0OiAkdGVzdC4iOwpAQCAtMzU1 LDcgKzM1NSw3IEBAIHN1YiBwcmVwYXJlRW52aXJvbm1lbnRGb3JSdW5uaW5nVGVzdFRvb2woKQog ewogICAgIHJldHVybiB1bmxlc3MgaXNBcHBsZU1hY1dlYktpdCgpOwogCi0gICAgaWYgKHdpbGxV c2VJT1NTaW11bGF0b3JTREtXaGVuQnVpbGRpbmcoKSkgeworICAgIGlmICh3aWxsVXNlSU9TU2lt dWxhdG9yU0RLKCkpIHsKICAgICAgICAgbXkgJXNpbXVsYXRvckVOVjsKICAgICAgICAgewogICAg ICAgICAgICAgbG9jYWwgJUVOVjsKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvcnVuLWphdmFz Y3JpcHRjb3JlLXRlc3RzIGIvVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMK aW5kZXggNGJhM2FkMWFiZDQ5MzRjOTJhNmFlMjU5MzRiM2UxYWFmNDFjYjQ0ZC4uYWNiOGU0MWQ2 MjE3N2M2NDY1NzJkNTgyNTQ5ZmQ1ZjNhZWIwZjU0ZCAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0 cy9ydW4tamF2YXNjcmlwdGNvcmUtdGVzdHMKKysrIGIvVG9vbHMvU2NyaXB0cy9ydW4tamF2YXNj cmlwdGNvcmUtdGVzdHMKQEAgLTE3OSw3ICsxNzksNyBAQCBpZiAoJHJ1blRlc3RBUEkpIHsKICAg ICBjaGRpcldlYktpdCgpOwogICAgIGNoZGlyKCRwcm9kdWN0RGlyKSBvciBkaWUgIkZhaWxlZCB0 byBzd2l0Y2ggZGlyZWN0b3J5IHRvICckcHJvZHVjdERpcidcbiI7CiAgICAgbXkgQGNvbW1hbmQg PSAodGVzdGFwaVBhdGgoJHByb2R1Y3REaXIpKTsKLSAgICB1bnNoaWZ0IEBjb21tYW5kLCAoInhj cnVuIiwgIi1zZGsiLCB4Y29kZVNESygpLCAic2ltIikgaWYgd2lsbFVzZUlPU1NpbXVsYXRvclNE S1doZW5CdWlsZGluZygpOworICAgIHVuc2hpZnQgQGNvbW1hbmQsICgieGNydW4iLCAiLXNkayIs IHhjb2RlU0RLKCksICJzaW0iKSBpZiB3aWxsVXNlSU9TU2ltdWxhdG9yU0RLKCk7CiAKICAgICBp ZiAoJGVudlZhcnMgbmUgIiIpIHsKICAgICAgICAgZm9yZWFjaCBteSAkdmFyIChzcGxpdCgvXHMr LywgJGVudlZhcnMpKSB7CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0g Yi9Ub29scy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KaW5kZXggN2I5YTFhNjY5ZWI0MmRlMjBhNDli NmI0MzY3NGVjYjJkY2UyYzRhZS4uNTMyOWQxNjNlMjI4ZGJlNzRjMjgxYWVhODIxOWY0ZDJlMDQ3 MDIyZiAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCisrKyBiL1Rvb2xz L1NjcmlwdHMvd2Via2l0ZGlycy5wbQpAQCAtODQsNiArODQsOCBAQCBCRUdJTiB7CiAgICAgICAg JnNoYXJlZENvbW1hbmRMaW5lT3B0aW9ucwogICAgICAgICZzaGFyZWRDb21tYW5kTGluZU9wdGlv bnNVc2FnZQogICAgICAgICZzaHV0RG93bklPU1NpbXVsYXRvckRldmljZQorICAgICAgICZ3aWxs VXNlSU9TRGV2aWNlU0RLCisgICAgICAgJndpbGxVc2VJT1NTaW11bGF0b3JTREsKICAgICAgICBT SU1VTEFUT1JfREVWSUNFX1NVRkZJWF9GT1JfV0VCS0lUX0RFVkVMT1BNRU5UCiAgICAgICAgVVNF X09QRU5fQ09NTUFORAogICAgKTsKQEAgLTcwNCw3ICs3MDYsNyBAQCBzdWIgWGNvZGVPcHRpb25z CiAgICAgcHVzaCBAb3B0aW9ucywgQGJhc2VQcm9kdWN0RGlyT3B0aW9uOwogICAgIHB1c2ggQG9w dGlvbnMsICJBUkNIUz0kYXJjaGl0ZWN0dXJlIiBpZiAkYXJjaGl0ZWN0dXJlOwogICAgIHB1c2gg QG9wdGlvbnMsICJTREtST09UPSR4Y29kZVNESyIgaWYgJHhjb2RlU0RLOwotICAgIGlmICh3aWxs VXNlSU9TRGV2aWNlU0RLV2hlbkJ1aWxkaW5nKCkpIHsKKyAgICBpZiAod2lsbFVzZUlPU0Rldmlj ZVNESygpKSB7CiAgICAgICAgIHB1c2ggQG9wdGlvbnMsICJFTkFCTEVfQklUQ09ERT1OTyI7CiAg ICAgICAgIGlmIChoYXNJT1NEZXZlbG9wbWVudENlcnRpZmljYXRlKCkpIHsKICAgICAgICAgICAg ICMgRklYTUU6IE1heSBtYXRjaCBtb3JlIHRoYW4gb25lIGluc3RhbGxlZCBkZXZlbG9wbWVudCBj ZXJ0aWZpY2F0ZS4KQEAgLTEyMzIsMTIgKzEyMzQsMTIgQEAgc3ViIGNyZWF0ZWlPU1NpbXVsYXRv ckRldmljZQogICAgIGRpZSAiRGV2aWNlICRuYW1lICRkZXZpY2VUeXBlSWQgJHJ1bnRpbWVJZCB3 YXNuJ3QgZm91bmQgaW4gIiAuIGlPU1NpbXVsYXRvckRldmljZXNQYXRoKCk7CiB9CiAKLXN1YiB3 aWxsVXNlSU9TRGV2aWNlU0RLV2hlbkJ1aWxkaW5nKCkKK3N1YiB3aWxsVXNlSU9TRGV2aWNlU0RL KCkKIHsKICAgICByZXR1cm4geGNvZGVTREtQbGF0Zm9ybU5hbWUoKSBlcSAiaXBob25lb3MiOwog fQogCi1zdWIgd2lsbFVzZUlPU1NpbXVsYXRvclNES1doZW5CdWlsZGluZygpCitzdWIgd2lsbFVz ZUlPU1NpbXVsYXRvclNESygpCiB7CiAgICAgcmV0dXJuIHhjb2RlU0RLUGxhdGZvcm1OYW1lKCkg ZXEgImlwaG9uZXNpbXVsYXRvciI7CiB9CkBAIC0xMjQ1LDcgKzEyNDcsNyBAQCBzdWIgd2lsbFVz ZUlPU1NpbXVsYXRvclNES1doZW5CdWlsZGluZygpCiBzdWIgaXNJT1NXZWJLaXQoKQogewogICAg IGRldGVybWluZVhjb2RlU0RLKCk7Ci0gICAgcmV0dXJuIGlzQXBwbGVNYWNXZWJLaXQoKSAmJiAo d2lsbFVzZUlPU0RldmljZVNES1doZW5CdWlsZGluZygpIHx8IHdpbGxVc2VJT1NTaW11bGF0b3JT REtXaGVuQnVpbGRpbmcoKSk7CisgICAgcmV0dXJuIGlzQXBwbGVNYWNXZWJLaXQoKSAmJiAod2ls bFVzZUlPU0RldmljZVNESygpIHx8IHdpbGxVc2VJT1NTaW11bGF0b3JTREsoKSk7CiB9CiAKIHN1 YiBkZXRlcm1pbmVObVBhdGgoKQpAQCAtMjQxNiwxMCArMjQxOCwxMCBAQCBzdWIgcnVuSU9TV2Vi S2l0QXBwSW5TaW11bGF0b3IoJDskKQogc3ViIHJ1bklPU1dlYktpdEFwcCgkKQogewogICAgIG15 ICgkYXBwQnVuZGxlKSA9IEBfOwotICAgIGlmICh3aWxsVXNlSU9TRGV2aWNlU0RLV2hlbkJ1aWxk aW5nKCkpIHsKKyAgICBpZiAod2lsbFVzZUlPU0RldmljZVNESygpKSB7CiAgICAgICAgIGRpZSAi T25seSBydW5uaW5nIFNhZmFyaSBpbiBpT1MgU2ltdWxhdG9yIGlzIHN1cHBvcnRlZCBub3cuIjsK ICAgICB9Ci0gICAgaWYgKHdpbGxVc2VJT1NTaW11bGF0b3JTREtXaGVuQnVpbGRpbmcoKSkgewor ICAgIGlmICh3aWxsVXNlSU9TU2ltdWxhdG9yU0RLKCkpIHsKICAgICAgICAgcmV0dXJuIHJ1bklP U1dlYktpdEFwcEluU2ltdWxhdG9yKCRhcHBCdW5kbGUpOwogICAgIH0KICAgICBkaWUgIk5vdCB1 c2luZyBhbiBpT1MgU0RLLiIK