220951 2021-01-25 15:00:52 -0800 REGRESSION(r269309): [Cocoa] RemoteInspectorCocoa files are being compiled twice 2022-03-01 02:25:46 -0800 1 1 1 Unclassified WebKit Web Inspector WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Normal --- 1 bburg bburg annulen bburg don.olmstead ews-watchlist gyuyoung.kim hi inspector-bugzilla-changes joepeck keith_miller mark.lam msaboff ryuan.choi saam sergio simon.fraser tzagallo webkit-bug-importer oldest_to_newest 1722298 0 bburg 2021-01-25 15:00:52 -0800 Introduced in https://bugs.webkit.org/show_bug.cgi?id=218451 1722403 1 418373 bburg 2021-01-25 22:21:56 -0800 Created attachment 418373 Patch v1.0 1722517 2 don.olmstead 2021-01-26 08:20:06 -0800 Is there something special in the XCode projects that would make this file get picked up? If you look at the CMake code this file is only included for a JSCOnly build that enabled remote inspector on Apple platforms. https://github.com/WebKit/WebKit/blob/main/Source/JavaScriptCore/PlatformJSCOnly.cmake#L5 My preference would be to remove the files from the SourcesCocoa.txt and use the inspector/remote/SourcesCocoa.txt instead to support use of the Remote Inspector on JSCOnly. 1722518 3 bburg 2021-01-26 08:29:46 -0800 (In reply to Don Olmstead from comment #2) > Is there something special in the XCode projects that would make this file > get picked up? If you look at the CMake code this file is only included for > a JSCOnly build that enabled remote inspector on Apple platforms. > > https://github.com/WebKit/WebKit/blob/main/Source/JavaScriptCore/ > PlatformJSCOnly.cmake#L5 > > My preference would be to remove the files from the SourcesCocoa.txt and use > the inspector/remote/SourcesCocoa.txt instead to support use of the Remote > Inspector on JSCOnly. I wasn't aware that we maintained JSCOnly builds on Apple platforms. Does it actually work? There are no other places where we have >1 SourcesCocoa.txt per project. It seems likely to cause problems to do it differently in one place. Why can't the other Sources.txt in this directory become top-level? 1722532 4 don.olmstead 2021-01-26 08:57:37 -0800 (In reply to BJ Burg from comment #3) > (In reply to Don Olmstead from comment #2) > > Is there something special in the XCode projects that would make this file > > get picked up? If you look at the CMake code this file is only included for > > a JSCOnly build that enabled remote inspector on Apple platforms. > > > > https://github.com/WebKit/WebKit/blob/main/Source/JavaScriptCore/ > > PlatformJSCOnly.cmake#L5 > > > > My preference would be to remove the files from the SourcesCocoa.txt and use > > the inspector/remote/SourcesCocoa.txt instead to support use of the Remote > > Inspector on JSCOnly. > > I wasn't aware that we maintained JSCOnly builds on Apple platforms. Does it > actually work? I'm told by Yusuke that people working on WebKit do build an Apple JSCOnly build. > There are no other places where we have >1 SourcesCocoa.txt per project. It > seems likely to cause problems to do it differently in one place. > > Why can't the other Sources.txt in this directory become top-level? For ports using CMake there's a precedent to include ${PLATFORM}.cmake files which include a Sources${PLATFORM}.txt. So for example the PlayStation and Windows ports include a Curl.cmake. Look in https://github.com/WebKit/WebKit/tree/main/Source/WebCore/platform for more examples of this. There's a similar scenario at the JSC level around the remote inspector. A Socket implementation is used by WinCairo and PlayStation, while a GLib is used by WPE and GTK. The JSCOnly could use any of those but also the Cocoa one for Apple platforms which is why I split that file as well. So is my assumption correct that the xcode just searches for a SourcesCocoa.txt in the directory? If that's the case and had I known I would've removed the files from the root SourcesCocoa.txt in the previous patch. Also on Slack if you want a less async conversation. Saw you pinged me yesterday about this. 1722564 5 418434 don.olmstead 2021-01-26 10:02:03 -0800 Created attachment 418434 Speculative patch 1722567 6 418434 don.olmstead 2021-01-26 10:05:35 -0800 Comment on attachment 418434 Speculative patch View in context: https://bugs.webkit.org/attachment.cgi?id=418434&action=review Talked with Keith Miller to see if there was anything that would cause a SourcesCocoa.txt to get picked up into the build. He pointed me at a few things with the XCode build so here's my attempt to use the inspector/remote/SourcesCocoa.txt within the XCode build. > Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:11151 > "$(SRCROOT)/Scripts/generate-unified-sources.sh", > "$(SRCROOT)/Sources.txt", > "$(SRCROOT)/SourcesCocoa.txt", > + "$(SRCROOT)/inspector/remote/SourcesCocoa.txt", Added the dependency here. I don't have an XCode install so I couldn't add inspector/remote/SourcesCocoa.txt to the project where you could edit it. > Source/JavaScriptCore/Scripts/generate-unified-sources.sh:24 > if [ $# -eq 0 ]; then > - echo "Using unified source list files: Sources.txt, SourcesCocoa.txt" > + echo "Using unified source list files: Sources.txt, SourcesCocoa.txt, inspector/remote/SourcesCocoa.txt" > fi > > -/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" --derived-sources-path "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore" --source-tree-path "${SRCROOT}" --max-cpp-bundle-count ${UnifiedSourceCppFileCount} --max-obj-c-bundle-count ${UnifiedSourceMmFileCount} Sources.txt SourcesCocoa.txt "${ARGS[@]}" > /dev/null > +/usr/bin/env ruby "${BUILD_SCRIPTS_DIR}/generate-unified-source-bundles.rb" --derived-sources-path "${BUILT_PRODUCTS_DIR}/DerivedSources/JavaScriptCore" --source-tree-path "${SRCROOT}" --max-cpp-bundle-count ${UnifiedSourceCppFileCount} --max-obj-c-bundle-count ${UnifiedSourceMmFileCount} Sources.txt SourcesCocoa.txt inspector/remote/SourcesCocoa.txt "${ARGS[@]}" > /dev/null Added the inspector/remote/SourcesCocoa.txt file here. It was never referenced so I'm really not sure how the original patch would've resulted in the behavior you're seeing. 1724434 7 webkit-bug-importer 2021-02-01 15:01:15 -0800 <rdar://problem/73848263> 1724710 8 418434 bburg 2021-02-02 09:50:02 -0800 Comment on attachment 418434 Speculative patch Don's patch seems to pass Mac EWS, so let's proceed. (Win EWS redness is unrelated layout test failures) 1724711 9 ews-feeder 2021-02-02 09:50:53 -0800 Unable to find any modified ChangeLog in Attachment 418434 1724713 10 418373 bburg 2021-02-02 09:55:33 -0800 Comment on attachment 418373 Patch v1.0 Clearing flags from my patch, which isn't needed. 1724722 11 419021 bburg 2021-02-02 10:08:40 -0800 Created attachment 419021 Patch v1.1 (w/ Xcode project changes) 1724727 12 419021 don.olmstead 2021-02-02 10:12:23 -0800 Comment on attachment 419021 Patch v1.1 (w/ Xcode project changes) View in context: https://bugs.webkit.org/attachment.cgi?id=419021&action=review r=me with nit > Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:4338 > + 99A3273725C9CBEE00DA8CAF /* Cocoa.cmake */ = {isa = PBXFileReference; lastKnownFileType = text; path = Cocoa.cmake; sourceTree = "<group>"; }; You shouldn't need to add the .cmake to the xcode > Source/JavaScriptCore/JavaScriptCore.xcodeproj/project.pbxproj:8776 > + 99A3273725C9CBEE00DA8CAF /* Cocoa.cmake */, Ditto 1724757 13 bburg 2021-02-02 10:43:33 -0800 Committed r272222: <https://trac.webkit.org/changeset/272222> 418373 2021-01-25 22:21:56 -0800 2021-02-02 10:08:35 -0800 Patch v1.0 bug-220951-20210125222156.patch text/plain 3547 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjcxNzQ1CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 NTMxMzUxMDJlODBhNjI2ZTNhZWFlN2ZkNmNiYjFhMzdmZGZlOTBlLi40YmNiM2FjOWQ4MTVhYjI1 MzJmYzM1YzBlMGQ2YjAxZWJlZWUwNzRmIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAyMS0wMS0yNSAgQkogQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KKworICAg ICAgICBSRUdSRVNTSU9OKHIyNjkzMDkpOiBbQ29jb2FdIFJlbW90ZUluc3BlY3RvckNvY29hIGZp bGVzIGFyZSBiZWluZyBjb21waWxlZCB0d2ljZQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0 Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjIwOTUxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZ IChPT1BTISkuCisKKyAgICAgICAgVGhpcyBpcyByZWR1bmRhbnQgd2l0aCB0aGUgdG9wLWxldmVs IFNvdXJjZXNDb2NvYS50eHQsIGl0IGlzbid0IG5lZWRlZC4KKworICAgICAgICAqIGluc3BlY3Rv ci9yZW1vdGUvQ29jb2EuY21ha2U6IFJlbW92ZWQuCisgICAgICAgICogaW5zcGVjdG9yL3JlbW90 ZS9Tb3VyY2VzQ29jb2EudHh0OiBSZW1vdmVkLgorCiAyMDIxLTAxLTIxICBEZXZpbiBSb3Vzc28g IDxkcm91c3NvQGFwcGxlLmNvbT4KIAogICAgICAgICBbQXBwbGUgUGF5XSB1c2UgdGhlIGZpcnN0 IGl0ZW0gaW4gYHNoaXBwaW5nT3B0aW9uc2AgZXZlbiB3aGVuIGl0J3Mgbm90IGBzZWxlY3RlZGAK ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9pbnNwZWN0b3IvcmVtb3RlL0NvY29h LmNtYWtlIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvQ29jb2EuY21h a2UKZGVsZXRlZCBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IGQ1ZmUyOWE2ZDQ2NjJlZjczMDA3Yzcy NmViNzMzNTExNDgxYTM5YmIuLjAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL2luc3BlY3Rvci9yZW1vdGUvQ29jb2EuY21h a2UKKysrIC9kZXYvbnVsbApAQCAtMSwxMSArMCwwIEBACi1saXN0KEFQUEVORCBKYXZhU2NyaXB0 Q29yZV9VTklGSUVEX1NPVVJDRV9MSVNUX0ZJTEVTCi0gICAgImluc3BlY3Rvci9yZW1vdGUvU291 cmNlc0NvY29hLnR4dCIKLSkKLQotbGlzdChBUFBFTkQgSmF2YVNjcmlwdENvcmVfUFJJVkFURV9J TkNMVURFX0RJUkVDVE9SSUVTCi0gICAgIiR7SkFWQVNDUklQVENPUkVfRElSfS9pbnNwZWN0b3Iv cmVtb3RlL2NvY29hIgotKQotCi1saXN0KEFQUEVORCBKYXZhU2NyaXB0Q29yZV9QUklWQVRFX0ZS QU1FV09SS19IRUFERVJTCi0gICAgaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0 b3JYUENDb25uZWN0aW9uLmgKLSkKZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9p bnNwZWN0b3IvcmVtb3RlL1NvdXJjZXNDb2NvYS50eHQgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv aW5zcGVjdG9yL3JlbW90ZS9Tb3VyY2VzQ29jb2EudHh0CmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCBjMGJlZGU3OTdjMzE5NTgwMmJiOWRjMDljYzNlZjg0MzhkZDI4NTkyLi4wMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwCi0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0 Q29yZS9pbnNwZWN0b3IvcmVtb3RlL1NvdXJjZXNDb2NvYS50eHQKKysrIC9kZXYvbnVsbApAQCAt MSwzMSArMCwwIEBACi0vLyBDb3B5cmlnaHQgKEMpIDIwMTcgQXBwbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgotLy8KLS8vIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotLy8gbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0 dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCi0vLyBhcmUgbWV0Ogot Ly8gMS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92 ZSBjb3B5cmlnaHQKLS8vICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRo ZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KLS8vIDIuIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkg Zm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0Ci0vLyAgICBub3RpY2UsIHRo aXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhl Ci0vLyAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0 aCB0aGUgZGlzdHJpYnV0aW9uLgotLy8KLS8vIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkg QVBQTEUgSU5DLiBBTkQgSVRTIENPTlRSSUJVVE9SUyBgYEFTIElTJycKLS8vIEFORCBBTlkgRVhQ UkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRP LAotLy8gVEhFIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5F U1MgRk9SIEEgUEFSVElDVUxBUgotLy8gUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gSU4gTk8gRVZF TlQgU0hBTEwgQVBQTEUgSU5DLiBPUiBJVFMgQ09OVFJJQlVUT1JTCi0vLyBCRSBMSUFCTEUgRk9S IEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9S Ci0vLyBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRP LCBQUk9DVVJFTUVOVCBPRgotLy8gU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBP RiBVU0UsIERBVEEsIE9SIFBST0ZJVFM7IE9SIEJVU0lORVNTCi0vLyBJTlRFUlJVUFRJT04pIEhP V0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTgot Ly8gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdF TkNFIE9SIE9USEVSV0lTRSkKLS8vIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRSBP RiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YKLS8vIFRIRSBQT1NTSUJJTElUWSBP RiBTVUNIIERBTUFHRS4KLQotaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVBdXRvbWF0aW9uVGFyZ2V0 LmNwcAotaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVDb250cm9sbGFibGVUYXJnZXQuY3BwCi1pbnNw ZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rpb25UYXJnZXQuY3BwCi1pbnNwZWN0b3IvcmVtb3Rl L1JlbW90ZUluc3BlY3Rvci5jcHAKLQotaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVDb25u ZWN0aW9uVG9UYXJnZXRDb2NvYS5tbQotaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNw ZWN0b3JDb2NvYS5tbQotaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JYUEND b25uZWN0aW9uLm1tCg== 418434 2021-01-26 10:02:03 -0800 2021-02-02 10:08:37 -0800 Speculative patch bug-220951.diff text/plain 2632 don.olmstead ZGlmZiAtLWdpdCBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXBy b2ovcHJvamVjdC5wYnhwcm9qIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0phdmFTY3JpcHRDb3Jl Lnhjb2RlcHJvai9wcm9qZWN0LnBieHByb2oKaW5kZXggYmNlMDc3NDU5MjIyLi5mYTdjN2M5ZTFh NGIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29k ZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZhU2Ny aXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC0xMTE0OCw2ICsxMTE0OCw3IEBA CiAJCQkJIiQoU1JDUk9PVCkvU2NyaXB0cy9nZW5lcmF0ZS11bmlmaWVkLXNvdXJjZXMuc2giLAog CQkJCSIkKFNSQ1JPT1QpL1NvdXJjZXMudHh0IiwKIAkJCQkiJChTUkNST09UKS9Tb3VyY2VzQ29j b2EudHh0IiwKKwkJCQkiJChTUkNST09UKS9pbnNwZWN0b3IvcmVtb3RlL1NvdXJjZXNDb2NvYS50 eHQiLAogCQkJKTsKIAkJCW5hbWUgPSAiR2VuZXJhdGUgVW5pZmllZCBTb3VyY2VzIjsKIAkJCW91 dHB1dEZpbGVMaXN0UGF0aHMgPSAoCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv U2NyaXB0cy9nZW5lcmF0ZS11bmlmaWVkLXNvdXJjZXMuc2ggYi9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvU2NyaXB0cy9nZW5lcmF0ZS11bmlmaWVkLXNvdXJjZXMuc2gKaW5kZXggYjc2M2MyYTNiMGRm Li44ODUzM2ZmNzhlYzEgMTAwNzU1Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9TY3JpcHRz L2dlbmVyYXRlLXVuaWZpZWQtc291cmNlcy5zaAorKysgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUv U2NyaXB0cy9nZW5lcmF0ZS11bmlmaWVkLXNvdXJjZXMuc2gKQEAgLTE4LDcgKzE4LDcgQEAgVW5p ZmllZFNvdXJjZUNwcEZpbGVDb3VudD0xNDUKIFVuaWZpZWRTb3VyY2VNbUZpbGVDb3VudD01CiAK IGlmIFsgJCMgLWVxIDAgXTsgdGhlbgotICAgIGVjaG8gIlVzaW5nIHVuaWZpZWQgc291cmNlIGxp c3QgZmlsZXM6IFNvdXJjZXMudHh0LCBTb3VyY2VzQ29jb2EudHh0IgorICAgIGVjaG8gIlVzaW5n IHVuaWZpZWQgc291cmNlIGxpc3QgZmlsZXM6IFNvdXJjZXMudHh0LCBTb3VyY2VzQ29jb2EudHh0 LCBpbnNwZWN0b3IvcmVtb3RlL1NvdXJjZXNDb2NvYS50eHQiCiBmaQogCi0vdXNyL2Jpbi9lbnYg cnVieSAiJHtCVUlMRF9TQ1JJUFRTX0RJUn0vZ2VuZXJhdGUtdW5pZmllZC1zb3VyY2UtYnVuZGxl cy5yYiIgLS1kZXJpdmVkLXNvdXJjZXMtcGF0aCAiJHtCVUlMVF9QUk9EVUNUU19ESVJ9L0Rlcml2 ZWRTb3VyY2VzL0phdmFTY3JpcHRDb3JlIiAtLXNvdXJjZS10cmVlLXBhdGggIiR7U1JDUk9PVH0i IC0tbWF4LWNwcC1idW5kbGUtY291bnQgJHtVbmlmaWVkU291cmNlQ3BwRmlsZUNvdW50fSAtLW1h eC1vYmotYy1idW5kbGUtY291bnQgJHtVbmlmaWVkU291cmNlTW1GaWxlQ291bnR9IFNvdXJjZXMu dHh0IFNvdXJjZXNDb2NvYS50eHQgIiR7QVJHU1tAXX0iID4gL2Rldi9udWxsCisvdXNyL2Jpbi9l bnYgcnVieSAiJHtCVUlMRF9TQ1JJUFRTX0RJUn0vZ2VuZXJhdGUtdW5pZmllZC1zb3VyY2UtYnVu ZGxlcy5yYiIgLS1kZXJpdmVkLXNvdXJjZXMtcGF0aCAiJHtCVUlMVF9QUk9EVUNUU19ESVJ9L0Rl cml2ZWRTb3VyY2VzL0phdmFTY3JpcHRDb3JlIiAtLXNvdXJjZS10cmVlLXBhdGggIiR7U1JDUk9P VH0iIC0tbWF4LWNwcC1idW5kbGUtY291bnQgJHtVbmlmaWVkU291cmNlQ3BwRmlsZUNvdW50fSAt LW1heC1vYmotYy1idW5kbGUtY291bnQgJHtVbmlmaWVkU291cmNlTW1GaWxlQ291bnR9IFNvdXJj ZXMudHh0IFNvdXJjZXNDb2NvYS50eHQgaW5zcGVjdG9yL3JlbW90ZS9Tb3VyY2VzQ29jb2EudHh0 ICIke0FSR1NbQF19IiA+IC9kZXYvbnVsbApkaWZmIC0tZ2l0IGEvU291cmNlL0phdmFTY3JpcHRD b3JlL1NvdXJjZXNDb2NvYS50eHQgYi9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvU291cmNlc0NvY29h LnR4dAppbmRleCA3NjBhYTBjNDI1YmQuLmRjNWU4ZTIwZWE3YyAxMDA2NDQKLS0tIGEvU291cmNl L0phdmFTY3JpcHRDb3JlL1NvdXJjZXNDb2NvYS50eHQKKysrIGIvU291cmNlL0phdmFTY3JpcHRD b3JlL1NvdXJjZXNDb2NvYS50eHQKQEAgLTM0LDExICszNCw0IEBAIEFQSS9KU1ZpcnR1YWxNYWNo aW5lLm1tCiBBUEkvSlNXcmFwcGVyTWFwLm1tCiBBUEkvT2JqQ0NhbGxiYWNrRnVuY3Rpb24ubW0K IAotaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVBdXRvbWF0aW9uVGFyZ2V0LmNwcAotaW5zcGVjdG9y L3JlbW90ZS9SZW1vdGVDb250cm9sbGFibGVUYXJnZXQuY3BwCi1pbnNwZWN0b3IvcmVtb3RlL1Jl bW90ZUluc3BlY3Rpb25UYXJnZXQuY3BwCi1pbnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rv ci5jcHAKLQotaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVDb25uZWN0aW9uVG9UYXJnZXRD b2NvYS5tbQotaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JDb2NvYS5tbQot aW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JYUENDb25uZWN0aW9uLm1tCisv LyBVc2UgaW5zcGVjdG9yL3JlbW90ZS9Tb3VyY2VzQ29jb2EudHh0IGZvciBSZW1vdGUgSW5zcGVj dG9yIGZpbGVzCg== 419021 2021-02-02 10:08:40 -0800 2022-03-01 02:25:46 -0800 Patch v1.1 (w/ Xcode project changes) bug-220951-20210202100839.patch text/plain 6013 bburg U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyMjE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlw dENvcmUvQ2hhbmdlTG9nIGIvU291cmNlL0phdmFTY3JpcHRDb3JlL0NoYW5nZUxvZwppbmRleCA3 ZWZkYzg3ZTk1OTk1YjI2MjAzYmRmZTZmYmI0NjM2ZjNmOWI4OWUyLi41NTVjYjk3MDFkMzRhMGI1 ZmRjZDUxZGIzZWVkZjNlOTUyZmMyYTQwIDEwMDY0NAotLS0gYS9Tb3VyY2UvSmF2YVNjcmlwdENv cmUvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxOSBAQAorMjAyMS0wMi0wMiAgRG9uIE9sbXN0ZWFkIDxkb24ub2xtc3RlYWRAc29ueS5j b20+CisKKyAgICAgICAgUkVHUkVTU0lPTihyMjY5MzA5KTogW0NvY29hXSBSZW1vdGVJbnNwZWN0 b3JDb2NvYSBmaWxlcyBhcmUgYmVpbmcgY29tcGlsZWQgdHdpY2UKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMDk1MQorICAgICAgICA8cmRhcjovL3By b2JsZW0vNzM4NDgyNjM+CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQkogQnVyZy4KKworICAgICAg ICBSZWZhY3RvciBvdXIgU291cmNlc0NvY29hIGZpbGVzIGluIEphdmFTY3JpcHRDb3JlIHRvIGF2 b2lkIGRvdWJsZS1saXN0aW5nCisgICAgICAgIG9yIGRvdWJsZS1idWlsZGluZyByZW1vdGUgaW5z cGVjdGlvbi1yZWxhdGVkIGZpbGVzLiBQcm9wZXJseSB0cmFjaworICAgICAgICBpbnNwZWN0b3Iv cmVtb3RlL1NvdXJjZXNDb2NvYS50eHQgYXMgYSBidWlsZCBkZXBlbmRlbmN5LgorCisgICAgICAg ICogSmF2YVNjcmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvajoKKyAgICAgICAgKiBT Y3JpcHRzL2dlbmVyYXRlLXVuaWZpZWQtc291cmNlcy5zaDoKKyAgICAgICAgKiBTb3VyY2VzQ29j b2EudHh0OgorCiAyMDIxLTAyLTAyICBCSiBCdXJnICA8YmJ1cmdAYXBwbGUuY29tPgogCiAgICAg ICAgIFdlYiBJbnNwZWN0b3I6IGltcGxlbWVudCB0aGUgYmFzaWNzIGZvciBzaG93aW5nL2hpZGlu ZyBncmlkIG92ZXJsYXlzCmRpZmYgLS1naXQgYS9Tb3VyY2UvSmF2YVNjcmlwdENvcmUvSmF2YVNj cmlwdENvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvaiBiL1NvdXJjZS9KYXZhU2NyaXB0Q29y ZS9KYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCmluZGV4IGQ2MmE0ZjQ0 MWQ4OGQzYTEzODI5Y2Y2Y2ZmMmYxOWEyODZlMzM2NmUuLjYxNTg4Y2Y0MWIzMmI2MTAyMGEyNjE5 NWZhZjAwYjEzNzFhOTE3OWMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9KYXZh U2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCisrKyBiL1NvdXJjZS9KYXZhU2Ny aXB0Q29yZS9KYXZhU2NyaXB0Q29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCkBAIC00MzM1 LDYgKzQzMzUsOCBAQAogCQk5OTZCNzMxNTFCREEwNUFBMDAzMzFCODQgLyogQXJyYXlDb25zdHJ1 Y3Rvci5sdXQuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0 OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBwYXRoID0gQXJyYXlDb25zdHJ1 Y3Rvci5sdXQuaDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJOTk4RUQ2NzIxQkVENjU5 QTAwREQ4MDE3IC8qIFJlbW90ZUNvbnRyb2xsYWJsZVRhcmdldC5jcHAgKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3Vy Y2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBSZW1vdGVDb250cm9sbGFibGVUYXJnZXQuY3BwOyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk5OThFRDY3MzFCRUQ2NTlBMDBERDgwMTcgLyogUmVt b3RlQ29udHJvbGxhYmxlVGFyZ2V0LmggKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5jZTsgZmls ZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmMuaDsgcGF0aCA9 IFJlbW90ZUNvbnRyb2xsYWJsZVRhcmdldC5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9Owor CQk5OUEzMjczNzI1QzlDQkVFMDBEQThDQUYgLyogQ29jb2EuY21ha2UgKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0OyBwYXRoID0gQ29jb2EuY21h a2U7IHNvdXJjZVRyZWUgPSAiPGdyb3VwPiI7IH07CisJCTk5QTMyNzM4MjVDOUNCRUUwMERBOENB RiAvKiBTb3VyY2VzQ29jb2EudHh0ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGxhc3RL bm93bkZpbGVUeXBlID0gdGV4dDsgcGF0aCA9IFNvdXJjZXNDb2NvYS50eHQ7IHNvdXJjZVRyZWUg PSAiPGdyb3VwPiI7IH07CiAJCTk5REEwMDk5MUJENTk5MjcwMEY0NTc1QyAvKiBfX2luaXRfXy5w eSAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25v d25GaWxlVHlwZSA9IHRleHQuc2NyaXB0LnB5dGhvbjsgcGF0aCA9IF9faW5pdF9fLnB5OyBzb3Vy Y2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk5OURBMDA5QTFCRDU5OTI3MDBGNDU3NUMgLyogYnVp bHRpbnNfZ2VuZXJhdG9yLnB5ICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNv ZGluZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gdGV4dC5zY3JpcHQucHl0aG9uOyBwYXRoID0g YnVpbHRpbnNfZ2VuZXJhdG9yLnB5OyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQk5OURB MDA5QjFCRDU5OTI3MDBGNDU3NUMgLyogYnVpbHRpbnNfbW9kZWwucHkgKi8gPSB7aXNhID0gUEJY RmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSB0ZXh0 LnNjcmlwdC5weXRob247IHBhdGggPSBidWlsdGluc19tb2RlbC5weTsgc291cmNlVHJlZSA9ICI8 Z3JvdXA+IjsgfTsKQEAgLTg3NzEsNiArODc3Myw3IEBACiAJCQljaGlsZHJlbiA9ICgKIAkJCQk3 QUNEREVDRjFFMjUyQUNBMDA5N0FGRUIgLyogY29jb2EgKi8sCiAJCQkJNTM2QjMxOUYxRjczNjlC RDAwMzdGQzMzIC8qIGdsaWIgKi8sCisJCQkJOTlBMzI3MzcyNUM5Q0JFRTAwREE4Q0FGIC8qIENv Y29hLmNtYWtlICovLAogCQkJCTk5MkFCQ0Y1MUJFQTk0Q0EwMDY0MDNBMCAvKiBSZW1vdGVBdXRv bWF0aW9uVGFyZ2V0LmNwcCAqLywKIAkJCQk5OTJBQkNGNjFCRUE5NENBMDA2NDAzQTAgLyogUmVt b3RlQXV0b21hdGlvblRhcmdldC5oICovLAogCQkJCUE1QkExNUU0MTgyMzQwQjMwMEE4MkU2OSAv KiBSZW1vdGVDb25uZWN0aW9uVG9UYXJnZXQuaCAqLywKQEAgLTg3ODEsNiArODc4NCw3IEBACiAJ CQkJOTk1NTY2ODUxRTRFOEIwNzAwQUFFMTNDIC8qIFJlbW90ZUluc3BlY3Rvci5jcHAgKi8sCiAJ CQkJQTVCQTE1RTExODIzNDBCMzAwQTgyRTY5IC8qIFJlbW90ZUluc3BlY3Rvci5oICovLAogCQkJ CUE1QkExNUUzMTgyMzQwQjMwMEE4MkU2OSAvKiBSZW1vdGVJbnNwZWN0b3JDb25zdGFudHMuaCAq LywKKwkJCQk5OUEzMjczODI1QzlDQkVFMDBEQThDQUYgLyogU291cmNlc0NvY29hLnR4dCAqLywK IAkJCSk7CiAJCQlwYXRoID0gcmVtb3RlOwogCQkJc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsKQEAg LTExMTU2LDYgKzExMTYwLDcgQEAKIAkJCQkiJChTUkNST09UKS9TY3JpcHRzL2dlbmVyYXRlLXVu aWZpZWQtc291cmNlcy5zaCIsCiAJCQkJIiQoU1JDUk9PVCkvU291cmNlcy50eHQiLAogCQkJCSIk KFNSQ1JPT1QpL1NvdXJjZXNDb2NvYS50eHQiLAorCQkJCSIkKFNSQ1JPT1QpL2luc3BlY3Rvci9y ZW1vdGUvU291cmNlc0NvY29hLnR4dCIsCiAJCQkpOwogCQkJbmFtZSA9ICJHZW5lcmF0ZSBVbmlm aWVkIFNvdXJjZXMiOwogCQkJb3V0cHV0RmlsZUxpc3RQYXRocyA9ICgKZGlmZiAtLWdpdCBhL1Nv dXJjZS9KYXZhU2NyaXB0Q29yZS9TY3JpcHRzL2dlbmVyYXRlLXVuaWZpZWQtc291cmNlcy5zaCBi L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9TY3JpcHRzL2dlbmVyYXRlLXVuaWZpZWQtc291cmNlcy5z aAppbmRleCBiNzYzYzJhM2IwZGY3ZmI1NTg2NzU0MWEyYjVmMzhkNzRlMzU4NGI2Li44ODUzM2Zm NzhlYzExZDIzNzUxMmQ0ODFkZmRhMTAyMDcwYTBiZGJkIDEwMDc1NQotLS0gYS9Tb3VyY2UvSmF2 YVNjcmlwdENvcmUvU2NyaXB0cy9nZW5lcmF0ZS11bmlmaWVkLXNvdXJjZXMuc2gKKysrIGIvU291 cmNlL0phdmFTY3JpcHRDb3JlL1NjcmlwdHMvZ2VuZXJhdGUtdW5pZmllZC1zb3VyY2VzLnNoCkBA IC0xOCw3ICsxOCw3IEBAIFVuaWZpZWRTb3VyY2VDcHBGaWxlQ291bnQ9MTQ1CiBVbmlmaWVkU291 cmNlTW1GaWxlQ291bnQ9NQogCiBpZiBbICQjIC1lcSAwIF07IHRoZW4KLSAgICBlY2hvICJVc2lu ZyB1bmlmaWVkIHNvdXJjZSBsaXN0IGZpbGVzOiBTb3VyY2VzLnR4dCwgU291cmNlc0NvY29hLnR4 dCIKKyAgICBlY2hvICJVc2luZyB1bmlmaWVkIHNvdXJjZSBsaXN0IGZpbGVzOiBTb3VyY2VzLnR4 dCwgU291cmNlc0NvY29hLnR4dCwgaW5zcGVjdG9yL3JlbW90ZS9Tb3VyY2VzQ29jb2EudHh0Igog ZmkKIAotL3Vzci9iaW4vZW52IHJ1YnkgIiR7QlVJTERfU0NSSVBUU19ESVJ9L2dlbmVyYXRlLXVu aWZpZWQtc291cmNlLWJ1bmRsZXMucmIiIC0tZGVyaXZlZC1zb3VyY2VzLXBhdGggIiR7QlVJTFRf UFJPRFVDVFNfRElSfS9EZXJpdmVkU291cmNlcy9KYXZhU2NyaXB0Q29yZSIgLS1zb3VyY2UtdHJl ZS1wYXRoICIke1NSQ1JPT1R9IiAtLW1heC1jcHAtYnVuZGxlLWNvdW50ICR7VW5pZmllZFNvdXJj ZUNwcEZpbGVDb3VudH0gLS1tYXgtb2JqLWMtYnVuZGxlLWNvdW50ICR7VW5pZmllZFNvdXJjZU1t RmlsZUNvdW50fSBTb3VyY2VzLnR4dCBTb3VyY2VzQ29jb2EudHh0ICIke0FSR1NbQF19IiA+IC9k ZXYvbnVsbAorL3Vzci9iaW4vZW52IHJ1YnkgIiR7QlVJTERfU0NSSVBUU19ESVJ9L2dlbmVyYXRl LXVuaWZpZWQtc291cmNlLWJ1bmRsZXMucmIiIC0tZGVyaXZlZC1zb3VyY2VzLXBhdGggIiR7QlVJ TFRfUFJPRFVDVFNfRElSfS9EZXJpdmVkU291cmNlcy9KYXZhU2NyaXB0Q29yZSIgLS1zb3VyY2Ut dHJlZS1wYXRoICIke1NSQ1JPT1R9IiAtLW1heC1jcHAtYnVuZGxlLWNvdW50ICR7VW5pZmllZFNv dXJjZUNwcEZpbGVDb3VudH0gLS1tYXgtb2JqLWMtYnVuZGxlLWNvdW50ICR7VW5pZmllZFNvdXJj ZU1tRmlsZUNvdW50fSBTb3VyY2VzLnR4dCBTb3VyY2VzQ29jb2EudHh0IGluc3BlY3Rvci9yZW1v dGUvU291cmNlc0NvY29hLnR4dCAiJHtBUkdTW0BdfSIgPiAvZGV2L251bGwKZGlmZiAtLWdpdCBh L1NvdXJjZS9KYXZhU2NyaXB0Q29yZS9Tb3VyY2VzQ29jb2EudHh0IGIvU291cmNlL0phdmFTY3Jp cHRDb3JlL1NvdXJjZXNDb2NvYS50eHQKaW5kZXggNzYwYWEwYzQyNWJkZWFjMTE4ZWQwYzVlNWE2 Yzc5ODM4Y2MxZmU5OC4uZGM1ZThlMjBlYTdjOTRlZDE0ZmQ5MDE4NmM0NGEzNzc1MDRiOWM0NiAx MDA2NDQKLS0tIGEvU291cmNlL0phdmFTY3JpcHRDb3JlL1NvdXJjZXNDb2NvYS50eHQKKysrIGIv U291cmNlL0phdmFTY3JpcHRDb3JlL1NvdXJjZXNDb2NvYS50eHQKQEAgLTM0LDExICszNCw0IEBA IEFQSS9KU1ZpcnR1YWxNYWNoaW5lLm1tCiBBUEkvSlNXcmFwcGVyTWFwLm1tCiBBUEkvT2JqQ0Nh bGxiYWNrRnVuY3Rpb24ubW0KIAotaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVBdXRvbWF0aW9uVGFy Z2V0LmNwcAotaW5zcGVjdG9yL3JlbW90ZS9SZW1vdGVDb250cm9sbGFibGVUYXJnZXQuY3BwCi1p bnNwZWN0b3IvcmVtb3RlL1JlbW90ZUluc3BlY3Rpb25UYXJnZXQuY3BwCi1pbnNwZWN0b3IvcmVt b3RlL1JlbW90ZUluc3BlY3Rvci5jcHAKLQotaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVD b25uZWN0aW9uVG9UYXJnZXRDb2NvYS5tbQotaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJ bnNwZWN0b3JDb2NvYS5tbQotaW5zcGVjdG9yL3JlbW90ZS9jb2NvYS9SZW1vdGVJbnNwZWN0b3JY UENDb25uZWN0aW9uLm1tCisvLyBVc2UgaW5zcGVjdG9yL3JlbW90ZS9Tb3VyY2VzQ29jb2EudHh0 IGZvciBSZW1vdGUgSW5zcGVjdG9yIGZpbGVzCg==