182268 2018-01-29 15:55:42 -0800 Add a build step to copy resources from WebKitAdditions as bundle resources in WebKit 2018-01-29 21:43:21 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 wenson_hsieh wenson_hsieh aestes commit-queue joepeck mitz thorton webkit-bug-importer oldest_to_newest 1394315 0 wenson_hsieh 2018-01-29 15:55:42 -0800 <rdar://problem/37003784> 1394326 1 332597 wenson_hsieh 2018-01-29 16:28:38 -0800 Created attachment 332597 Patch 1394365 2 332597 mitz 2018-01-29 17:45:58 -0800 Comment on attachment 332597 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=332597&action=review > Source/WebKit/WebKit.xcodeproj/project.pbxproj:10022 > + name = "Copy additional resources"; Why not use the same capitalization style as the other build phases? > Source/WebKit/WebKit.xcodeproj/project.pbxproj:10027 > + shellScript = "SOURCE=\"$SDKROOT/usr/local/include/WebKitAdditions/WebKit/AdditionalResources\"\nDESTINATION=\"$BUILT_PRODUCTS_DIR/WebKit.framework\"\nif [ -d \"$SOURCE\" ]\nthen\n rsync -aq --exclude \".svn\" --exclude \".DS_Store\" $SOURCE/* \"$DESTINATION\"\nfi"; Some ideas on how to improve this: - use $SDK_DIR instead of $SDKROOT - account for local builds of WebKitAdditions in the built products directories before falling back on the SDK - use ditto - don’t behave as if the SDK may contain items named .svn or .DS_Store - copy into $UNLOCALIZED_RESOURCES_FOLDER_PATH so that it doesn’t depend on the iOS shallow bundle structure - use modern [[ instead of quirky [ - set -e 1394398 3 332597 wenson_hsieh 2018-01-29 19:14:43 -0800 Comment on attachment 332597 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=332597&action=review >> Source/WebKit/WebKit.xcodeproj/project.pbxproj:10022 >> + name = "Copy additional resources"; > > Why not use the same capitalization style as the other build phases? Good catch! Should definitely be capitalized. >> Source/WebKit/WebKit.xcodeproj/project.pbxproj:10027 >> + shellScript = "SOURCE=\"$SDKROOT/usr/local/include/WebKitAdditions/WebKit/AdditionalResources\"\nDESTINATION=\"$BUILT_PRODUCTS_DIR/WebKit.framework\"\nif [ -d \"$SOURCE\" ]\nthen\n rsync -aq --exclude \".svn\" --exclude \".DS_Store\" $SOURCE/* \"$DESTINATION\"\nfi"; > > Some ideas on how to improve this: > - use $SDK_DIR instead of $SDKROOT > - account for local builds of WebKitAdditions in the built products directories before falling back on the SDK > - use ditto > - don’t behave as if the SDK may contain items named .svn or .DS_Store > - copy into $UNLOCALIZED_RESOURCES_FOLDER_PATH so that it doesn’t depend on the iOS shallow bundle structure > - use modern [[ instead of quirky [ > - set -e - switched to $SDK_DIR - changed to try and find additional resources in the built products directory first, then fall back to SDK - changed to use ditto. - removed unneeded .svn and .DS_Store exclusion - switched to use $UNLOCALIZED_RESOURCES_FOLDER_PATH - changed to [[ - added `set -e` at the beginning Thanks for the suggestions! 1394411 4 332624 wenson_hsieh 2018-01-29 20:13:57 -0800 Created attachment 332624 Patch 1394413 5 332624 mitz 2018-01-29 20:37:54 -0800 Comment on attachment 332624 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=332624&action=review > Source/WebKit/WebKit.xcodeproj/project.pbxproj:10022 > + shellScript = "set -e\n\nRELATIVE_SOURCE_PATH=\"usr/local/include/WebKitAdditions/WebKit/AdditionalResources\"\nSOURCE_PATH=\"$BUILT_PRODUCTS_DIR/$RELATIVE_SOURCE_PATH\"\n\nif [[ ! -d \"$SOURCE_PATH\" ]]; then\n SOURCE_PATH=\"$SDK_DIR/$RELATIVE_SOURCE_PATH\"\nfi\n\nif [[ -d \"$SOURCE_PATH\" ]]; then\n ditto $SOURCE_PATH/* \"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH\"\nfi"; I think the * there is unnecessary (and harmful if the source directory ever contained subdirectories). 1394414 6 wenson_hsieh 2018-01-29 20:43:10 -0800 (In reply to mitz from comment #5) > Comment on attachment 332624 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=332624&action=review > > > Source/WebKit/WebKit.xcodeproj/project.pbxproj:10022 > > + shellScript = "set -e\n\nRELATIVE_SOURCE_PATH=\"usr/local/include/WebKitAdditions/WebKit/AdditionalResources\"\nSOURCE_PATH=\"$BUILT_PRODUCTS_DIR/$RELATIVE_SOURCE_PATH\"\n\nif [[ ! -d \"$SOURCE_PATH\" ]]; then\n SOURCE_PATH=\"$SDK_DIR/$RELATIVE_SOURCE_PATH\"\nfi\n\nif [[ -d \"$SOURCE_PATH\" ]]; then\n ditto $SOURCE_PATH/* \"$BUILT_PRODUCTS_DIR/$UNLOCALIZED_RESOURCES_FOLDER_PATH\"\nfi"; > > I think the * there is unnecessary (and harmful if the source directory ever > contained subdirectories). Ah, I wasn't aware that ditto had different semantics than rsync when the source is a folder. Fixed! 1394419 7 332627 wenson_hsieh 2018-01-29 21:00:57 -0800 Created attachment 332627 Patch for landing 1394422 8 332627 commit-queue 2018-01-29 21:36:42 -0800 Comment on attachment 332627 Patch for landing Clearing flags on attachment: 332627 Committed r227771: <https://trac.webkit.org/changeset/227771> 1394423 9 webkit-bug-importer 2018-01-29 21:43:21 -0800 <rdar://problem/37015528> 332597 2018-01-29 16:28:38 -0800 2018-01-29 17:27:37 -0800 Patch bug-182268-20180129162838.patch text/plain 4103 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjI3NzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ1NTkyNDUxMGVkMDEyOTlh YjU4OThjMjIxMzMzMTA4MDA5ZTgwYjMuLjYwM2Q5ZTRmNjA1NGY3YzdhM2E3YTJiMTAyOWY3MzQy YTQ3NzNjYjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTgtMDEtMjkgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGEgYnVpbGQgc3Rl cCB0byBjb3B5IHJlc291cmNlcyBmcm9tIFdlYktpdEFkZGl0aW9ucyBhcyBidW5kbGUgcmVzb3Vy Y2VzIGluIFdlYktpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTgyMjY4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNzAwMzc4ND4KKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBZGRzIGEgIkNvcHkgYWRk aXRpb25hbCByZXNvdXJjZXMiIHBoYXNlIHdoZW4gYnVpbGRpbmcgV2ViS2l0LiBUaGlzIHBoYXNl IGNvcGllcyByZXNvdXJjZXMgZnJvbQorICAgICAgICB1c3IvbG9jYWwvaW5jbHVkZS9XZWJLaXRB ZGRpdGlvbnMvV2ViS2l0L0FkZGl0aW9uYWxSZXNvdXJjZXMgaW4gdGhlIFNESyBpbnRvIHRoZSBi dWlsZCBkaXJlY3RvcnksCisgICAgICAgIGlmIHRoZSBhZGRpdGlvbmFsIHJlc291cmNlcyBkaXJl Y3RvcnkgZXhpc3RzLgorCisgICAgICAgICogV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHBy b2o6CisKIDIwMTgtMDEtMjkgIEFuZHkgRXN0ZXMgIDxhZXN0ZXNAYXBwbGUuY29tPgogCiAgICAg ICAgIFtpT1NdIFJlc3RyaWN0IHN5bnRoZXRpYyBjbGlja3MgdG8gdGhlIG9yaWdpbiB0aGF0IGhh bmRsZWQgdGhlIHVuZGVybHlpbmcgdG91Y2ggZXZlbnQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJL aXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2ogYi9Tb3VyY2UvV2ViS2l0L1dlYktp dC54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IDQ5NjA0NDJmZDU3MzgwZDFjZThhNTA0 NThiMGEwMzMyMThhZjQxNmIuLjI2MmI3ZjEzMTYxMGViNmQxYjc4NDFkY2Y1MTcyMDEzNjNhNTBh YmMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvV2ViS2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBi eHByb2oKKysrIGIvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJv agpAQCAtNDc0NSwxMiArNDc0NSwxMiBAQAogCQkJCUJDODI4M0Y5MTZCNEZEREUwMEEyNzhGRSAv KiBjb20uYXBwbGUuV2ViS2l0LlBsdWdpbi4zMi54cGMgKi8sCiAJCQkJQkM4Mjg0MUYxNkI0RkRG NjAwQTI3OEZFIC8qIGNvbS5hcHBsZS5XZWJLaXQuUGx1Z2luLjY0LnhwYyAqLywKIAkJCQk1MUY3 REM0QTE4MENDOTM2MDAyMTJDQTMgLyogY29tLmFwcGxlLldlYktpdC5TdG9yYWdlLnhwYyAqLywK KwkJCQkzNzJFQkI0NjIwMTdFNjQzMDAwODUwNjQgLyogY29tLmFwcGxlLldlYktpdC5XZWJDb250 ZW50LkRldmVsb3BtZW50LnhwYyAqLywKIAkJCQlCQzNERTQ2NjE1QTkxNzYzMDA4RDI2RkMgLyog Y29tLmFwcGxlLldlYktpdC5XZWJDb250ZW50LnhwYyAqLywKIAkJCQkxQUMyNUZCMDEyQTQ4RUE3 MDBCRDI2NzEgLyogUGx1Z2luUHJvY2Vzc1NoaW0uZHlsaWIgKi8sCiAJCQkJNTEwMDMxRjYxMzc5 Q0FDQjAwQzhERkU0IC8qIFNlY0l0ZW1TaGltLmR5bGliICovLAogCQkJCThEQzJFRjVCMDQ4NkE2 OTQwMDk4QjIxNiAvKiBXZWJLaXQuZnJhbWV3b3JrICovLAogCQkJCUNEQzM4MzA2MTcyMTE3OTkw MDhBMkZDMyAvKiBXZWJQcm9jZXNzU2hpbS5keWxpYiAqLywKLQkJCQkzNzJFQkI0NjIwMTdFNjQz MDAwODUwNjQgLyogY29tLmFwcGxlLldlYktpdC5XZWJDb250ZW50LkRldmVsb3BtZW50LnhwYyAq LywKIAkJCSk7CiAJCQluYW1lID0gUHJvZHVjdHM7CiAJCQlzb3VyY2VUcmVlID0gIjxncm91cD4i OwpAQCAtNDk3OSw4ICs0OTc5LDggQEAKIAkJCQkxQTRGOTc2RTEwMEU3QjY2MDA2MzdBMTggLyog VmVyc2lvbi54Y2NvbmZpZyAqLywKIAkJCQk3QzBCQjlBODE4RENERTg5MDAwNkMwODYgLyogV2Vi Q29udGVudC1pT1MuZW50aXRsZW1lbnRzICovLAogCQkJCTM3QjQxOEVCMUM5NjI0RjIwMDMxRTYz QiAvKiBXZWJDb250ZW50LU9TWC5lbnRpdGxlbWVudHMgKi8sCi0JCQkJQkNBQ0M0MEUxNkIwQjhB ODAwQjZFMDkyIC8qIFdlYkNvbnRlbnRTZXJ2aWNlLnhjY29uZmlnICovLAogCQkJCTM3MkVCQjRB MjAxN0U3NjAwMDA4NTA2NCAvKiBXZWJDb250ZW50U2VydmljZS5EZXZlbG9wbWVudC54Y2NvbmZp ZyAqLywKKwkJCQlCQ0FDQzQwRTE2QjBCOEE4MDBCNkUwOTIgLyogV2ViQ29udGVudFNlcnZpY2Uu eGNjb25maWcgKi8sCiAJCQkJQkNCODZGNEIxMTZBQUFDRDAwQ0UyMEI3IC8qIFdlYktpdC54Y2Nv bmZpZyAqLywKIAkJCQlBMUVERDJERDE4ODRCOUUzMDBCQkZFOTggLyogV2ViUHJvY2Vzc1NoaW0u eGNjb25maWcgKi8sCiAJCQkpOwpAQCAtOTcwMSw2ICs5NzAxLDcgQEAKIAkJCQkzNzVBMjQ4ODE3 RTUwNDhFMDBDOUEwODYgLyogUG9zdHByb2Nlc3MgV0tCYXNlLmggKi8sCiAJCQkJMUFEOThFQ0Yx OTFEODY3MzAwQ0FBNkRGIC8qIFBvc3Rwcm9jZXNzIFdLRm91bmRhdGlvbi5oICovLAogCQkJCTFB MUQyMTE1MTkxRDk2MzgwMDAxNjE5RiAvKiBQb3N0cHJvY2VzcyBGcmFtZXdvcmsgSGVhZGVycyAq LywKKwkJCQkyRTE2QjZGNDIwMTlCQzI1MDA4OTk2RDYgLyogQ29weSBhZGRpdGlvbmFsIHJlc291 cmNlcyAqLywKIAkJCQk4REMyRUY1MjA0ODZBNjk0MDA5OEIyMTYgLyogUmVzb3VyY2VzICovLAog CQkJCTM3MjU4OTQzMUMxRTQ5NjgwMEM5MkNBOSAvKiBDb3B5IFNoaW1zICovLAogCQkJCTdDQjE2 RkVFMTcyNEJBMDUwMDdBMEE5NSAvKiBDb3B5IFBsdWctaW4gU2FuZGJveCBQcm9maWxlcyAqLywK QEAgLTEwMDEwLDYgKzEwMDExLDIxIEBACiAJCQlzaGVsbFBhdGggPSAvYmluL3NoOwogCQkJc2hl bGxTY3JpcHQgPSAiIyBUb3VjaCBJbmZvLnBsaXN0IHRvIGxldCBYY29kZSBrbm93IGl0IG5lZWRz IHRvIGNvcHkgaXQgaW50byB0aGUgYnVpbHQgcHJvZHVjdFxuaWYgW1sgXCIke0NPTkZJR1VSQVRJ T059XCIgIT0gXCJQcm9kdWN0aW9uXCIgXV07IHRoZW5cbnRvdWNoIFwiJHtQUk9KRUNUX0RJUn0v SW5mby5wbGlzdFwiO1xuZmk7XG4iOwogCQl9OworCQkyRTE2QjZGNDIwMTlCQzI1MDA4OTk2RDYg LyogQ29weSBhZGRpdGlvbmFsIHJlc291cmNlcyAqLyA9IHsKKwkJCWlzYSA9IFBCWFNoZWxsU2Ny aXB0QnVpbGRQaGFzZTsKKwkJCWJ1aWxkQWN0aW9uTWFzayA9IDEyOworCQkJZmlsZXMgPSAoCisJ CQkpOworCQkJaW5wdXRQYXRocyA9ICgKKwkJCQkiJChTREtST09UKS91c3IvbG9jYWwvaW5jbHVk ZS9XZWJLaXRBZGRpdGlvbnMvV2ViS2l0L0FkZGl0aW9uYWxSZXNvdXJjZXMiLAorCQkJKTsKKwkJ CW5hbWUgPSAiQ29weSBhZGRpdGlvbmFsIHJlc291cmNlcyI7CisJCQlvdXRwdXRQYXRocyA9ICgK KwkJCSk7CisJCQlydW5Pbmx5Rm9yRGVwbG95bWVudFBvc3Rwcm9jZXNzaW5nID0gMDsKKwkJCXNo ZWxsUGF0aCA9IC9iaW4vc2g7CisJCQlzaGVsbFNjcmlwdCA9ICJTT1VSQ0U9XCIkU0RLUk9PVC91 c3IvbG9jYWwvaW5jbHVkZS9XZWJLaXRBZGRpdGlvbnMvV2ViS2l0L0FkZGl0aW9uYWxSZXNvdXJj ZXNcIlxuREVTVElOQVRJT049XCIkQlVJTFRfUFJPRFVDVFNfRElSL1dlYktpdC5mcmFtZXdvcmtc IlxuaWYgWyAtZCBcIiRTT1VSQ0VcIiBdXG50aGVuXG4gICAgcnN5bmMgLWFxIC0tZXhjbHVkZSBc Ii5zdm5cIiAtLWV4Y2x1ZGUgXCIuRFNfU3RvcmVcIiAkU09VUkNFLyogXCIkREVTVElOQVRJT05c IlxuZmkiOworCQl9OwogCQkzNzEzRjAyMzE0MjkwNjNEMDAzNjM4N0YgLyogQ2hlY2sgRm9yIElu YXBwcm9wcmlhdGUgT2JqZWN0aXZlLUMgQ2xhc3MgTmFtZXMgKi8gPSB7CiAJCQlpc2EgPSBQQlhT aGVsbFNjcmlwdEJ1aWxkUGhhc2U7CiAJCQlidWlsZEFjdGlvbk1hc2sgPSAyMTQ3NDgzNjQ3Owo= 332624 2018-01-29 20:13:57 -0800 2018-01-29 20:44:07 -0800 Patch bug-182268-20180129201356.patch text/plain 4211 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjI3NzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ1NTkyNDUxMGVkMDEyOTlh YjU4OThjMjIxMzMzMTA4MDA5ZTgwYjMuLjMwOGE3ZTRiNjA2NjQxNDBkODVmYmZhODZiOWJmZDZk OWY2NDlkZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTgtMDEtMjkgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGEgYnVpbGQgc3Rl cCB0byBjb3B5IHJlc291cmNlcyBmcm9tIFdlYktpdEFkZGl0aW9ucyBhcyBidW5kbGUgcmVzb3Vy Y2VzIGluIFdlYktpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTgyMjY4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNzAwMzc4ND4KKworICAgICAg ICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uIGFuZCBEYW4gQmVybnN0ZWluLgorCisgICAgICAgIEFk ZHMgYSAiQ29weSBBZGRpdGlvbmFsIFJlc291cmNlcyIgcGhhc2Ugd2hlbiBidWlsZGluZyBXZWJL aXQuIFRoaXMgcGhhc2UgY29waWVzIHJlc291cmNlcyBmcm9tCisgICAgICAgIHVzci9sb2NhbC9p bmNsdWRlL1dlYktpdEFkZGl0aW9ucy9XZWJLaXQvQWRkaXRpb25hbFJlc291cmNlcyBpbiB0aGUg YnVpbGQgZGlyZWN0b3J5IGludG8gdGhlCisgICAgICAgIHVubG9jYWxpemVkIHJlc291cmNlcyBk aXJlY3RvcnkuIElmIHRoZSBBZGRpdGlvbmFsUmVzb3VyY2VzIGRpcmVjdG9yeSBkb2VzIG5vdCBl eGlzdCBpbiB0aGUgYnVpbGQKKyAgICAgICAgZGlyZWN0b3J5LCB3ZSBmYWxsIGJhY2sgdG8gc2Vh cmNoaW5nIHRoZSBTREsuCisKKyAgICAgICAgKiBXZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvajoKKwogMjAxOC0wMS0yOSAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAg ICAgICAgW2lPU10gUmVzdHJpY3Qgc3ludGhldGljIGNsaWNrcyB0byB0aGUgb3JpZ2luIHRoYXQg aGFuZGxlZCB0aGUgdW5kZXJseWluZyB0b3VjaCBldmVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXQvV2Vi S2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggNDk2MDQ0MmZkNTczODBkMWNlOGE1 MDQ1OGIwYTAzMzIxOGFmNDE2Yi4uNjUzYWI0MjI2NTQwMTc4NDk2MDNkZTc0MTliMjAwYTM2ZDg1 OTkwNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qCkBAIC00NzQ1LDEyICs0NzQ1LDEyIEBACiAJCQkJQkM4MjgzRjkxNkI0RkRERTAwQTI3OEZF IC8qIGNvbS5hcHBsZS5XZWJLaXQuUGx1Z2luLjMyLnhwYyAqLywKIAkJCQlCQzgyODQxRjE2QjRG REY2MDBBMjc4RkUgLyogY29tLmFwcGxlLldlYktpdC5QbHVnaW4uNjQueHBjICovLAogCQkJCTUx RjdEQzRBMTgwQ0M5MzYwMDIxMkNBMyAvKiBjb20uYXBwbGUuV2ViS2l0LlN0b3JhZ2UueHBjICov LAorCQkJCTM3MkVCQjQ2MjAxN0U2NDMwMDA4NTA2NCAvKiBjb20uYXBwbGUuV2ViS2l0LldlYkNv bnRlbnQuRGV2ZWxvcG1lbnQueHBjICovLAogCQkJCUJDM0RFNDY2MTVBOTE3NjMwMDhEMjZGQyAv KiBjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQueHBjICovLAogCQkJCTFBQzI1RkIwMTJBNDhF QTcwMEJEMjY3MSAvKiBQbHVnaW5Qcm9jZXNzU2hpbS5keWxpYiAqLywKIAkJCQk1MTAwMzFGNjEz NzlDQUNCMDBDOERGRTQgLyogU2VjSXRlbVNoaW0uZHlsaWIgKi8sCiAJCQkJOERDMkVGNUIwNDg2 QTY5NDAwOThCMjE2IC8qIFdlYktpdC5mcmFtZXdvcmsgKi8sCiAJCQkJQ0RDMzgzMDYxNzIxMTc5 OTAwOEEyRkMzIC8qIFdlYlByb2Nlc3NTaGltLmR5bGliICovLAotCQkJCTM3MkVCQjQ2MjAxN0U2 NDMwMDA4NTA2NCAvKiBjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQuRGV2ZWxvcG1lbnQueHBj ICovLAogCQkJKTsKIAkJCW5hbWUgPSBQcm9kdWN0czsKIAkJCXNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7CkBAIC00OTc5LDggKzQ5NzksOCBAQAogCQkJCTFBNEY5NzZFMTAwRTdCNjYwMDYzN0ExOCAv KiBWZXJzaW9uLnhjY29uZmlnICovLAogCQkJCTdDMEJCOUE4MThEQ0RFODkwMDA2QzA4NiAvKiBX ZWJDb250ZW50LWlPUy5lbnRpdGxlbWVudHMgKi8sCiAJCQkJMzdCNDE4RUIxQzk2MjRGMjAwMzFF NjNCIC8qIFdlYkNvbnRlbnQtT1NYLmVudGl0bGVtZW50cyAqLywKLQkJCQlCQ0FDQzQwRTE2QjBC OEE4MDBCNkUwOTIgLyogV2ViQ29udGVudFNlcnZpY2UueGNjb25maWcgKi8sCiAJCQkJMzcyRUJC NEEyMDE3RTc2MDAwMDg1MDY0IC8qIFdlYkNvbnRlbnRTZXJ2aWNlLkRldmVsb3BtZW50LnhjY29u ZmlnICovLAorCQkJCUJDQUNDNDBFMTZCMEI4QTgwMEI2RTA5MiAvKiBXZWJDb250ZW50U2Vydmlj ZS54Y2NvbmZpZyAqLywKIAkJCQlCQ0I4NkY0QjExNkFBQUNEMDBDRTIwQjcgLyogV2ViS2l0Lnhj Y29uZmlnICovLAogCQkJCUExRUREMkREMTg4NEI5RTMwMEJCRkU5OCAvKiBXZWJQcm9jZXNzU2hp bS54Y2NvbmZpZyAqLywKIAkJCSk7CkBAIC05NzAxLDYgKzk3MDEsNyBAQAogCQkJCTM3NUEyNDg4 MTdFNTA0OEUwMEM5QTA4NiAvKiBQb3N0cHJvY2VzcyBXS0Jhc2UuaCAqLywKIAkJCQkxQUQ5OEVD RjE5MUQ4NjczMDBDQUE2REYgLyogUG9zdHByb2Nlc3MgV0tGb3VuZGF0aW9uLmggKi8sCiAJCQkJ MUExRDIxMTUxOTFEOTYzODAwMDE2MTlGIC8qIFBvc3Rwcm9jZXNzIEZyYW1ld29yayBIZWFkZXJz ICovLAorCQkJCTJFMTZCNkY0MjAxOUJDMjUwMDg5OTZENiAvKiBDb3B5IEFkZGl0aW9uYWwgUmVz b3VyY2VzICovLAogCQkJCThEQzJFRjUyMDQ4NkE2OTQwMDk4QjIxNiAvKiBSZXNvdXJjZXMgKi8s CiAJCQkJMzcyNTg5NDMxQzFFNDk2ODAwQzkyQ0E5IC8qIENvcHkgU2hpbXMgKi8sCiAJCQkJN0NC MTZGRUUxNzI0QkEwNTAwN0EwQTk1IC8qIENvcHkgUGx1Zy1pbiBTYW5kYm94IFByb2ZpbGVzICov LApAQCAtMTAwMTAsNiArMTAwMTEsMTYgQEAKIAkJCXNoZWxsUGF0aCA9IC9iaW4vc2g7CiAJCQlz aGVsbFNjcmlwdCA9ICIjIFRvdWNoIEluZm8ucGxpc3QgdG8gbGV0IFhjb2RlIGtub3cgaXQgbmVl ZHMgdG8gY29weSBpdCBpbnRvIHRoZSBidWlsdCBwcm9kdWN0XG5pZiBbWyBcIiR7Q09ORklHVVJB VElPTn1cIiAhPSBcIlByb2R1Y3Rpb25cIiBdXTsgdGhlblxudG91Y2ggXCIke1BST0pFQ1RfRElS fS9JbmZvLnBsaXN0XCI7XG5maTtcbiI7CiAJCX07CisJCTJFMTZCNkY0MjAxOUJDMjUwMDg5OTZE NiAvKiBDb3B5IEFkZGl0aW9uYWwgUmVzb3VyY2VzICovID0geworCQkJaXNhID0gUEJYU2hlbGxT Y3JpcHRCdWlsZFBoYXNlOworCQkJYnVpbGRBY3Rpb25NYXNrID0gMTI7CisJCQlmaWxlcyA9ICgK KwkJCSk7CisJCQluYW1lID0gIkNvcHkgQWRkaXRpb25hbCBSZXNvdXJjZXMiOworCQkJcnVuT25s eUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CisJCQlzaGVsbFBhdGggPSAvYmluL3No OworCQkJc2hlbGxTY3JpcHQgPSAic2V0IC1lXG5cblJFTEFUSVZFX1NPVVJDRV9QQVRIPVwidXNy L2xvY2FsL2luY2x1ZGUvV2ViS2l0QWRkaXRpb25zL1dlYktpdC9BZGRpdGlvbmFsUmVzb3VyY2Vz XCJcblNPVVJDRV9QQVRIPVwiJEJVSUxUX1BST0RVQ1RTX0RJUi8kUkVMQVRJVkVfU09VUkNFX1BB VEhcIlxuXG5pZiBbWyAhIC1kIFwiJFNPVVJDRV9QQVRIXCIgXV07IHRoZW5cbiAgICBTT1VSQ0Vf UEFUSD1cIiRTREtfRElSLyRSRUxBVElWRV9TT1VSQ0VfUEFUSFwiXG5maVxuXG5pZiBbWyAtZCBc IiRTT1VSQ0VfUEFUSFwiIF1dOyB0aGVuXG4gICAgZGl0dG8gJFNPVVJDRV9QQVRILyogXCIkQlVJ TFRfUFJPRFVDVFNfRElSLyRVTkxPQ0FMSVpFRF9SRVNPVVJDRVNfRk9MREVSX1BBVEhcIlxuZmki OworCQl9OwogCQkzNzEzRjAyMzE0MjkwNjNEMDAzNjM4N0YgLyogQ2hlY2sgRm9yIEluYXBwcm9w cmlhdGUgT2JqZWN0aXZlLUMgQ2xhc3MgTmFtZXMgKi8gPSB7CiAJCQlpc2EgPSBQQlhTaGVsbFNj cmlwdEJ1aWxkUGhhc2U7CiAJCQlidWlsZEFjdGlvbk1hc2sgPSAyMTQ3NDgzNjQ3Owo= 332627 2018-01-29 21:00:57 -0800 2018-01-29 21:36:42 -0800 Patch for landing bug-182268-20180129210056.patch text/plain 4209 wenson_hsieh U3VidmVyc2lvbiBSZXZpc2lvbjogMjI3NzYwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGQ1NTkyNDUxMGVkMDEyOTlh YjU4OThjMjIxMzMzMTA4MDA5ZTgwYjMuLjMwOGE3ZTRiNjA2NjQxNDBkODVmYmZhODZiOWJmZDZk OWY2NDlkZDAgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMTgtMDEtMjkgIFdlbnNvbiBI c2llaCAgPHdlbnNvbl9oc2llaEBhcHBsZS5jb20+CisKKyAgICAgICAgQWRkIGEgYnVpbGQgc3Rl cCB0byBjb3B5IHJlc291cmNlcyBmcm9tIFdlYktpdEFkZGl0aW9ucyBhcyBidW5kbGUgcmVzb3Vy Y2VzIGluIFdlYktpdAorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5j Z2k/aWQ9MTgyMjY4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zNzAwMzc4ND4KKworICAgICAg ICBSZXZpZXdlZCBieSBUaW0gSG9ydG9uIGFuZCBEYW4gQmVybnN0ZWluLgorCisgICAgICAgIEFk ZHMgYSAiQ29weSBBZGRpdGlvbmFsIFJlc291cmNlcyIgcGhhc2Ugd2hlbiBidWlsZGluZyBXZWJL aXQuIFRoaXMgcGhhc2UgY29waWVzIHJlc291cmNlcyBmcm9tCisgICAgICAgIHVzci9sb2NhbC9p bmNsdWRlL1dlYktpdEFkZGl0aW9ucy9XZWJLaXQvQWRkaXRpb25hbFJlc291cmNlcyBpbiB0aGUg YnVpbGQgZGlyZWN0b3J5IGludG8gdGhlCisgICAgICAgIHVubG9jYWxpemVkIHJlc291cmNlcyBk aXJlY3RvcnkuIElmIHRoZSBBZGRpdGlvbmFsUmVzb3VyY2VzIGRpcmVjdG9yeSBkb2VzIG5vdCBl eGlzdCBpbiB0aGUgYnVpbGQKKyAgICAgICAgZGlyZWN0b3J5LCB3ZSBmYWxsIGJhY2sgdG8gc2Vh cmNoaW5nIHRoZSBTREsuCisKKyAgICAgICAgKiBXZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4 cHJvajoKKwogMjAxOC0wMS0yOSAgQW5keSBFc3RlcyAgPGFlc3Rlc0BhcHBsZS5jb20+CiAKICAg ICAgICAgW2lPU10gUmVzdHJpY3Qgc3ludGhldGljIGNsaWNrcyB0byB0aGUgb3JpZ2luIHRoYXQg aGFuZGxlZCB0aGUgdW5kZXJseWluZyB0b3VjaCBldmVudApkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9XZWJLaXQvV2Vi S2l0Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggNDk2MDQ0MmZkNTczODBkMWNlOGE1 MDQ1OGIwYTAzMzIxOGFmNDE2Yi4uNWFjNDk2NGE5N2I2NDE1MTYzYmYwMDlmNGNlZDA0NTg1NTM4 ZDY4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9XZWJLaXQueGNvZGVwcm9qL3Byb2plY3Qu cGJ4cHJvagorKysgYi9Tb3VyY2UvV2ViS2l0L1dlYktpdC54Y29kZXByb2ovcHJvamVjdC5wYnhw cm9qCkBAIC00NzQ1LDEyICs0NzQ1LDEyIEBACiAJCQkJQkM4MjgzRjkxNkI0RkRERTAwQTI3OEZF IC8qIGNvbS5hcHBsZS5XZWJLaXQuUGx1Z2luLjMyLnhwYyAqLywKIAkJCQlCQzgyODQxRjE2QjRG REY2MDBBMjc4RkUgLyogY29tLmFwcGxlLldlYktpdC5QbHVnaW4uNjQueHBjICovLAogCQkJCTUx RjdEQzRBMTgwQ0M5MzYwMDIxMkNBMyAvKiBjb20uYXBwbGUuV2ViS2l0LlN0b3JhZ2UueHBjICov LAorCQkJCTM3MkVCQjQ2MjAxN0U2NDMwMDA4NTA2NCAvKiBjb20uYXBwbGUuV2ViS2l0LldlYkNv bnRlbnQuRGV2ZWxvcG1lbnQueHBjICovLAogCQkJCUJDM0RFNDY2MTVBOTE3NjMwMDhEMjZGQyAv KiBjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQueHBjICovLAogCQkJCTFBQzI1RkIwMTJBNDhF QTcwMEJEMjY3MSAvKiBQbHVnaW5Qcm9jZXNzU2hpbS5keWxpYiAqLywKIAkJCQk1MTAwMzFGNjEz NzlDQUNCMDBDOERGRTQgLyogU2VjSXRlbVNoaW0uZHlsaWIgKi8sCiAJCQkJOERDMkVGNUIwNDg2 QTY5NDAwOThCMjE2IC8qIFdlYktpdC5mcmFtZXdvcmsgKi8sCiAJCQkJQ0RDMzgzMDYxNzIxMTc5 OTAwOEEyRkMzIC8qIFdlYlByb2Nlc3NTaGltLmR5bGliICovLAotCQkJCTM3MkVCQjQ2MjAxN0U2 NDMwMDA4NTA2NCAvKiBjb20uYXBwbGUuV2ViS2l0LldlYkNvbnRlbnQuRGV2ZWxvcG1lbnQueHBj ICovLAogCQkJKTsKIAkJCW5hbWUgPSBQcm9kdWN0czsKIAkJCXNvdXJjZVRyZWUgPSAiPGdyb3Vw PiI7CkBAIC00OTc5LDggKzQ5NzksOCBAQAogCQkJCTFBNEY5NzZFMTAwRTdCNjYwMDYzN0ExOCAv KiBWZXJzaW9uLnhjY29uZmlnICovLAogCQkJCTdDMEJCOUE4MThEQ0RFODkwMDA2QzA4NiAvKiBX ZWJDb250ZW50LWlPUy5lbnRpdGxlbWVudHMgKi8sCiAJCQkJMzdCNDE4RUIxQzk2MjRGMjAwMzFF NjNCIC8qIFdlYkNvbnRlbnQtT1NYLmVudGl0bGVtZW50cyAqLywKLQkJCQlCQ0FDQzQwRTE2QjBC OEE4MDBCNkUwOTIgLyogV2ViQ29udGVudFNlcnZpY2UueGNjb25maWcgKi8sCiAJCQkJMzcyRUJC NEEyMDE3RTc2MDAwMDg1MDY0IC8qIFdlYkNvbnRlbnRTZXJ2aWNlLkRldmVsb3BtZW50LnhjY29u ZmlnICovLAorCQkJCUJDQUNDNDBFMTZCMEI4QTgwMEI2RTA5MiAvKiBXZWJDb250ZW50U2Vydmlj ZS54Y2NvbmZpZyAqLywKIAkJCQlCQ0I4NkY0QjExNkFBQUNEMDBDRTIwQjcgLyogV2ViS2l0Lnhj Y29uZmlnICovLAogCQkJCUExRUREMkREMTg4NEI5RTMwMEJCRkU5OCAvKiBXZWJQcm9jZXNzU2hp bS54Y2NvbmZpZyAqLywKIAkJCSk7CkBAIC05NzAxLDYgKzk3MDEsNyBAQAogCQkJCTM3NUEyNDg4 MTdFNTA0OEUwMEM5QTA4NiAvKiBQb3N0cHJvY2VzcyBXS0Jhc2UuaCAqLywKIAkJCQkxQUQ5OEVD RjE5MUQ4NjczMDBDQUE2REYgLyogUG9zdHByb2Nlc3MgV0tGb3VuZGF0aW9uLmggKi8sCiAJCQkJ MUExRDIxMTUxOTFEOTYzODAwMDE2MTlGIC8qIFBvc3Rwcm9jZXNzIEZyYW1ld29yayBIZWFkZXJz ICovLAorCQkJCTJFMTZCNkY0MjAxOUJDMjUwMDg5OTZENiAvKiBDb3B5IEFkZGl0aW9uYWwgUmVz b3VyY2VzICovLAogCQkJCThEQzJFRjUyMDQ4NkE2OTQwMDk4QjIxNiAvKiBSZXNvdXJjZXMgKi8s CiAJCQkJMzcyNTg5NDMxQzFFNDk2ODAwQzkyQ0E5IC8qIENvcHkgU2hpbXMgKi8sCiAJCQkJN0NC MTZGRUUxNzI0QkEwNTAwN0EwQTk1IC8qIENvcHkgUGx1Zy1pbiBTYW5kYm94IFByb2ZpbGVzICov LApAQCAtMTAwMTAsNiArMTAwMTEsMTYgQEAKIAkJCXNoZWxsUGF0aCA9IC9iaW4vc2g7CiAJCQlz aGVsbFNjcmlwdCA9ICIjIFRvdWNoIEluZm8ucGxpc3QgdG8gbGV0IFhjb2RlIGtub3cgaXQgbmVl ZHMgdG8gY29weSBpdCBpbnRvIHRoZSBidWlsdCBwcm9kdWN0XG5pZiBbWyBcIiR7Q09ORklHVVJB VElPTn1cIiAhPSBcIlByb2R1Y3Rpb25cIiBdXTsgdGhlblxudG91Y2ggXCIke1BST0pFQ1RfRElS fS9JbmZvLnBsaXN0XCI7XG5maTtcbiI7CiAJCX07CisJCTJFMTZCNkY0MjAxOUJDMjUwMDg5OTZE NiAvKiBDb3B5IEFkZGl0aW9uYWwgUmVzb3VyY2VzICovID0geworCQkJaXNhID0gUEJYU2hlbGxT Y3JpcHRCdWlsZFBoYXNlOworCQkJYnVpbGRBY3Rpb25NYXNrID0gMTI7CisJCQlmaWxlcyA9ICgK KwkJCSk7CisJCQluYW1lID0gIkNvcHkgQWRkaXRpb25hbCBSZXNvdXJjZXMiOworCQkJcnVuT25s eUZvckRlcGxveW1lbnRQb3N0cHJvY2Vzc2luZyA9IDA7CisJCQlzaGVsbFBhdGggPSAvYmluL3No OworCQkJc2hlbGxTY3JpcHQgPSAic2V0IC1lXG5cblJFTEFUSVZFX1NPVVJDRV9QQVRIPVwidXNy L2xvY2FsL2luY2x1ZGUvV2ViS2l0QWRkaXRpb25zL1dlYktpdC9BZGRpdGlvbmFsUmVzb3VyY2Vz XCJcblNPVVJDRV9QQVRIPVwiJEJVSUxUX1BST0RVQ1RTX0RJUi8kUkVMQVRJVkVfU09VUkNFX1BB VEhcIlxuXG5pZiBbWyAhIC1kIFwiJFNPVVJDRV9QQVRIXCIgXV07IHRoZW5cbiAgICBTT1VSQ0Vf UEFUSD1cIiRTREtfRElSLyRSRUxBVElWRV9TT1VSQ0VfUEFUSFwiXG5maVxuXG5pZiBbWyAtZCBc IiRTT1VSQ0VfUEFUSFwiIF1dOyB0aGVuXG4gICAgZGl0dG8gJFNPVVJDRV9QQVRIIFwiJEJVSUxU X1BST0RVQ1RTX0RJUi8kVU5MT0NBTElaRURfUkVTT1VSQ0VTX0ZPTERFUl9QQVRIXCJcbmZpIjsK KwkJfTsKIAkJMzcxM0YwMjMxNDI5MDYzRDAwMzYzODdGIC8qIENoZWNrIEZvciBJbmFwcHJvcHJp YXRlIE9iamVjdGl2ZS1DIENsYXNzIE5hbWVzICovID0gewogCQkJaXNhID0gUEJYU2hlbGxTY3Jp cHRCdWlsZFBoYXNlOwogCQkJYnVpbGRBY3Rpb25NYXNrID0gMjE0NzQ4MzY0NzsK