163785 2016-10-21 08:55:18 -0700 [Modern Media Controls] Concatenate JS and CSS files into a single JS and CSS resources 2017-02-07 04:43:29 -0800 1 1 1 Unclassified WebKit Media Safari 10 Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 graouts graouts commit-queue esprehn+autocc glenn graouts kondapallykalyan webkit-bug-importer oldest_to_newest 1242891 0 graouts 2016-10-21 08:55:18 -0700 As part of review feedback for https://bugs.webkit.org/show_bug.cgi?id=163726, Dean suggested using a build phase to concatenate all JS resources into a single file rather than doing a series of stringWithContentsOfFile calls on the WebCore bundle at runtime. We should also do this for CSS. 1242892 1 webkit-bug-importer 2016-10-21 08:56:42 -0700 <rdar://problem/28890058> 1242893 2 292350 graouts 2016-10-21 08:56:43 -0700 Created attachment 292350 Patch 1242894 3 292351 graouts 2016-10-21 08:58:34 -0700 Created attachment 292351 Patch 1242999 4 292351 dino 2016-10-21 11:06:54 -0700 Comment on attachment 292351 Patch This looks good to me, but I think you should get someone who knows more about the build system to check this. Two concerns: - what will happen with localization? at some point you'll need a file with all the strings that need to be localized. - does this run on every build? Previously the rsync would only change files if necessary. Is that bad? 1243010 5 292351 darin 2016-10-21 11:39:28 -0700 Comment on attachment 292351 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=292351&action=review > Source/WebCore/WebCore.xcodeproj/project.pbxproj:27979 > + shellScript = "rsync -aq --exclude \".svn\" --exclude \".DS_Store\" \"$SRCROOT/Modules/modern-media-controls/images\" \"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/modern-media-controls\"\ncd \"$SRCROOT/Modules/modern-media-controls\"\ncat controls/*.css > \"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/modern-media-controls/modern-media-controls.css\"\n cat \"controls/scheduler.js\" \"controls/layout-node.js\" \"controls/layout-item.js\" \"controls/icon-service.js\" \"controls/time-control.js\" \"controls/time-label.js\" \"controls/slider.js\" \"controls/volume-slider.js\" \"controls/scrubber.js\" \"controls/button.js\" \"controls/start-button.js\" \"controls/icon-button.js\" \"controls/play-pause-button.js\" \"controls/skip-back-button.js\" \"controls/mute-button.js\" \"controls/airplay-button.js\" \"controls/pip-button.js\" \"controls/tracks-button.js\" \"controls/fullscreen-button.js\" \"controls/aspect-ratio-button.js\" \"controls/rewind-button.js\" \"controls/forward-button.js\" \"controls/media-controls.js\" \"controls/macos-media-controls.js\" \"controls/macos-inline-media-controls.js\" \"controls/buttons-container.js\" \"controls/placard.js\" \"controls/airplay-placard.js\" \"controls/pip-placard.js\" \"media/media-controller-support.js\" \"media/start-support.js\" \"media/mute-support.js\" \"media/media-controller.js\" \"main.js\" > \"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/modern-media-controls/modern-media-controls.js\"\n"; There are too many quotation marks here. There is no reason to write "main.js" instead of just main.js in the command line. But can we put the list of files somewhere easier to read and inspect than inside the build rule? Maybe put the names into a file? Then it would be more like this: cat `cat JavaScript-filenames` > \"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/modern-media-controls/modern-media-controls.js\" Or rearrange them so we can pick them up with *.js like you are picking up the CSS with *.css? 1243043 6 graouts 2016-10-21 12:20:36 -0700 (In reply to comment #5) > Comment on attachment 292351 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=292351&action=review > > > Source/WebCore/WebCore.xcodeproj/project.pbxproj:27979 > But can we put the list of files somewhere easier to read and inspect than > inside the build rule? Maybe put the names into a file? Then it would be > more like this: > > cat `cat JavaScript-filenames` > > \"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH/modern-media- > controls/modern-media-controls.js\" I like that! > Or rearrange them so we can pick them up with *.js like you are picking up > the CSS with *.css? Alas, we can't do that with JS, the order in which the classes appear matters. 1243676 7 292603 graouts 2016-10-24 05:35:05 -0700 Created attachment 292603 Patch for landing 1243677 8 graouts 2016-10-24 05:42:25 -0700 Sorry, I forgot about your comments after reading Darin's. (In reply to comment #4) > Comment on attachment 292351 [details] > > - what will happen with localization? at some point you'll need a file with > all the strings that need to be localized. Yes, I will follow the same approach used for current media controls, where the strings are in a separate JS file that gets injected on top of the media controls logic. > - does this run on every build? Previously the rsync would only change files > if necessary. Is that bad? It does run on every build, I hope it's not bad. 1243701 9 292603 graouts 2016-10-24 08:02:00 -0700 Comment on attachment 292603 Patch for landing https://trac.webkit.org/changeset/207758 292350 2016-10-21 08:56:43 -0700 2016-10-21 08:58:29 -0700 Patch bug-163785-20161021175303.patch text/plain 7497 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3NjY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTkwODRjODZjNTY4MWE5 YTU5MDcyODBhMGJkMmJlMTg0MzFkZmJmNC4uZjA1ZjEzMTY2YzI2Njk1ZDdmMjFhNmIyMTU2NGJl YmYxYTIyZTc3MiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE4IEBACisyMDE2LTEwLTIxICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW01vZGVybiBNZWRpYSBD b250cm9sc10gQ29uY2F0ZW5hdGUgSlMgYW5kIENTUyBmaWxlcyBpbnRvIGEgc2luZ2xlIEpTIGFu ZCBDU1MgcmVzb3VyY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNjM3ODUKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBDb25jYXRlbmF0ZSBDU1MgYW5kIEpTIHJlc291cmNlcyBmb3IgbW9kZXJuIG1lZGlh IGNvbnRyb2xzIGludG8gc2luZ2xlIEpTIGFuZCBDU1MgZmlsZXMKKyAgICAgICAgZHVyaW5nIGJ1 aWxkIGFuZCBsb2FkIHRoZXNlIHNpbmdsZSByZXNvdXJjZXMgYWxvbmUgYXQgcnVudGltZS4KKwor ICAgICAgICAqIFdlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBy ZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW06CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVt ZU1hYzo6bWVkaWFDb250cm9sc1N0eWxlU2hlZXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVy VGhlbWVNYWM6Om1lZGlhQ29udHJvbHNTY3JpcHQpOgorCiAyMDE2LTEwLTIxICBNaWd1ZWwgR29t ZXogIDxtYWdvbWV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dUS10gU2V2ZXJhbCB0ZXN0cyBj cmFzaGluZyBvbiBkZWJ1ZyBib3QgaW4gKGFub255bW91cyBuYW1lc3BhY2UpOjpNZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXJCYXNlOjpyZXBhaW50CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViQ29yZS9XZWJD b3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggNWE4MDlkYjBlZTg1YjFjNDkwNGFh MWY2YTY5NzRkMmI4NWIwYjY4Mi4uMzJlMjE2OWQ1NzVlZDc4YjUzN2UwZDNlYmFiMTIxZDQwNjBl OTkxNyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVj dC5wYnhwcm9qCisrKyBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagpAQCAtMjc5NzYsNyArMjc5NzYsNyBAQAogCQkJKTsKIAkJCXJ1bk9ubHlGb3JEZXBs b3ltZW50UG9zdHByb2Nlc3NpbmcgPSAwOwogCQkJc2hlbGxQYXRoID0gL2Jpbi9zaDsKLQkJCXNo ZWxsU2NyaXB0ID0gInJzeW5jIC1hcSAtLWV4Y2x1ZGUgXCIuc3ZuXCIgLS1leGNsdWRlIFwiLkRT X1N0b3JlXCIgLS1leGNsdWRlIFwidGVzdHNcIiBcIiRTUkNST09UL01vZHVsZXMvbW9kZXJuLW1l ZGlhLWNvbnRyb2xzXCIgXCIkQlVJTFRfUFJPRFVDVFNfRElSLyRVTkxPQ0FMSVpFRF9SRVNPVVJD RVNfRk9MREVSX1BBVEhcIiI7CisJCQlzaGVsbFNjcmlwdCA9ICJyc3luYyAtYXEgLS1leGNsdWRl IFwiLnN2blwiIC0tZXhjbHVkZSBcIi5EU19TdG9yZVwiIFwiJFNSQ1JPT1QvTW9kdWxlcy9tb2Rl cm4tbWVkaWEtY29udHJvbHMvaW1hZ2VzXCIgXCIkQlVJTFRfUFJPRFVDVFNfRElSLyRVTkxPQ0FM SVpFRF9SRVNPVVJDRVNfRk9MREVSX1BBVEgvbW9kZXJuLW1lZGlhLWNvbnRyb2xzXCJcbmNkIFwi JFNSQ1JPT1QvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHNcIlxuY2F0IGNvbnRyb2xzLyou Y3NzID4gXCIkQlVJTFRfUFJPRFVDVFNfRElSLyRVTkxPQ0FMSVpFRF9SRVNPVVJDRVNfRk9MREVS X1BBVEgvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21vZGVybi1tZWRpYS1jb250cm9scy5jc3NcIlxu ICAgICAgICAgICAgIGNhdCBcImNvbnRyb2xzL3NjaGVkdWxlci5qc1wiIFwiY29udHJvbHMvbGF5 b3V0LW5vZGUuanNcIiBcImNvbnRyb2xzL2xheW91dC1pdGVtLmpzXCIgXCJjb250cm9scy9pY29u LXNlcnZpY2UuanNcIiBcImNvbnRyb2xzL3RpbWUtY29udHJvbC5qc1wiIFwiY29udHJvbHMvdGlt ZS1sYWJlbC5qc1wiIFwiY29udHJvbHMvc2xpZGVyLmpzXCIgXCJjb250cm9scy92b2x1bWUtc2xp ZGVyLmpzXCIgXCJjb250cm9scy9zY3J1YmJlci5qc1wiIFwiY29udHJvbHMvYnV0dG9uLmpzXCIg XCJjb250cm9scy9zdGFydC1idXR0b24uanNcIiBcImNvbnRyb2xzL2ljb24tYnV0dG9uLmpzXCIg XCJjb250cm9scy9wbGF5LXBhdXNlLWJ1dHRvbi5qc1wiIFwiY29udHJvbHMvc2tpcC1iYWNrLWJ1 dHRvbi5qc1wiIFwiY29udHJvbHMvbXV0ZS1idXR0b24uanNcIiBcImNvbnRyb2xzL2FpcnBsYXkt YnV0dG9uLmpzXCIgXCJjb250cm9scy9waXAtYnV0dG9uLmpzXCIgXCJjb250cm9scy90cmFja3Mt YnV0dG9uLmpzXCIgXCJjb250cm9scy9mdWxsc2NyZWVuLWJ1dHRvbi5qc1wiIFwiY29udHJvbHMv YXNwZWN0LXJhdGlvLWJ1dHRvbi5qc1wiIFwiY29udHJvbHMvcmV3aW5kLWJ1dHRvbi5qc1wiIFwi Y29udHJvbHMvZm9yd2FyZC1idXR0b24uanNcIiBcImNvbnRyb2xzL21lZGlhLWNvbnRyb2xzLmpz XCIgXCJjb250cm9scy9tYWNvcy1tZWRpYS1jb250cm9scy5qc1wiIFwiY29udHJvbHMvbWFjb3Mt aW5saW5lLW1lZGlhLWNvbnRyb2xzLmpzXCIgXCJjb250cm9scy9idXR0b25zLWNvbnRhaW5lci5q c1wiIFwiY29udHJvbHMvcGxhY2FyZC5qc1wiIFwiY29udHJvbHMvYWlycGxheS1wbGFjYXJkLmpz XCIgXCJjb250cm9scy9waXAtcGxhY2FyZC5qc1wiIFwibWVkaWEvbWVkaWEtY29udHJvbGxlci1z dXBwb3J0LmpzXCIgXCJtZWRpYS9zdGFydC1zdXBwb3J0LmpzXCIgXCJtZWRpYS9tdXRlLXN1cHBv cnQuanNcIiBcIm1lZGlhL21lZGlhLWNvbnRyb2xsZXIuanNcIiBcIm1haW4uanNcIiA+IFwiJEJV SUxUX1BST0RVQ1RTX0RJUi8kVU5MT0NBTElaRURfUkVTT1VSQ0VTX0ZPTERFUl9QQVRIL21vZGVy bi1tZWRpYS1jb250cm9scy9tb2Rlcm4tbWVkaWEtY29udHJvbHMuanNcIlxuIjsKIAkJfTsKIAkJ REQwNDFGQkQwOUQ5RERCRTAwMTBBRjJBIC8qIEdlbmVyYXRlIERlcml2ZWQgU291cmNlcyAqLyA9 IHsKIAkJCWlzYSA9IFBCWFNoZWxsU2NyaXB0QnVpbGRQaGFzZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbSBiL1NvdXJjZS9XZWJDb3JlL3Jl bmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbQppbmRleCA2ZDIwNGU3ODgwYzMyMzczZTkzNGIwMDg1 ZmI2ZTdjZDE1MzNlODc2Li4xMDdlODM1MzUyNjVhMWUwMGQyZWQxNzE1NDU2NWJiMDg1MzUzN2Jl IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0K KysrIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFjLm1tCkBAIC0yMzYs MTEgKzIzNiw5IEBAIFN0cmluZyBSZW5kZXJUaGVtZU1hYzo6bWVkaWFDb250cm9sc1N0eWxlU2hl ZXQoKQogI2lmIEVOQUJMRShNRURJQV9DT05UUk9MU19TQ1JJUFQpCiAgICAgaWYgKG1fbWVkaWFD b250cm9sc1N0eWxlU2hlZXQuaXNFbXB0eSgpKSB7CiAgICAgICAgIFN0cmluZ0J1aWxkZXIgc3R5 bGVTaGVldEJ1aWxkZXI7Ci0gICAgICAgIGlmIChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFy ZWRGZWF0dXJlcygpLm1vZGVybk1lZGlhQ29udHJvbHNFbmFibGVkKCkpIHsKLSAgICAgICAgICAg IE5TQXJyYXkgKnBhdGhzID0gQFtAImFpcnBsYXktYnV0dG9uIiwgQCJidXR0b24iLCBAImJ1dHRv bnMtY29udGFpbmVyIiwgQCJpY29uLWJ1dHRvbiIsIEAibWFjb3MtaW5saW5lLW1lZGlhLWNvbnRy b2xzIiwgQCJtZWRpYS1jb250cm9scyIsIEAicGxhY2FyZCIsIEAic2NydWJiZXIiLCBAInNsaWRl ciIsIEAic3RhcnQtYnV0dG9uIiwgQCJ0aW1lLWxhYmVsIiwgQCJ2b2x1bWUtc2xpZGVyIl07Ci0g ICAgICAgICAgICBmb3IgKE5TU3RyaW5nICpwYXRoIGluIHBhdGhzKQotICAgICAgICAgICAgICAg IHN0eWxlU2hlZXRCdWlsZGVyLmFwcGVuZChbTlNTdHJpbmcgc3RyaW5nV2l0aENvbnRlbnRzT2ZG aWxlOltbTlNCdW5kbGUgYnVuZGxlRm9yQ2xhc3M6W1dlYkNvcmVSZW5kZXJUaGVtZUJ1bmRsZSBj bGFzc11dIHBhdGhGb3JSZXNvdXJjZTpwYXRoIG9mVHlwZTpAImNzcyIgaW5EaXJlY3Rvcnk6QCJt b2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMiXSBlbmNvZGluZzpOU1VURjhTdHJpbmdFbmNv ZGluZyBlcnJvcjpuaWxdKTsKLSAgICAgICAgfSBlbHNlCisgICAgICAgIGlmIChSdW50aW1lRW5h YmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLm1vZGVybk1lZGlhQ29udHJvbHNFbmFibGVk KCkpCisgICAgICAgICAgICBzdHlsZVNoZWV0QnVpbGRlci5hcHBlbmQoW05TU3RyaW5nIHN0cmlu Z1dpdGhDb250ZW50c09mRmlsZTpbW05TQnVuZGxlIGJ1bmRsZUZvckNsYXNzOltXZWJDb3JlUmVu ZGVyVGhlbWVCdW5kbGUgY2xhc3NdXSBwYXRoRm9yUmVzb3VyY2U6QCJtb2Rlcm4tbWVkaWEtY29u dHJvbHMiIG9mVHlwZTpAImNzcyIgaW5EaXJlY3Rvcnk6QCJtb2Rlcm4tbWVkaWEtY29udHJvbHMi XSBlbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZyBlcnJvcjpuaWxdKTsKKyAgICAgICAgZWxz ZQogICAgICAgICAgICAgc3R5bGVTaGVldEJ1aWxkZXIuYXBwZW5kKFtOU1N0cmluZyBzdHJpbmdX aXRoQ29udGVudHNPZkZpbGU6W1tOU0J1bmRsZSBidW5kbGVGb3JDbGFzczpbV2ViQ29yZVJlbmRl clRoZW1lQnVuZGxlIGNsYXNzXV0gcGF0aEZvclJlc291cmNlOkAibWVkaWFDb250cm9sc0FwcGxl IiBvZlR5cGU6QCJjc3MiXSBlbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZyBlcnJvcjpuaWxd KTsKICAgICAgICAgbV9tZWRpYUNvbnRyb2xzU3R5bGVTaGVldCA9IHN0eWxlU2hlZXRCdWlsZGVy LnRvU3RyaW5nKCk7CiAgICAgfQpAQCAtMjU2LDE1ICsyNTQsOSBAQCBTdHJpbmcgUmVuZGVyVGhl bWVNYWM6Om1lZGlhQ29udHJvbHNTY3JpcHQoKQogICAgIGlmIChtX21lZGlhQ29udHJvbHNTY3Jp cHQuaXNFbXB0eSgpKSB7CiAgICAgICAgIFN0cmluZ0J1aWxkZXIgc2NyaXB0QnVpbGRlcjsKICAg ICAgICAgTlNCdW5kbGUgKmJ1bmRsZSA9IFtOU0J1bmRsZSBidW5kbGVGb3JDbGFzczpbV2ViQ29y ZVJlbmRlclRoZW1lQnVuZGxlIGNsYXNzXV07Ci0gICAgICAgIGlmIChSdW50aW1lRW5hYmxlZEZl YXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLm1vZGVybk1lZGlhQ29udHJvbHNFbmFibGVkKCkpIHsK LSAgICAgICAgICAgIE5TQXJyYXkgKmNvbnRyb2xzUGF0aHMgPSBAW0Aic2NoZWR1bGVyIiwgQCJs YXlvdXQtbm9kZSIsIEAibGF5b3V0LWl0ZW0iLCBAImljb24tc2VydmljZSIsIEAidGltZS1jb250 cm9sIiwgQCJ0aW1lLWxhYmVsIiwgQCJzbGlkZXIiLCBAInZvbHVtZS1zbGlkZXIiLCBAInNjcnVi YmVyIiwgQCJidXR0b24iLCBAInN0YXJ0LWJ1dHRvbiIsIEAiaWNvbi1idXR0b24iLCBAInBsYXkt cGF1c2UtYnV0dG9uIiwgQCJza2lwLWJhY2stYnV0dG9uIiwgQCJtdXRlLWJ1dHRvbiIsIEAiYWly cGxheS1idXR0b24iLCBAInBpcC1idXR0b24iLCBAInRyYWNrcy1idXR0b24iLCBAImZ1bGxzY3Jl ZW4tYnV0dG9uIiwgQCJhc3BlY3QtcmF0aW8tYnV0dG9uIiwgQCJyZXdpbmQtYnV0dG9uIiwgQCJm b3J3YXJkLWJ1dHRvbiIsIEAibWVkaWEtY29udHJvbHMiLCBAIm1hY29zLW1lZGlhLWNvbnRyb2xz IiwgQCJtYWNvcy1pbmxpbmUtbWVkaWEtY29udHJvbHMiLCBAImJ1dHRvbnMtY29udGFpbmVyIiwg QCJwbGFjYXJkIiwgQCJhaXJwbGF5LXBsYWNhcmQiLCBAInBpcC1wbGFjYXJkIl07Ci0gICAgICAg ICAgICBmb3IgKE5TU3RyaW5nICpwYXRoIGluIGNvbnRyb2xzUGF0aHMpCi0gICAgICAgICAgICAg ICAgc2NyaXB0QnVpbGRlci5hcHBlbmQoW05TU3RyaW5nIHN0cmluZ1dpdGhDb250ZW50c09mRmls ZTpbYnVuZGxlIHBhdGhGb3JSZXNvdXJjZTpwYXRoIG9mVHlwZTpAImpzIiBpbkRpcmVjdG9yeTpA Im1vZGVybi1tZWRpYS1jb250cm9scy9jb250cm9scyJdIGVuY29kaW5nOk5TVVRGOFN0cmluZ0Vu Y29kaW5nIGVycm9yOm5pbF0pOwotICAgICAgICAgICAgTlNBcnJheSAqbWVkaWFQYXRocyA9IEBb QCJtZWRpYS1jb250cm9sbGVyLXN1cHBvcnQiLCBAIm11dGUtc3VwcG9ydCIsIEAic3RhcnQtc3Vw cG9ydCIsIEAibWVkaWEtY29udHJvbGxlciJdOwotICAgICAgICAgICAgZm9yIChOU1N0cmluZyAq cGF0aCBpbiBtZWRpYVBhdGhzKQotICAgICAgICAgICAgICAgIHNjcmlwdEJ1aWxkZXIuYXBwZW5k KFtOU1N0cmluZyBzdHJpbmdXaXRoQ29udGVudHNPZkZpbGU6W2J1bmRsZSBwYXRoRm9yUmVzb3Vy Y2U6cGF0aCBvZlR5cGU6QCJqcyIgaW5EaXJlY3Rvcnk6QCJtb2Rlcm4tbWVkaWEtY29udHJvbHMv bWVkaWEiXSBlbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZyBlcnJvcjpuaWxdKTsKLSAgICAg ICAgICAgIHNjcmlwdEJ1aWxkZXIuYXBwZW5kKFtOU1N0cmluZyBzdHJpbmdXaXRoQ29udGVudHNP ZkZpbGU6W2J1bmRsZSBwYXRoRm9yUmVzb3VyY2U6QCJtYWluIiBvZlR5cGU6QCJqcyIgaW5EaXJl Y3Rvcnk6QCJtb2Rlcm4tbWVkaWEtY29udHJvbHMiXSBlbmNvZGluZzpOU1VURjhTdHJpbmdFbmNv ZGluZyBlcnJvcjpuaWxdKTsKLSAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgaWYgKFJ1bnRpbWVF bmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkubW9kZXJuTWVkaWFDb250cm9sc0VuYWJs ZWQoKSkKKyAgICAgICAgICAgIHNjcmlwdEJ1aWxkZXIuYXBwZW5kKFtOU1N0cmluZyBzdHJpbmdX aXRoQ29udGVudHNPZkZpbGU6W2J1bmRsZSBwYXRoRm9yUmVzb3VyY2U6QCJtb2Rlcm4tbWVkaWEt Y29udHJvbHMiIG9mVHlwZTpAImpzIiBpbkRpcmVjdG9yeTpAIm1vZGVybi1tZWRpYS1jb250cm9s cyJdIGVuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nIGVycm9yOm5pbF0pOworICAgICAgICBl bHNlIHsKICAgICAgICAgICAgIHNjcmlwdEJ1aWxkZXIuYXBwZW5kKFtOU1N0cmluZyBzdHJpbmdX aXRoQ29udGVudHNPZkZpbGU6W2J1bmRsZSBwYXRoRm9yUmVzb3VyY2U6QCJtZWRpYUNvbnRyb2xz TG9jYWxpemVkU3RyaW5ncyIgb2ZUeXBlOkAianMiXSBlbmNvZGluZzpOU1VURjhTdHJpbmdFbmNv ZGluZyBlcnJvcjpuaWxdKTsKICAgICAgICAgICAgIHNjcmlwdEJ1aWxkZXIuYXBwZW5kKFtOU1N0 cmluZyBzdHJpbmdXaXRoQ29udGVudHNPZkZpbGU6W2J1bmRsZSBwYXRoRm9yUmVzb3VyY2U6QCJt ZWRpYUNvbnRyb2xzQXBwbGUiIG9mVHlwZTpAImpzIl0gZW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5j b2RpbmcgZXJyb3I6bmlsXSk7CiAgICAgICAgIH0K 292351 2016-10-21 08:58:34 -0700 2016-10-24 05:34:59 -0700 Patch bug-163785-20161021175454.patch text/plain 7532 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3NjY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYTkwODRjODZjNTY4MWE5 YTU5MDcyODBhMGJkMmJlMTg0MzFkZmJmNC4uNjU1ZTViOWY4YWJkOTEyZDNiNDVmYzczZjJiMWUz YjFmODI3YWRlMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE5IEBACisyMDE2LTEwLTIxICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW01vZGVybiBNZWRpYSBD b250cm9sc10gQ29uY2F0ZW5hdGUgSlMgYW5kIENTUyBmaWxlcyBpbnRvIGEgc2luZ2xlIEpTIGFu ZCBDU1MgcmVzb3VyY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNjM3ODUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI4ODkwMDU4PgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIENvbmNhdGVuYXRlIENT UyBhbmQgSlMgcmVzb3VyY2VzIGZvciBtb2Rlcm4gbWVkaWEgY29udHJvbHMgaW50byBzaW5nbGUg SlMgYW5kIENTUyBmaWxlcworICAgICAgICBkdXJpbmcgYnVpbGQgYW5kIGxvYWQgdGhlc2Ugc2lu Z2xlIHJlc291cmNlcyBhbG9uZSBhdCBydW50aW1lLgorCisgICAgICAgICogV2ViQ29yZS54Y29k ZXByb2ovcHJvamVjdC5wYnhwcm9qOgorICAgICAgICAqIHJlbmRlcmluZy9SZW5kZXJUaGVtZU1h Yy5tbToKKyAgICAgICAgKFdlYkNvcmU6OlJlbmRlclRoZW1lTWFjOjptZWRpYUNvbnRyb2xzU3R5 bGVTaGVldCk6CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZU1hYzo6bWVkaWFDb250cm9s c1NjcmlwdCk6CisKIDIwMTYtMTAtMjEgIE1pZ3VlbCBHb21leiAgPG1hZ29tZXpAaWdhbGlhLmNv bT4KIAogICAgICAgICBbR1RLXSBTZXZlcmFsIHRlc3RzIGNyYXNoaW5nIG9uIGRlYnVnIGJvdCBp biAoYW5vbnltb3VzIG5hbWVzcGFjZSk6Ok1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6 OnJlcGFpbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3By b2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagppbmRleCA1YTgwOWRiMGVlODViMWM0OTA0YWExZjZhNjk3NGQyYjg1YjBiNjgyLi4z MmUyMTY5ZDU3NWVkNzhiNTM3ZTBkM2ViYWIxMjFkNDA2MGU5OTE3IDEwMDY0NAotLS0gYS9Tb3Vy Y2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKKysrIGIvU291cmNl L1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0yNzk3Niw3ICsy Nzk3Niw3IEBACiAJCQkpOwogCQkJcnVuT25seUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9 IDA7CiAJCQlzaGVsbFBhdGggPSAvYmluL3NoOwotCQkJc2hlbGxTY3JpcHQgPSAicnN5bmMgLWFx IC0tZXhjbHVkZSBcIi5zdm5cIiAtLWV4Y2x1ZGUgXCIuRFNfU3RvcmVcIiAtLWV4Y2x1ZGUgXCJ0 ZXN0c1wiIFwiJFNSQ1JPT1QvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHNcIiBcIiRCVUlM VF9QUk9EVUNUU19ESVIvJFVOTE9DQUxJWkVEX1JFU09VUkNFU19GT0xERVJfUEFUSFwiIjsKKwkJ CXNoZWxsU2NyaXB0ID0gInJzeW5jIC1hcSAtLWV4Y2x1ZGUgXCIuc3ZuXCIgLS1leGNsdWRlIFwi LkRTX1N0b3JlXCIgXCIkU1JDUk9PVC9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9pbWFn ZXNcIiBcIiRCVUlMVF9QUk9EVUNUU19ESVIvJFVOTE9DQUxJWkVEX1JFU09VUkNFU19GT0xERVJf UEFUSC9tb2Rlcm4tbWVkaWEtY29udHJvbHNcIlxuY2QgXCIkU1JDUk9PVC9Nb2R1bGVzL21vZGVy bi1tZWRpYS1jb250cm9sc1wiXG5jYXQgY29udHJvbHMvKi5jc3MgPiBcIiRCVUlMVF9QUk9EVUNU U19ESVIvJFVOTE9DQUxJWkVEX1JFU09VUkNFU19GT0xERVJfUEFUSC9tb2Rlcm4tbWVkaWEtY29u dHJvbHMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzLmNzc1wiXG4gICAgICAgICAgICAgY2F0IFwiY29u dHJvbHMvc2NoZWR1bGVyLmpzXCIgXCJjb250cm9scy9sYXlvdXQtbm9kZS5qc1wiIFwiY29udHJv bHMvbGF5b3V0LWl0ZW0uanNcIiBcImNvbnRyb2xzL2ljb24tc2VydmljZS5qc1wiIFwiY29udHJv bHMvdGltZS1jb250cm9sLmpzXCIgXCJjb250cm9scy90aW1lLWxhYmVsLmpzXCIgXCJjb250cm9s cy9zbGlkZXIuanNcIiBcImNvbnRyb2xzL3ZvbHVtZS1zbGlkZXIuanNcIiBcImNvbnRyb2xzL3Nj cnViYmVyLmpzXCIgXCJjb250cm9scy9idXR0b24uanNcIiBcImNvbnRyb2xzL3N0YXJ0LWJ1dHRv bi5qc1wiIFwiY29udHJvbHMvaWNvbi1idXR0b24uanNcIiBcImNvbnRyb2xzL3BsYXktcGF1c2Ut YnV0dG9uLmpzXCIgXCJjb250cm9scy9za2lwLWJhY2stYnV0dG9uLmpzXCIgXCJjb250cm9scy9t dXRlLWJ1dHRvbi5qc1wiIFwiY29udHJvbHMvYWlycGxheS1idXR0b24uanNcIiBcImNvbnRyb2xz L3BpcC1idXR0b24uanNcIiBcImNvbnRyb2xzL3RyYWNrcy1idXR0b24uanNcIiBcImNvbnRyb2xz L2Z1bGxzY3JlZW4tYnV0dG9uLmpzXCIgXCJjb250cm9scy9hc3BlY3QtcmF0aW8tYnV0dG9uLmpz XCIgXCJjb250cm9scy9yZXdpbmQtYnV0dG9uLmpzXCIgXCJjb250cm9scy9mb3J3YXJkLWJ1dHRv bi5qc1wiIFwiY29udHJvbHMvbWVkaWEtY29udHJvbHMuanNcIiBcImNvbnRyb2xzL21hY29zLW1l ZGlhLWNvbnRyb2xzLmpzXCIgXCJjb250cm9scy9tYWNvcy1pbmxpbmUtbWVkaWEtY29udHJvbHMu anNcIiBcImNvbnRyb2xzL2J1dHRvbnMtY29udGFpbmVyLmpzXCIgXCJjb250cm9scy9wbGFjYXJk LmpzXCIgXCJjb250cm9scy9haXJwbGF5LXBsYWNhcmQuanNcIiBcImNvbnRyb2xzL3BpcC1wbGFj YXJkLmpzXCIgXCJtZWRpYS9tZWRpYS1jb250cm9sbGVyLXN1cHBvcnQuanNcIiBcIm1lZGlhL3N0 YXJ0LXN1cHBvcnQuanNcIiBcIm1lZGlhL211dGUtc3VwcG9ydC5qc1wiIFwibWVkaWEvbWVkaWEt Y29udHJvbGxlci5qc1wiIFwibWFpbi5qc1wiID4gXCIkQlVJTFRfUFJPRFVDVFNfRElSLyRVTkxP Q0FMSVpFRF9SRVNPVVJDRVNfRk9MREVSX1BBVEgvbW9kZXJuLW1lZGlhLWNvbnRyb2xzL21vZGVy bi1tZWRpYS1jb250cm9scy5qc1wiXG4iOwogCQl9OwogCQlERDA0MUZCRDA5RDlEREJFMDAxMEFG MkEgLyogR2VuZXJhdGUgRGVyaXZlZCBTb3VyY2VzICovID0gewogCQkJaXNhID0gUEJYU2hlbGxT Y3JpcHRCdWlsZFBoYXNlOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1Jl bmRlclRoZW1lTWFjLm1tIGIvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRoZW1lTWFj Lm1tCmluZGV4IDZkMjA0ZTc4ODBjMzIzNzNlOTM0YjAwODVmYjZlN2NkMTUzM2U4NzYuLjEwN2U4 MzUzNTI2NWExZTAwZDJlZDE3MTU0NTY1YmIwODUzNTM3YmUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9X ZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5tbQorKysgYi9Tb3VyY2UvV2ViQ29yZS9y ZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0KQEAgLTIzNiwxMSArMjM2LDkgQEAgU3RyaW5nIFJl bmRlclRoZW1lTWFjOjptZWRpYUNvbnRyb2xzU3R5bGVTaGVldCgpCiAjaWYgRU5BQkxFKE1FRElB X0NPTlRST0xTX1NDUklQVCkKICAgICBpZiAobV9tZWRpYUNvbnRyb2xzU3R5bGVTaGVldC5pc0Vt cHR5KCkpIHsKICAgICAgICAgU3RyaW5nQnVpbGRlciBzdHlsZVNoZWV0QnVpbGRlcjsKLSAgICAg ICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVzKCkubW9kZXJuTWVk aWFDb250cm9sc0VuYWJsZWQoKSkgewotICAgICAgICAgICAgTlNBcnJheSAqcGF0aHMgPSBAW0Ai YWlycGxheS1idXR0b24iLCBAImJ1dHRvbiIsIEAiYnV0dG9ucy1jb250YWluZXIiLCBAImljb24t YnV0dG9uIiwgQCJtYWNvcy1pbmxpbmUtbWVkaWEtY29udHJvbHMiLCBAIm1lZGlhLWNvbnRyb2xz IiwgQCJwbGFjYXJkIiwgQCJzY3J1YmJlciIsIEAic2xpZGVyIiwgQCJzdGFydC1idXR0b24iLCBA InRpbWUtbGFiZWwiLCBAInZvbHVtZS1zbGlkZXIiXTsKLSAgICAgICAgICAgIGZvciAoTlNTdHJp bmcgKnBhdGggaW4gcGF0aHMpCi0gICAgICAgICAgICAgICAgc3R5bGVTaGVldEJ1aWxkZXIuYXBw ZW5kKFtOU1N0cmluZyBzdHJpbmdXaXRoQ29udGVudHNPZkZpbGU6W1tOU0J1bmRsZSBidW5kbGVG b3JDbGFzczpbV2ViQ29yZVJlbmRlclRoZW1lQnVuZGxlIGNsYXNzXV0gcGF0aEZvclJlc291cmNl OnBhdGggb2ZUeXBlOkAiY3NzIiBpbkRpcmVjdG9yeTpAIm1vZGVybi1tZWRpYS1jb250cm9scy9j b250cm9scyJdIGVuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nIGVycm9yOm5pbF0pOwotICAg ICAgICB9IGVsc2UKKyAgICAgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZl YXR1cmVzKCkubW9kZXJuTWVkaWFDb250cm9sc0VuYWJsZWQoKSkKKyAgICAgICAgICAgIHN0eWxl U2hlZXRCdWlsZGVyLmFwcGVuZChbTlNTdHJpbmcgc3RyaW5nV2l0aENvbnRlbnRzT2ZGaWxlOltb TlNCdW5kbGUgYnVuZGxlRm9yQ2xhc3M6W1dlYkNvcmVSZW5kZXJUaGVtZUJ1bmRsZSBjbGFzc11d IHBhdGhGb3JSZXNvdXJjZTpAIm1vZGVybi1tZWRpYS1jb250cm9scyIgb2ZUeXBlOkAiY3NzIiBp bkRpcmVjdG9yeTpAIm1vZGVybi1tZWRpYS1jb250cm9scyJdIGVuY29kaW5nOk5TVVRGOFN0cmlu Z0VuY29kaW5nIGVycm9yOm5pbF0pOworICAgICAgICBlbHNlCiAgICAgICAgICAgICBzdHlsZVNo ZWV0QnVpbGRlci5hcHBlbmQoW05TU3RyaW5nIHN0cmluZ1dpdGhDb250ZW50c09mRmlsZTpbW05T QnVuZGxlIGJ1bmRsZUZvckNsYXNzOltXZWJDb3JlUmVuZGVyVGhlbWVCdW5kbGUgY2xhc3NdXSBw YXRoRm9yUmVzb3VyY2U6QCJtZWRpYUNvbnRyb2xzQXBwbGUiIG9mVHlwZTpAImNzcyJdIGVuY29k aW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nIGVycm9yOm5pbF0pOwogICAgICAgICBtX21lZGlhQ29u dHJvbHNTdHlsZVNoZWV0ID0gc3R5bGVTaGVldEJ1aWxkZXIudG9TdHJpbmcoKTsKICAgICB9CkBA IC0yNTYsMTUgKzI1NCw5IEBAIFN0cmluZyBSZW5kZXJUaGVtZU1hYzo6bWVkaWFDb250cm9sc1Nj cmlwdCgpCiAgICAgaWYgKG1fbWVkaWFDb250cm9sc1NjcmlwdC5pc0VtcHR5KCkpIHsKICAgICAg ICAgU3RyaW5nQnVpbGRlciBzY3JpcHRCdWlsZGVyOwogICAgICAgICBOU0J1bmRsZSAqYnVuZGxl ID0gW05TQnVuZGxlIGJ1bmRsZUZvckNsYXNzOltXZWJDb3JlUmVuZGVyVGhlbWVCdW5kbGUgY2xh c3NdXTsKLSAgICAgICAgaWYgKFJ1bnRpbWVFbmFibGVkRmVhdHVyZXM6OnNoYXJlZEZlYXR1cmVz KCkubW9kZXJuTWVkaWFDb250cm9sc0VuYWJsZWQoKSkgewotICAgICAgICAgICAgTlNBcnJheSAq Y29udHJvbHNQYXRocyA9IEBbQCJzY2hlZHVsZXIiLCBAImxheW91dC1ub2RlIiwgQCJsYXlvdXQt aXRlbSIsIEAiaWNvbi1zZXJ2aWNlIiwgQCJ0aW1lLWNvbnRyb2wiLCBAInRpbWUtbGFiZWwiLCBA InNsaWRlciIsIEAidm9sdW1lLXNsaWRlciIsIEAic2NydWJiZXIiLCBAImJ1dHRvbiIsIEAic3Rh cnQtYnV0dG9uIiwgQCJpY29uLWJ1dHRvbiIsIEAicGxheS1wYXVzZS1idXR0b24iLCBAInNraXAt YmFjay1idXR0b24iLCBAIm11dGUtYnV0dG9uIiwgQCJhaXJwbGF5LWJ1dHRvbiIsIEAicGlwLWJ1 dHRvbiIsIEAidHJhY2tzLWJ1dHRvbiIsIEAiZnVsbHNjcmVlbi1idXR0b24iLCBAImFzcGVjdC1y YXRpby1idXR0b24iLCBAInJld2luZC1idXR0b24iLCBAImZvcndhcmQtYnV0dG9uIiwgQCJtZWRp YS1jb250cm9scyIsIEAibWFjb3MtbWVkaWEtY29udHJvbHMiLCBAIm1hY29zLWlubGluZS1tZWRp YS1jb250cm9scyIsIEAiYnV0dG9ucy1jb250YWluZXIiLCBAInBsYWNhcmQiLCBAImFpcnBsYXkt cGxhY2FyZCIsIEAicGlwLXBsYWNhcmQiXTsKLSAgICAgICAgICAgIGZvciAoTlNTdHJpbmcgKnBh dGggaW4gY29udHJvbHNQYXRocykKLSAgICAgICAgICAgICAgICBzY3JpcHRCdWlsZGVyLmFwcGVu ZChbTlNTdHJpbmcgc3RyaW5nV2l0aENvbnRlbnRzT2ZGaWxlOltidW5kbGUgcGF0aEZvclJlc291 cmNlOnBhdGggb2ZUeXBlOkAianMiIGluRGlyZWN0b3J5OkAibW9kZXJuLW1lZGlhLWNvbnRyb2xz L2NvbnRyb2xzIl0gZW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmcgZXJyb3I6bmlsXSk7Ci0g ICAgICAgICAgICBOU0FycmF5ICptZWRpYVBhdGhzID0gQFtAIm1lZGlhLWNvbnRyb2xsZXItc3Vw cG9ydCIsIEAibXV0ZS1zdXBwb3J0IiwgQCJzdGFydC1zdXBwb3J0IiwgQCJtZWRpYS1jb250cm9s bGVyIl07Ci0gICAgICAgICAgICBmb3IgKE5TU3RyaW5nICpwYXRoIGluIG1lZGlhUGF0aHMpCi0g ICAgICAgICAgICAgICAgc2NyaXB0QnVpbGRlci5hcHBlbmQoW05TU3RyaW5nIHN0cmluZ1dpdGhD b250ZW50c09mRmlsZTpbYnVuZGxlIHBhdGhGb3JSZXNvdXJjZTpwYXRoIG9mVHlwZTpAImpzIiBp bkRpcmVjdG9yeTpAIm1vZGVybi1tZWRpYS1jb250cm9scy9tZWRpYSJdIGVuY29kaW5nOk5TVVRG OFN0cmluZ0VuY29kaW5nIGVycm9yOm5pbF0pOwotICAgICAgICAgICAgc2NyaXB0QnVpbGRlci5h cHBlbmQoW05TU3RyaW5nIHN0cmluZ1dpdGhDb250ZW50c09mRmlsZTpbYnVuZGxlIHBhdGhGb3JS ZXNvdXJjZTpAIm1haW4iIG9mVHlwZTpAImpzIiBpbkRpcmVjdG9yeTpAIm1vZGVybi1tZWRpYS1j b250cm9scyJdIGVuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nIGVycm9yOm5pbF0pOwotICAg ICAgICB9IGVsc2UgeworICAgICAgICBpZiAoUnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVk RmVhdHVyZXMoKS5tb2Rlcm5NZWRpYUNvbnRyb2xzRW5hYmxlZCgpKQorICAgICAgICAgICAgc2Ny aXB0QnVpbGRlci5hcHBlbmQoW05TU3RyaW5nIHN0cmluZ1dpdGhDb250ZW50c09mRmlsZTpbYnVu ZGxlIHBhdGhGb3JSZXNvdXJjZTpAIm1vZGVybi1tZWRpYS1jb250cm9scyIgb2ZUeXBlOkAianMi IGluRGlyZWN0b3J5OkAibW9kZXJuLW1lZGlhLWNvbnRyb2xzIl0gZW5jb2Rpbmc6TlNVVEY4U3Ry aW5nRW5jb2RpbmcgZXJyb3I6bmlsXSk7CisgICAgICAgIGVsc2UgewogICAgICAgICAgICAgc2Ny aXB0QnVpbGRlci5hcHBlbmQoW05TU3RyaW5nIHN0cmluZ1dpdGhDb250ZW50c09mRmlsZTpbYnVu ZGxlIHBhdGhGb3JSZXNvdXJjZTpAIm1lZGlhQ29udHJvbHNMb2NhbGl6ZWRTdHJpbmdzIiBvZlR5 cGU6QCJqcyJdIGVuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nIGVycm9yOm5pbF0pOwogICAg ICAgICAgICAgc2NyaXB0QnVpbGRlci5hcHBlbmQoW05TU3RyaW5nIHN0cmluZ1dpdGhDb250ZW50 c09mRmlsZTpbYnVuZGxlIHBhdGhGb3JSZXNvdXJjZTpAIm1lZGlhQ29udHJvbHNBcHBsZSIgb2ZU eXBlOkAianMiXSBlbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZyBlcnJvcjpuaWxdKTsKICAg ICAgICAgfQo= 292603 2016-10-24 05:35:05 -0700 2016-10-24 08:02:00 -0700 Patch for landing bug-163785-20161024143121.patch text/plain 7792 graouts U3VidmVyc2lvbiBSZXZpc2lvbjogMjA3NzU0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZTIzNTljOTU4M2M0NDE2 ZDVhMGMyOWZlMmMzZTk0ZTYxM2IxYTM1ZC4uMzVkZDUyYWY2MTU5MjVjZDgzZDgyZjMyNDFmYTc1 NGZjNzMyODk5NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDE2LTEwLTIxICBBbnRv aW5lIFF1aW50ICA8Z3Jhb3V0c0BhcHBsZS5jb20+CisKKyAgICAgICAgW01vZGVybiBNZWRpYSBD b250cm9sc10gQ29uY2F0ZW5hdGUgSlMgYW5kIENTUyBmaWxlcyBpbnRvIGEgc2luZ2xlIEpTIGFu ZCBDU1MgcmVzb3VyY2VzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0xNjM3ODUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzI4ODkwMDU4PgorCisgICAg ICAgIFJldmlld2VkIGJ5IERhcmluIEFkbGVyLgorCisgICAgICAgIENvbmNhdGVuYXRlIENTUyBh bmQgSlMgcmVzb3VyY2VzIGZvciBtb2Rlcm4gbWVkaWEgY29udHJvbHMgaW50byBzaW5nbGUgSlMg YW5kIENTUyBmaWxlcworICAgICAgICBkdXJpbmcgYnVpbGQgYW5kIGxvYWQgdGhlc2Ugc2luZ2xl IHJlc291cmNlcyBhbG9uZSBhdCBydW50aW1lLgorCisgICAgICAgICogTW9kdWxlcy9tb2Rlcm4t bWVkaWEtY29udHJvbHMvanMtZmlsZXM6IEFkZGVkLgorICAgICAgICAqIFdlYkNvcmUueGNvZGVw cm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiByZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMu bW06CisgICAgICAgIChXZWJDb3JlOjpSZW5kZXJUaGVtZU1hYzo6bWVkaWFDb250cm9sc1N0eWxl U2hlZXQpOgorICAgICAgICAoV2ViQ29yZTo6UmVuZGVyVGhlbWVNYWM6Om1lZGlhQ29udHJvbHNT Y3JpcHQpOgorCiAyMDE2LTEwLTI0ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4K IAogICAgICAgICBBU1NFUlRJT04gRkFJTEVEOiBjYW52YXMoKS0+c2VjdXJpdHlPcmlnaW4oKS0+ dG9TdHJpbmcoKSA9PSBjYWNoZWRJbWFnZS5vcmlnaW4oKS0+dG9TdHJpbmcoKQpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJvbHMvanMtZmlsZXMg Yi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9scy9qcy1maWxlcwpu ZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwLi43OTU0ODNjNzkzNTdkMmJmNGVmNWE5MWEyNmJjMjA0NDYzNjM3ZDBjCi0tLSAv ZGV2L251bGwKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9tb2Rlcm4tbWVkaWEtY29udHJv bHMvanMtZmlsZXMKQEAgLTAsMCArMSwzNCBAQAorY29udHJvbHMvc2NoZWR1bGVyLmpzCitjb250 cm9scy9sYXlvdXQtbm9kZS5qcworY29udHJvbHMvbGF5b3V0LWl0ZW0uanMKK2NvbnRyb2xzL2lj b24tc2VydmljZS5qcworY29udHJvbHMvdGltZS1jb250cm9sLmpzCitjb250cm9scy90aW1lLWxh YmVsLmpzCitjb250cm9scy9zbGlkZXIuanMKK2NvbnRyb2xzL3ZvbHVtZS1zbGlkZXIuanMKK2Nv bnRyb2xzL3NjcnViYmVyLmpzCitjb250cm9scy9idXR0b24uanMKK2NvbnRyb2xzL3N0YXJ0LWJ1 dHRvbi5qcworY29udHJvbHMvaWNvbi1idXR0b24uanMKK2NvbnRyb2xzL3BsYXktcGF1c2UtYnV0 dG9uLmpzCitjb250cm9scy9za2lwLWJhY2stYnV0dG9uLmpzCitjb250cm9scy9tdXRlLWJ1dHRv bi5qcworY29udHJvbHMvYWlycGxheS1idXR0b24uanMKK2NvbnRyb2xzL3BpcC1idXR0b24uanMK K2NvbnRyb2xzL3RyYWNrcy1idXR0b24uanMKK2NvbnRyb2xzL2Z1bGxzY3JlZW4tYnV0dG9uLmpz Citjb250cm9scy9hc3BlY3QtcmF0aW8tYnV0dG9uLmpzCitjb250cm9scy9yZXdpbmQtYnV0dG9u LmpzCitjb250cm9scy9mb3J3YXJkLWJ1dHRvbi5qcworY29udHJvbHMvbWVkaWEtY29udHJvbHMu anMKK2NvbnRyb2xzL21hY29zLW1lZGlhLWNvbnRyb2xzLmpzCitjb250cm9scy9tYWNvcy1pbmxp bmUtbWVkaWEtY29udHJvbHMuanMKK2NvbnRyb2xzL2J1dHRvbnMtY29udGFpbmVyLmpzCitjb250 cm9scy9wbGFjYXJkLmpzCitjb250cm9scy9haXJwbGF5LXBsYWNhcmQuanMKK2NvbnRyb2xzL3Bp cC1wbGFjYXJkLmpzCittZWRpYS9tZWRpYS1jb250cm9sbGVyLXN1cHBvcnQuanMKK21lZGlhL3N0 YXJ0LXN1cHBvcnQuanMKK21lZGlhL211dGUtc3VwcG9ydC5qcworbWVkaWEvbWVkaWEtY29udHJv bGxlci5qcworbWFpbi5qcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29k ZXByb2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ov cHJvamVjdC5wYnhwcm9qCmluZGV4IGFlNTlhZGQ5NDg2MzYwMGQ2YmFkMGNkN2VmYzlmNzI3MTdk NmRkMDkuLmExODAzZmZmYTcwYmIzNTMzNTFhODY0NzE5MzJjNzE1OTFlYWM2ZDAgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagorKysg Yi9Tb3VyY2UvV2ViQ29yZS9XZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKQEAgLTI4 MDAwLDcgKzI4MDAwLDcgQEAKIAkJCSk7CiAJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9j ZXNzaW5nID0gMDsKIAkJCXNoZWxsUGF0aCA9IC9iaW4vc2g7Ci0JCQlzaGVsbFNjcmlwdCA9ICJy c3luYyAtYXEgLS1leGNsdWRlIFwiLnN2blwiIC0tZXhjbHVkZSBcIi5EU19TdG9yZVwiIC0tZXhj bHVkZSBcInRlc3RzXCIgXCIkU1JDUk9PVC9Nb2R1bGVzL21vZGVybi1tZWRpYS1jb250cm9sc1wi IFwiJEJVSUxUX1BST0RVQ1RTX0RJUi8kVU5MT0NBTElaRURfUkVTT1VSQ0VTX0ZPTERFUl9QQVRI XCIiOworCQkJc2hlbGxTY3JpcHQgPSAicnN5bmMgLWFxIC0tZXhjbHVkZSBcIi5zdm5cIiAtLWV4 Y2x1ZGUgXCIuRFNfU3RvcmVcIiBcIiRTUkNST09UL01vZHVsZXMvbW9kZXJuLW1lZGlhLWNvbnRy b2xzL2ltYWdlc1wiIFwiJEJVSUxUX1BST0RVQ1RTX0RJUi8kVU5MT0NBTElaRURfUkVTT1VSQ0VT X0ZPTERFUl9QQVRIL21vZGVybi1tZWRpYS1jb250cm9sc1wiXG5jZCBcIiRTUkNST09UL01vZHVs ZXMvbW9kZXJuLW1lZGlhLWNvbnRyb2xzXCJcbmNhdCBjb250cm9scy8qLmNzcyA+IFwiJEJVSUxU X1BST0RVQ1RTX0RJUi8kVU5MT0NBTElaRURfUkVTT1VSQ0VTX0ZPTERFUl9QQVRIL21vZGVybi1t ZWRpYS1jb250cm9scy9tb2Rlcm4tbWVkaWEtY29udHJvbHMuY3NzXCJcbmNhdCBgY2F0IGpzLWZp bGVzYCA+IFwiJEJVSUxUX1BST0RVQ1RTX0RJUi8kVU5MT0NBTElaRURfUkVTT1VSQ0VTX0ZPTERF Ul9QQVRIL21vZGVybi1tZWRpYS1jb250cm9scy9tb2Rlcm4tbWVkaWEtY29udHJvbHMuanNcIiI7 CiAJCX07CiAJCUREMDQxRkJEMDlEOUREQkUwMDEwQUYyQSAvKiBHZW5lcmF0ZSBEZXJpdmVkIFNv dXJjZXMgKi8gPSB7CiAJCQlpc2EgPSBQQlhTaGVsbFNjcmlwdEJ1aWxkUGhhc2U7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0gYi9Tb3VyY2Uv V2ViQ29yZS9yZW5kZXJpbmcvUmVuZGVyVGhlbWVNYWMubW0KaW5kZXggNmQyMDRlNzg4MGMzMjM3 M2U5MzRiMDA4NWZiNmU3Y2QxNTMzZTg3Ni4uMTA3ZTgzNTM1MjY1YTFlMDBkMmVkMTcxNTQ1NjVi YjA4NTM1MzdiZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcmVuZGVyaW5nL1JlbmRlclRo ZW1lTWFjLm1tCisrKyBiL1NvdXJjZS9XZWJDb3JlL3JlbmRlcmluZy9SZW5kZXJUaGVtZU1hYy5t bQpAQCAtMjM2LDExICsyMzYsOSBAQCBTdHJpbmcgUmVuZGVyVGhlbWVNYWM6Om1lZGlhQ29udHJv bHNTdHlsZVNoZWV0KCkKICNpZiBFTkFCTEUoTUVESUFfQ09OVFJPTFNfU0NSSVBUKQogICAgIGlm IChtX21lZGlhQ29udHJvbHNTdHlsZVNoZWV0LmlzRW1wdHkoKSkgewogICAgICAgICBTdHJpbmdC dWlsZGVyIHN0eWxlU2hlZXRCdWlsZGVyOwotICAgICAgICBpZiAoUnVudGltZUVuYWJsZWRGZWF0 dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5tb2Rlcm5NZWRpYUNvbnRyb2xzRW5hYmxlZCgpKSB7Ci0g ICAgICAgICAgICBOU0FycmF5ICpwYXRocyA9IEBbQCJhaXJwbGF5LWJ1dHRvbiIsIEAiYnV0dG9u IiwgQCJidXR0b25zLWNvbnRhaW5lciIsIEAiaWNvbi1idXR0b24iLCBAIm1hY29zLWlubGluZS1t ZWRpYS1jb250cm9scyIsIEAibWVkaWEtY29udHJvbHMiLCBAInBsYWNhcmQiLCBAInNjcnViYmVy IiwgQCJzbGlkZXIiLCBAInN0YXJ0LWJ1dHRvbiIsIEAidGltZS1sYWJlbCIsIEAidm9sdW1lLXNs aWRlciJdOwotICAgICAgICAgICAgZm9yIChOU1N0cmluZyAqcGF0aCBpbiBwYXRocykKLSAgICAg ICAgICAgICAgICBzdHlsZVNoZWV0QnVpbGRlci5hcHBlbmQoW05TU3RyaW5nIHN0cmluZ1dpdGhD b250ZW50c09mRmlsZTpbW05TQnVuZGxlIGJ1bmRsZUZvckNsYXNzOltXZWJDb3JlUmVuZGVyVGhl bWVCdW5kbGUgY2xhc3NdXSBwYXRoRm9yUmVzb3VyY2U6cGF0aCBvZlR5cGU6QCJjc3MiIGluRGly ZWN0b3J5OkAibW9kZXJuLW1lZGlhLWNvbnRyb2xzL2NvbnRyb2xzIl0gZW5jb2Rpbmc6TlNVVEY4 U3RyaW5nRW5jb2RpbmcgZXJyb3I6bmlsXSk7Ci0gICAgICAgIH0gZWxzZQorICAgICAgICBpZiAo UnVudGltZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5tb2Rlcm5NZWRpYUNvbnRy b2xzRW5hYmxlZCgpKQorICAgICAgICAgICAgc3R5bGVTaGVldEJ1aWxkZXIuYXBwZW5kKFtOU1N0 cmluZyBzdHJpbmdXaXRoQ29udGVudHNPZkZpbGU6W1tOU0J1bmRsZSBidW5kbGVGb3JDbGFzczpb V2ViQ29yZVJlbmRlclRoZW1lQnVuZGxlIGNsYXNzXV0gcGF0aEZvclJlc291cmNlOkAibW9kZXJu LW1lZGlhLWNvbnRyb2xzIiBvZlR5cGU6QCJjc3MiIGluRGlyZWN0b3J5OkAibW9kZXJuLW1lZGlh LWNvbnRyb2xzIl0gZW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmcgZXJyb3I6bmlsXSk7Cisg ICAgICAgIGVsc2UKICAgICAgICAgICAgIHN0eWxlU2hlZXRCdWlsZGVyLmFwcGVuZChbTlNTdHJp bmcgc3RyaW5nV2l0aENvbnRlbnRzT2ZGaWxlOltbTlNCdW5kbGUgYnVuZGxlRm9yQ2xhc3M6W1dl YkNvcmVSZW5kZXJUaGVtZUJ1bmRsZSBjbGFzc11dIHBhdGhGb3JSZXNvdXJjZTpAIm1lZGlhQ29u dHJvbHNBcHBsZSIgb2ZUeXBlOkAiY3NzIl0gZW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2Rpbmcg ZXJyb3I6bmlsXSk7CiAgICAgICAgIG1fbWVkaWFDb250cm9sc1N0eWxlU2hlZXQgPSBzdHlsZVNo ZWV0QnVpbGRlci50b1N0cmluZygpOwogICAgIH0KQEAgLTI1NiwxNSArMjU0LDkgQEAgU3RyaW5n IFJlbmRlclRoZW1lTWFjOjptZWRpYUNvbnRyb2xzU2NyaXB0KCkKICAgICBpZiAobV9tZWRpYUNv bnRyb2xzU2NyaXB0LmlzRW1wdHkoKSkgewogICAgICAgICBTdHJpbmdCdWlsZGVyIHNjcmlwdEJ1 aWxkZXI7CiAgICAgICAgIE5TQnVuZGxlICpidW5kbGUgPSBbTlNCdW5kbGUgYnVuZGxlRm9yQ2xh c3M6W1dlYkNvcmVSZW5kZXJUaGVtZUJ1bmRsZSBjbGFzc11dOwotICAgICAgICBpZiAoUnVudGlt ZUVuYWJsZWRGZWF0dXJlczo6c2hhcmVkRmVhdHVyZXMoKS5tb2Rlcm5NZWRpYUNvbnRyb2xzRW5h YmxlZCgpKSB7Ci0gICAgICAgICAgICBOU0FycmF5ICpjb250cm9sc1BhdGhzID0gQFtAInNjaGVk dWxlciIsIEAibGF5b3V0LW5vZGUiLCBAImxheW91dC1pdGVtIiwgQCJpY29uLXNlcnZpY2UiLCBA InRpbWUtY29udHJvbCIsIEAidGltZS1sYWJlbCIsIEAic2xpZGVyIiwgQCJ2b2x1bWUtc2xpZGVy IiwgQCJzY3J1YmJlciIsIEAiYnV0dG9uIiwgQCJzdGFydC1idXR0b24iLCBAImljb24tYnV0dG9u IiwgQCJwbGF5LXBhdXNlLWJ1dHRvbiIsIEAic2tpcC1iYWNrLWJ1dHRvbiIsIEAibXV0ZS1idXR0 b24iLCBAImFpcnBsYXktYnV0dG9uIiwgQCJwaXAtYnV0dG9uIiwgQCJ0cmFja3MtYnV0dG9uIiwg QCJmdWxsc2NyZWVuLWJ1dHRvbiIsIEAiYXNwZWN0LXJhdGlvLWJ1dHRvbiIsIEAicmV3aW5kLWJ1 dHRvbiIsIEAiZm9yd2FyZC1idXR0b24iLCBAIm1lZGlhLWNvbnRyb2xzIiwgQCJtYWNvcy1tZWRp YS1jb250cm9scyIsIEAibWFjb3MtaW5saW5lLW1lZGlhLWNvbnRyb2xzIiwgQCJidXR0b25zLWNv bnRhaW5lciIsIEAicGxhY2FyZCIsIEAiYWlycGxheS1wbGFjYXJkIiwgQCJwaXAtcGxhY2FyZCJd OwotICAgICAgICAgICAgZm9yIChOU1N0cmluZyAqcGF0aCBpbiBjb250cm9sc1BhdGhzKQotICAg ICAgICAgICAgICAgIHNjcmlwdEJ1aWxkZXIuYXBwZW5kKFtOU1N0cmluZyBzdHJpbmdXaXRoQ29u dGVudHNPZkZpbGU6W2J1bmRsZSBwYXRoRm9yUmVzb3VyY2U6cGF0aCBvZlR5cGU6QCJqcyIgaW5E aXJlY3Rvcnk6QCJtb2Rlcm4tbWVkaWEtY29udHJvbHMvY29udHJvbHMiXSBlbmNvZGluZzpOU1VU RjhTdHJpbmdFbmNvZGluZyBlcnJvcjpuaWxdKTsKLSAgICAgICAgICAgIE5TQXJyYXkgKm1lZGlh UGF0aHMgPSBAW0AibWVkaWEtY29udHJvbGxlci1zdXBwb3J0IiwgQCJtdXRlLXN1cHBvcnQiLCBA InN0YXJ0LXN1cHBvcnQiLCBAIm1lZGlhLWNvbnRyb2xsZXIiXTsKLSAgICAgICAgICAgIGZvciAo TlNTdHJpbmcgKnBhdGggaW4gbWVkaWFQYXRocykKLSAgICAgICAgICAgICAgICBzY3JpcHRCdWls ZGVyLmFwcGVuZChbTlNTdHJpbmcgc3RyaW5nV2l0aENvbnRlbnRzT2ZGaWxlOltidW5kbGUgcGF0 aEZvclJlc291cmNlOnBhdGggb2ZUeXBlOkAianMiIGluRGlyZWN0b3J5OkAibW9kZXJuLW1lZGlh LWNvbnRyb2xzL21lZGlhIl0gZW5jb2Rpbmc6TlNVVEY4U3RyaW5nRW5jb2RpbmcgZXJyb3I6bmls XSk7Ci0gICAgICAgICAgICBzY3JpcHRCdWlsZGVyLmFwcGVuZChbTlNTdHJpbmcgc3RyaW5nV2l0 aENvbnRlbnRzT2ZGaWxlOltidW5kbGUgcGF0aEZvclJlc291cmNlOkAibWFpbiIgb2ZUeXBlOkAi anMiIGluRGlyZWN0b3J5OkAibW9kZXJuLW1lZGlhLWNvbnRyb2xzIl0gZW5jb2Rpbmc6TlNVVEY4 U3RyaW5nRW5jb2RpbmcgZXJyb3I6bmlsXSk7Ci0gICAgICAgIH0gZWxzZSB7CisgICAgICAgIGlm IChSdW50aW1lRW5hYmxlZEZlYXR1cmVzOjpzaGFyZWRGZWF0dXJlcygpLm1vZGVybk1lZGlhQ29u dHJvbHNFbmFibGVkKCkpCisgICAgICAgICAgICBzY3JpcHRCdWlsZGVyLmFwcGVuZChbTlNTdHJp bmcgc3RyaW5nV2l0aENvbnRlbnRzT2ZGaWxlOltidW5kbGUgcGF0aEZvclJlc291cmNlOkAibW9k ZXJuLW1lZGlhLWNvbnRyb2xzIiBvZlR5cGU6QCJqcyIgaW5EaXJlY3Rvcnk6QCJtb2Rlcm4tbWVk aWEtY29udHJvbHMiXSBlbmNvZGluZzpOU1VURjhTdHJpbmdFbmNvZGluZyBlcnJvcjpuaWxdKTsK KyAgICAgICAgZWxzZSB7CiAgICAgICAgICAgICBzY3JpcHRCdWlsZGVyLmFwcGVuZChbTlNTdHJp bmcgc3RyaW5nV2l0aENvbnRlbnRzT2ZGaWxlOltidW5kbGUgcGF0aEZvclJlc291cmNlOkAibWVk aWFDb250cm9sc0xvY2FsaXplZFN0cmluZ3MiIG9mVHlwZTpAImpzIl0gZW5jb2Rpbmc6TlNVVEY4 U3RyaW5nRW5jb2RpbmcgZXJyb3I6bmlsXSk7CiAgICAgICAgICAgICBzY3JpcHRCdWlsZGVyLmFw cGVuZChbTlNTdHJpbmcgc3RyaW5nV2l0aENvbnRlbnRzT2ZGaWxlOltidW5kbGUgcGF0aEZvclJl c291cmNlOkAibWVkaWFDb250cm9sc0FwcGxlIiBvZlR5cGU6QCJqcyJdIGVuY29kaW5nOk5TVVRG OFN0cmluZ0VuY29kaW5nIGVycm9yOm5pbF0pOwogICAgICAgICB9Cg==