170267 2017-03-29 19:25:24 -0700 Support tvOS and watchOS in webkitdirs.pm 2017-04-05 12:04:35 -0700 1 1 1 Unclassified WebKit Tools / Tests Other Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 aakash_jain aakash_jain aakash_jain ap buildbot commit-queue dbates lforschler oldest_to_newest 1292677 0 aakash_jain 2017-03-29 19:25:24 -0700 webkitdirs.pm should support watchOS and tvOS. 1292681 1 305823 aakash_jain 2017-03-29 19:31:36 -0700 Created attachment 305823 Proposed patch 1292687 2 305823 ap 2017-03-29 20:35:13 -0700 Comment on attachment 305823 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=305823&action=review > Tools/Scripts/webkitdirs.pm:469 > + if (checkForArgumentAndRemoveFromARGV("--tv-device")) { I wonder if it would be better to have "os" in the option name, for consistency with ios. > Tools/Scripts/webkitdirs.pm:1353 > + return isIOSWebKit() || isTVOSWebKit() || isWATCHOSWebKit(); Double space here. 1292688 3 305823 dbates 2017-03-29 20:44:54 -0700 Comment on attachment 305823 Proposed patch View in context: https://bugs.webkit.org/attachment.cgi?id=305823&action=review > Tools/Scripts/webkitdirs.pm:105 > + TVOS => "tvOS", TVOS => tvOS > Tools/Scripts/webkitdirs.pm:106 > + WATCHOS => "watchOS", WATCHOS => watchOS > Tools/Scripts/webkitdirs.pm:471 > + $xcodeSDK ||= $hasInternalSDK ? 'appletvos.internal' : 'appletvos'; ' => " > Tools/Scripts/webkitdirs.pm:478 > + $xcodeSDK ||= $hasInternalSDK ? 'watchos.internal' : 'watchos'; Ditto. > Tools/Scripts/webkitdirs.pm:504 > + return "appletvos" if $xcodeSDK =~ /appletvos/i; Please sort the added lines. > Tools/Scripts/webkitdirs.pm:1343 > + return portName() eq TVOS; TVOS => tvOS > Tools/Scripts/webkitdirs.pm:1346 > +sub isWATCHOSWebKit() isWatchOSWebKit() > Tools/Scripts/webkitdirs.pm:1348 > + return portName() eq WATCHOS; WATCHOS => watchOS 1292949 4 305905 aakash_jain 2017-03-30 14:36:54 -0700 Created attachment 305905 Updated patch Incorporated review comments. 1292970 5 305905 commit-queue 2017-03-30 15:18:25 -0700 Comment on attachment 305905 Updated patch Clearing flags on attachment: 305905 Committed r214631: <http://trac.webkit.org/changeset/214631> 1292971 6 commit-queue 2017-03-30 15:18:26 -0700 All reviewed patches have been landed. Closing bug. 1294583 7 aakash_jain 2017-04-05 12:04:35 -0700 Followup commit to rename isIOSLikeWebKit to isEmbeddedWebKit. https://trac.webkit.org/changeset/214957/webkit 305823 2017-03-29 19:31:36 -0700 2017-03-30 14:36:54 -0700 Proposed patch patch_watchos_webkitdirs text/plain 4474 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNDU5MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIzIEBACisyMDE3LTAzLTI5ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBTdXBwb3J0IHR2T1MgYW5kIHdhdGNoT1MgaW4gd2Via2l0ZGlycy5wbQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwMjY3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdGRpcnMucG06CisgICAgICAgIChkZXRlcm1pbmVYY29kZVNESyk6IEV2YWx1YXRlIHNk ayBmb3IgdHZvcyBhbmQgd2F0Y2hvcy4KKyAgICAgICAgKHhjb2RlU0RLUGxhdGZvcm1OYW1lKTog QWRkZWQgc3VwcG9ydCBmb3IgdHZvcyBhbmQgd2F0Y2hvcy4KKyAgICAgICAgKGRldGVybWluZVBv cnROYW1lKTogU2FtZS4KKyAgICAgICAgKGlzQXBwbGVDb2NvYVdlYktpdCk6IFNhbWUuCisgICAg ICAgICh3aWxsVXNlQXBwbGVUVkRldmljZVNESyk6IEFkZGVkLgorICAgICAgICAod2lsbFVzZUFw cGxlVFZTaW11bGF0b3JTREspOiBBZGRlZC4KKyAgICAgICAgKHdpbGxVc2VXYXRjaERldmljZVNE Syk6IEFkZGVkLgorICAgICAgICAod2lsbFVzZVdhdGNoU2ltdWxhdG9yU0RLKTogQWRkZWQuCisg ICAgICAgIChpc1RWT1NXZWJLaXQpOiBBZGRlZC4KKyAgICAgICAgKGlzV0FUQ0hPU1dlYktpdCk6 IEFkZGVkLgorICAgICAgICAoaXNJT1NMaWtlV2ViS2l0KTogQWRkZWQuCisKIDIwMTctMDMtMjkg IFRpbSBIb3J0b24gIDx0aW1vdGh5X2hvcnRvbkBhcHBsZS5jb20+CiAKICAgICAgICAgU3dpcGUg Z2VzdHVyZSB0ZXN0cyBkb24ndCB3b3JrIG9uIG1hY09TIFNpZXJyYQpJbmRleDogVG9vbHMvU2Ny aXB0cy93ZWJraXRkaXJzLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0ZGly cy5wbQkocmV2aXNpb24gMjE0NTgzKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRkaXJzLnBtCSh3 b3JraW5nIGNvcHkpCkBAIC0xMDIsNiArMTAyLDggQEAgdXNlIGNvbnN0YW50IHsKICAgICBHVEsg ICAgICA9PiAiR1RLIiwKICAgICBFZmwgICAgICA9PiAiRWZsIiwKICAgICBpT1MgICAgICA9PiAi aU9TIiwKKyAgICBUVk9TICAgICA9PiAidHZPUyIsCisgICAgV0FUQ0hPUyAgPT4gIndhdGNoT1Mi LAogICAgIE1hYyAgICAgID0+ICJNYWMiLAogICAgIEpTQ09ubHkgID0+ICJKU0NPbmx5IiwKICAg ICBXaW5DYWlybyA9PiAiV2luQ2Fpcm8iLApAQCAtNDY0LDYgKzQ2NiwyMCBAQCBzdWIgZGV0ZXJt aW5lWGNvZGVTREsKICAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCIt LXNpbXVsYXRvciIpIHx8IGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS1pb3Mt c2ltdWxhdG9yIikpIHsKICAgICAgICAgJHhjb2RlU0RLIHx8PSAnaXBob25lc2ltdWxhdG9yJzsK ICAgICB9CisgICAgaWYgKGNoZWNrRm9yQXJndW1lbnRBbmRSZW1vdmVGcm9tQVJHVigiLS10di1k ZXZpY2UiKSkgeworICAgICAgICBteSAkaGFzSW50ZXJuYWxTREsgPSBleGl0U3RhdHVzKHN5c3Rl bSgieGNydW4gLS1zZGsgYXBwbGV0dm9zLmludGVybmFsIC0tc2hvdy1zZGstdmVyc2lvbiA+IC9k ZXYvbnVsbCAyPiYxIikpID09IDA7CisgICAgICAgICR4Y29kZVNESyB8fD0gICRoYXNJbnRlcm5h bFNESyA/ICdhcHBsZXR2b3MuaW50ZXJuYWwnIDogJ2FwcGxldHZvcyc7CisgICAgfQorICAgIGlm IChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0tdHYtc2ltdWxhdG9yIikpIHsK KyAgICAgICAgJHhjb2RlU0RLIHx8PSAnYXBwbGV0dnNpbXVsYXRvcic7CisgICAgfQorICAgIGlm IChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0td2F0Y2gtZGV2aWNlIikpIHsK KyAgICAgICAgbXkgJGhhc0ludGVybmFsU0RLID0gZXhpdFN0YXR1cyhzeXN0ZW0oInhjcnVuIC0t c2RrIHdhdGNob3MuaW50ZXJuYWwgLS1zaG93LXNkay12ZXJzaW9uID4gL2Rldi9udWxsIDI+JjEi KSkgPT0gMDsKKyAgICAgICAgJHhjb2RlU0RLIHx8PSAgJGhhc0ludGVybmFsU0RLID8gJ3dhdGNo b3MuaW50ZXJuYWwnIDogJ3dhdGNob3MnOworICAgIH0KKyAgICBpZiAoY2hlY2tGb3JBcmd1bWVu dEFuZFJlbW92ZUZyb21BUkdWKCItLXdhdGNoLXNpbXVsYXRvciIpKSB7CisgICAgICAgICR4Y29k ZVNESyB8fD0gJ3dhdGNoc2ltdWxhdG9yJzsKKyAgICB9CiB9CiAKIHN1YiB4Y29kZVNESwpAQCAt NDg1LDYgKzUwMSwxMCBAQCBzdWIgeGNvZGVTREtQbGF0Zm9ybU5hbWUoKQogICAgIHJldHVybiAi aXBob25lb3MiIGlmICR4Y29kZVNESyA9fiAvaXBob25lb3MvaTsKICAgICByZXR1cm4gImlwaG9u ZXNpbXVsYXRvciIgaWYgJHhjb2RlU0RLID1+IC9pcGhvbmVzaW11bGF0b3IvaTsKICAgICByZXR1 cm4gIm1hY29zeCIgaWYgJHhjb2RlU0RLID1+IC9tYWNvc3gvaTsKKyAgICByZXR1cm4gImFwcGxl dHZvcyIgaWYgJHhjb2RlU0RLID1+IC9hcHBsZXR2b3MvaTsKKyAgICByZXR1cm4gImFwcGxldHZz aW11bGF0b3IiIGlmICR4Y29kZVNESyA9fiAvYXBwbGV0dnNpbXVsYXRvci9pOworICAgIHJldHVy biAid2F0Y2hvcyIgaWYgJHhjb2RlU0RLID1+IC93YXRjaG9zL2k7CisgICAgcmV0dXJuICJ3YXRj aHNpbXVsYXRvciIgaWYgJHhjb2RlU0RLID1+IC93YXRjaHNpbXVsYXRvci9pOwogICAgIGRpZSAi Q291bGRuJ3QgZGV0ZXJtaW5lIHBsYXRmb3JtIG5hbWUgZnJvbSBYY29kZSBTREsiOwogfQogCkBA IC0xMDM5LDYgKzEwNTksMTAgQEAgc3ViIGRldGVybWluZVBvcnROYW1lKCkKICAgICAgICAgZGV0 ZXJtaW5lWGNvZGVTREsoKTsKICAgICAgICAgaWYgKHdpbGxVc2VJT1NEZXZpY2VTREsoKSB8fCB3 aWxsVXNlSU9TU2ltdWxhdG9yU0RLKCkpIHsKICAgICAgICAgICAgICRwb3J0TmFtZSA9IGlPUzsK KyAgICAgICAgfSBlbHNpZiAod2lsbFVzZUFwcGxlVFZEZXZpY2VTREsoKSB8fCB3aWxsVXNlQXBw bGVUVlNpbXVsYXRvclNESygpKSB7CisgICAgICAgICAgICAkcG9ydE5hbWUgPSBUVk9TOworICAg ICAgICB9IGVsc2lmICh3aWxsVXNlV2F0Y2hEZXZpY2VTREsoKSB8fCB3aWxsVXNlV2F0Y2hTaW11 bGF0b3JTREsoKSkgeworICAgICAgICAgICAgJHBvcnROYW1lID0gV0FUQ0hPUzsKICAgICAgICAg fSBlbHNlIHsKICAgICAgICAgICAgICRwb3J0TmFtZSA9IE1hYzsKICAgICAgICAgfQpAQCAtMTIy Myw3ICsxMjQ3LDcgQEAgc3ViIGlzQXBwbGVXZWJLaXQoKQogCiBzdWIgaXNBcHBsZUNvY29hV2Vi S2l0KCkKIHsKLSAgICByZXR1cm4gKHBvcnROYW1lKCkgZXEgTWFjKSB8fCBpc0lPU1dlYktpdCgp OworICAgIHJldHVybiAocG9ydE5hbWUoKSBlcSBNYWMpIHx8IGlzSU9TV2ViS2l0KCkgfHwgaXNU Vk9TV2ViS2l0KCkgfHwgaXNXQVRDSE9TV2ViS2l0KCk7CiB9CiAKIHN1YiBpc0FwcGxlV2luV2Vi S2l0KCkKQEAgLTEyODksMTEgKzEzMTMsNDYgQEAgc3ViIHdpbGxVc2VJT1NTaW11bGF0b3JTREso KQogICAgIHJldHVybiB4Y29kZVNES1BsYXRmb3JtTmFtZSgpIGVxICJpcGhvbmVzaW11bGF0b3Ii OwogfQogCitzdWIgd2lsbFVzZUFwcGxlVFZEZXZpY2VTREsoKQoreworICAgIHJldHVybiB4Y29k ZVNES1BsYXRmb3JtTmFtZSgpIGVxICJhcHBsZXR2b3MiOworfQorCitzdWIgd2lsbFVzZUFwcGxl VFZTaW11bGF0b3JTREsoKQoreworICAgIHJldHVybiB4Y29kZVNES1BsYXRmb3JtTmFtZSgpIGVx ICJhcHBsZXR2c2ltdWxhdG9yIjsKK30KKworc3ViIHdpbGxVc2VXYXRjaERldmljZVNESygpCit7 CisgICAgcmV0dXJuIHhjb2RlU0RLUGxhdGZvcm1OYW1lKCkgZXEgIndhdGNob3MiOworfQorCitz dWIgd2lsbFVzZVdhdGNoU2ltdWxhdG9yU0RLKCkKK3sKKyAgICByZXR1cm4geGNvZGVTREtQbGF0 Zm9ybU5hbWUoKSBlcSAid2F0Y2hzaW11bGF0b3IiOworfQorCiBzdWIgaXNJT1NXZWJLaXQoKQog ewogICAgIHJldHVybiBwb3J0TmFtZSgpIGVxIGlPUzsKIH0KIAorc3ViIGlzVFZPU1dlYktpdCgp Cit7CisgICAgcmV0dXJuIHBvcnROYW1lKCkgZXEgVFZPUzsKK30KKworc3ViIGlzV0FUQ0hPU1dl YktpdCgpCit7CisgICAgcmV0dXJuIHBvcnROYW1lKCkgZXEgV0FUQ0hPUzsKK30KKworc3ViIGlz SU9TTGlrZVdlYktpdCgpCit7CisgICAgcmV0dXJuICBpc0lPU1dlYktpdCgpIHx8IGlzVFZPU1dl YktpdCgpIHx8ICBpc1dBVENIT1NXZWJLaXQoKTsKK30KKwogc3ViIGRldGVybWluZU5tUGF0aCgp CiB7CiAgICAgcmV0dXJuIGlmICRubVBhdGg7Cg== 305905 2017-03-30 14:36:54 -0700 2017-03-30 15:18:25 -0700 Updated patch patch_watchos_webkitdirs_v2 text/plain 4553 aakash_jain SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxNDU5MSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIzIEBACisyMDE3LTAzLTI5ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNv bT4KKworICAgICAgICBTdXBwb3J0IHR2T1MgYW5kIHdhdGNoT1MgaW4gd2Via2l0ZGlycy5wbQor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTcwMjY3CisK KyAgICAgICAgUmV2aWV3ZWQgYnkgQWxleGV5IFByb3NrdXJ5YWtvdi4KKworICAgICAgICAqIFNj cmlwdHMvd2Via2l0ZGlycy5wbToKKyAgICAgICAgKGRldGVybWluZVhjb2RlU0RLKTogRXZhbHVh dGUgc2RrIGZvciB0dm9zIGFuZCB3YXRjaG9zLgorICAgICAgICAoeGNvZGVTREtQbGF0Zm9ybU5h bWUpOiBBZGRlZCBzdXBwb3J0IGZvciB0dm9zIGFuZCB3YXRjaG9zLgorICAgICAgICAoZGV0ZXJt aW5lUG9ydE5hbWUpOiBTYW1lLgorICAgICAgICAoaXNBcHBsZUNvY29hV2ViS2l0KTogU2FtZS4K KyAgICAgICAgKHdpbGxVc2VBcHBsZVRWRGV2aWNlU0RLKTogQWRkZWQuCisgICAgICAgICh3aWxs VXNlQXBwbGVUVlNpbXVsYXRvclNESyk6IEFkZGVkLgorICAgICAgICAod2lsbFVzZVdhdGNoRGV2 aWNlU0RLKTogQWRkZWQuCisgICAgICAgICh3aWxsVXNlV2F0Y2hTaW11bGF0b3JTREspOiBBZGRl ZC4KKyAgICAgICAgKGlzVFZPU1dlYktpdCk6IEFkZGVkLgorICAgICAgICAoaXNXQVRDSE9TV2Vi S2l0KTogQWRkZWQuCisgICAgICAgIChpc0lPU0xpa2VXZWJLaXQpOiBBZGRlZC4KKwogMjAxNy0w My0yOSAgVGltIEhvcnRvbiAgPHRpbW90aHlfaG9ydG9uQGFwcGxlLmNvbT4KIAogICAgICAgICBT d2lwZSBnZXN0dXJlIHRlc3RzIGRvbid0IHdvcmsgb24gbWFjT1MgU2llcnJhCkluZGV4OiBUb29s cy9TY3JpcHRzL3dlYmtpdGRpcnMucG0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJr aXRkaXJzLnBtCShyZXZpc2lvbiAyMTQ1ODMpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdGRpcnMu cG0JKHdvcmtpbmcgY29weSkKQEAgLTEwMiw2ICsxMDIsOCBAQCB1c2UgY29uc3RhbnQgewogICAg IEdUSyAgICAgID0+ICJHVEsiLAogICAgIEVmbCAgICAgID0+ICJFZmwiLAogICAgIGlPUyAgICAg ID0+ICJpT1MiLAorICAgIHR2T1MgICAgID0+ICJ0dk9TIiwKKyAgICB3YXRjaE9TICA9PiAid2F0 Y2hPUyIsCiAgICAgTWFjICAgICAgPT4gIk1hYyIsCiAgICAgSlNDT25seSAgPT4gIkpTQ09ubHki LAogICAgIFdpbkNhaXJvID0+ICJXaW5DYWlybyIsCkBAIC00NjQsNiArNDY2LDIwIEBAIHN1YiBk ZXRlcm1pbmVYY29kZVNESwogICAgIGlmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFS R1YoIi0tc2ltdWxhdG9yIikgfHwgY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCIt LWlvcy1zaW11bGF0b3IiKSkgewogICAgICAgICAkeGNvZGVTREsgfHw9ICdpcGhvbmVzaW11bGF0 b3InOwogICAgIH0KKyAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCIt LXR2b3MtZGV2aWNlIikpIHsKKyAgICAgICAgbXkgJGhhc0ludGVybmFsU0RLID0gZXhpdFN0YXR1 cyhzeXN0ZW0oInhjcnVuIC0tc2RrIGFwcGxldHZvcy5pbnRlcm5hbCAtLXNob3ctc2RrLXZlcnNp b24gPiAvZGV2L251bGwgMj4mMSIpKSA9PSAwOworICAgICAgICAkeGNvZGVTREsgfHw9ICAkaGFz SW50ZXJuYWxTREsgPyAiYXBwbGV0dm9zLmludGVybmFsIiA6ICJhcHBsZXR2b3MiOworICAgIH0K KyAgICBpZiAoY2hlY2tGb3JBcmd1bWVudEFuZFJlbW92ZUZyb21BUkdWKCItLXR2b3Mtc2ltdWxh dG9yIikpIHsKKyAgICAgICAgJHhjb2RlU0RLIHx8PSAiYXBwbGV0dnNpbXVsYXRvciI7CisgICAg fQorICAgIGlmIChjaGVja0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0td2F0Y2hvcy1k ZXZpY2UiKSkgeworICAgICAgICBteSAkaGFzSW50ZXJuYWxTREsgPSBleGl0U3RhdHVzKHN5c3Rl bSgieGNydW4gLS1zZGsgd2F0Y2hvcy5pbnRlcm5hbCAtLXNob3ctc2RrLXZlcnNpb24gPiAvZGV2 L251bGwgMj4mMSIpKSA9PSAwOworICAgICAgICAkeGNvZGVTREsgfHw9ICAkaGFzSW50ZXJuYWxT REsgPyAid2F0Y2hvcy5pbnRlcm5hbCIgOiAid2F0Y2hvcyI7CisgICAgfQorICAgIGlmIChjaGVj a0ZvckFyZ3VtZW50QW5kUmVtb3ZlRnJvbUFSR1YoIi0td2F0Y2hvcy1zaW11bGF0b3IiKSkgewor ICAgICAgICAkeGNvZGVTREsgfHw9ICJ3YXRjaHNpbXVsYXRvciI7CisgICAgfQogfQogCiBzdWIg eGNvZGVTREsKQEAgLTQ4Miw5ICs0OTgsMTMgQEAgc3ViIHhjb2RlU0RLUGxhdGZvcm1OYW1lKCkK IHsKICAgICBkZXRlcm1pbmVYY29kZVNESygpOwogICAgIHJldHVybiAiIiBpZiAhZGVmaW5lZCAk eGNvZGVTREs7CisgICAgcmV0dXJuICJhcHBsZXR2b3MiIGlmICR4Y29kZVNESyA9fiAvYXBwbGV0 dm9zL2k7CisgICAgcmV0dXJuICJhcHBsZXR2c2ltdWxhdG9yIiBpZiAkeGNvZGVTREsgPX4gL2Fw cGxldHZzaW11bGF0b3IvaTsKICAgICByZXR1cm4gImlwaG9uZW9zIiBpZiAkeGNvZGVTREsgPX4g L2lwaG9uZW9zL2k7CiAgICAgcmV0dXJuICJpcGhvbmVzaW11bGF0b3IiIGlmICR4Y29kZVNESyA9 fiAvaXBob25lc2ltdWxhdG9yL2k7CiAgICAgcmV0dXJuICJtYWNvc3giIGlmICR4Y29kZVNESyA9 fiAvbWFjb3N4L2k7CisgICAgcmV0dXJuICJ3YXRjaG9zIiBpZiAkeGNvZGVTREsgPX4gL3dhdGNo b3MvaTsKKyAgICByZXR1cm4gIndhdGNoc2ltdWxhdG9yIiBpZiAkeGNvZGVTREsgPX4gL3dhdGNo c2ltdWxhdG9yL2k7CiAgICAgZGllICJDb3VsZG4ndCBkZXRlcm1pbmUgcGxhdGZvcm0gbmFtZSBm cm9tIFhjb2RlIFNESyI7CiB9CiAKQEAgLTEwMzksNiArMTA1OSwxMCBAQCBzdWIgZGV0ZXJtaW5l UG9ydE5hbWUoKQogICAgICAgICBkZXRlcm1pbmVYY29kZVNESygpOwogICAgICAgICBpZiAod2ls bFVzZUlPU0RldmljZVNESygpIHx8IHdpbGxVc2VJT1NTaW11bGF0b3JTREsoKSkgewogICAgICAg ICAgICAgJHBvcnROYW1lID0gaU9TOworICAgICAgICB9IGVsc2lmICh3aWxsVXNlQXBwbGVUVkRl dmljZVNESygpIHx8IHdpbGxVc2VBcHBsZVRWU2ltdWxhdG9yU0RLKCkpIHsKKyAgICAgICAgICAg ICRwb3J0TmFtZSA9IHR2T1M7CisgICAgICAgIH0gZWxzaWYgKHdpbGxVc2VXYXRjaERldmljZVNE SygpIHx8IHdpbGxVc2VXYXRjaFNpbXVsYXRvclNESygpKSB7CisgICAgICAgICAgICAkcG9ydE5h bWUgPSB3YXRjaE9TOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgJHBvcnROYW1lID0g TWFjOwogICAgICAgICB9CkBAIC0xMjIzLDcgKzEyNDcsNyBAQCBzdWIgaXNBcHBsZVdlYktpdCgp CiAKIHN1YiBpc0FwcGxlQ29jb2FXZWJLaXQoKQogewotICAgIHJldHVybiAocG9ydE5hbWUoKSBl cSBNYWMpIHx8IGlzSU9TV2ViS2l0KCk7CisgICAgcmV0dXJuIChwb3J0TmFtZSgpIGVxIE1hYykg fHwgaXNJT1NXZWJLaXQoKSB8fCBpc1RWT1NXZWJLaXQoKSB8fCBpc1dhdGNoT1NXZWJLaXQoKTsK IH0KIAogc3ViIGlzQXBwbGVXaW5XZWJLaXQoKQpAQCAtMTI4OSwxMSArMTMxMyw0NiBAQCBzdWIg d2lsbFVzZUlPU1NpbXVsYXRvclNESygpCiAgICAgcmV0dXJuIHhjb2RlU0RLUGxhdGZvcm1OYW1l KCkgZXEgImlwaG9uZXNpbXVsYXRvciI7CiB9CiAKK3N1YiB3aWxsVXNlQXBwbGVUVkRldmljZVNE SygpCit7CisgICAgcmV0dXJuIHhjb2RlU0RLUGxhdGZvcm1OYW1lKCkgZXEgImFwcGxldHZvcyI7 Cit9CisKK3N1YiB3aWxsVXNlQXBwbGVUVlNpbXVsYXRvclNESygpCit7CisgICAgcmV0dXJuIHhj b2RlU0RLUGxhdGZvcm1OYW1lKCkgZXEgImFwcGxldHZzaW11bGF0b3IiOworfQorCitzdWIgd2ls bFVzZVdhdGNoRGV2aWNlU0RLKCkKK3sKKyAgICByZXR1cm4geGNvZGVTREtQbGF0Zm9ybU5hbWUo KSBlcSAid2F0Y2hvcyI7Cit9CisKK3N1YiB3aWxsVXNlV2F0Y2hTaW11bGF0b3JTREsoKQorewor ICAgIHJldHVybiB4Y29kZVNES1BsYXRmb3JtTmFtZSgpIGVxICJ3YXRjaHNpbXVsYXRvciI7Cit9 CisKIHN1YiBpc0lPU1dlYktpdCgpCiB7CiAgICAgcmV0dXJuIHBvcnROYW1lKCkgZXEgaU9TOwog fQogCitzdWIgaXNUVk9TV2ViS2l0KCkKK3sKKyAgICByZXR1cm4gcG9ydE5hbWUoKSBlcSB0dk9T OworfQorCitzdWIgaXNXYXRjaE9TV2ViS2l0KCkKK3sKKyAgICByZXR1cm4gcG9ydE5hbWUoKSBl cSB3YXRjaE9TOworfQorCitzdWIgaXNJT1NMaWtlV2ViS2l0KCkKK3sKKyAgICByZXR1cm4gIGlz SU9TV2ViS2l0KCkgfHwgaXNUVk9TV2ViS2l0KCkgfHwgaXNXYXRjaE9TV2ViS2l0KCk7Cit9CisK IHN1YiBkZXRlcm1pbmVObVBhdGgoKQogewogICAgIHJldHVybiBpZiAkbm1QYXRoOwo=