139974 2014-12-28 09:35:37 -0800 Don’t use AccessibilityAllInOne when building with Xcode 2014-12-31 11:03:33 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 mitz mitz darin mrowe oldest_to_newest 1058026 0 mitz 2014-12-28 09:35:37 -0800 Use of AccessibilityAllInOne in Xcode builds was introduced in <http://trac.webkit.org/r77878> to address bug 53681, an issue with 32-builds on Leopard. That’s no longer a supported configuration, so the all-in-one workaround shouldn’t be necessary anymore. 1058027 1 243782 mitz 2014-12-28 09:37:10 -0800 Created attachment 243782 Stop using AccessibilityAllInOne.cpp 1058028 2 mitz 2014-12-28 09:38:53 -0800 (The downside of using AccessibilityAllInOne.cpp is that any change in any file included by any of the 23 .cpp files it includes requires all 23 files to be recompiled). 1058039 3 243782 darin 2014-12-28 11:11:03 -0800 Comment on attachment 243782 Stop using AccessibilityAllInOne.cpp OK. Why? 1058040 4 darin 2014-12-28 11:11:19 -0800 Oh, I see why. 1058042 5 mitz 2014-12-28 11:29:27 -0800 Committed <http://trac.webkit.org/r177781>. 1058052 6 mitz 2014-12-28 13:01:09 -0800 (In reply to comment #5) > Committed <http://trac.webkit.org/r177781>. I reverted this change in <http://trac.webkit.org/r177784>, because it seems to have caused something like bug 139609 on iOS. I am going to attempt this again once the iOS issue is understood. 1058053 7 mitz 2014-12-28 13:03:57 -0800 (In reply to comment #6) > (In reply to comment #5) > > Committed <http://trac.webkit.org/r177781>. > > I reverted this change in <http://trac.webkit.org/r177784>, because it seems > to have caused something like bug 139609 on iOS. The issue on iOS turned out to be a configuration issue that is different from bug 139609. 1058269 8 mitz 2014-12-31 11:03:33 -0800 Committed <http://trac.webkit.org/r177834>. 243782 2014-12-28 09:37:10 -0800 2014-12-28 11:11:03 -0800 Stop using AccessibilityAllInOne.cpp bug-139974-20141228093712.patch text/plain 12026 mitz SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE3Nzc3OSkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDEzIEBACisyMDE0LTEyLTI4ICBEYW4gQmVy bnN0ZWluICA8bWl0ekBhcHBsZS5jb20+CisKKyAgICAgICAgRG9u4oCZdCB1c2UgQWNjZXNzaWJp bGl0eUFsbEluT25lIHdoZW4gYnVpbGRpbmcgd2l0aCBYY29kZQorICAgICAgICBodHRwczovL2J1 Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM5OTc0CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBXZWJDb3JlLnhjb2RlcHJvai9wcm9qZWN0 LnBieHByb2o6IEFkZGVkIGFsbCBmaWxlcyBpbmNsdWRlZCBieSBBY2Nlc3NpYmlsaXR5QWxsSW5P bmUuY3BwCisgICAgICAgIHRvIHRoZSBXZWJDb3JlIHRhcmdldCwgYW5kIHJlbW92ZWQgQWNjZXNz aWJpbGl0eUFsbEluT25lLmNwcCBmcm9tIHRoZSBwcm9qZWN0LgorCiAyMDE0LTEyLTI2ICBBbmRy ZWFzIEtsaW5nICA8YWtsaW5nQGFwcGxlLmNvbT4KIAogICAgICAgICBQdXJnZSBQYXNzUmVmUHRy IGZyb20gRWxlbWVudCBhbmQgRWxlbWVudFJhcmVEYXRhLgpJbmRleDogU291cmNlL1dlYkNvcmUv V2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9X ZWJDb3JlL1dlYkNvcmUueGNvZGVwcm9qL3Byb2plY3QucGJ4cHJvagkocmV2aXNpb24gMTc3Nzc5 KQorKysgU291cmNlL1dlYkNvcmUvV2ViQ29yZS54Y29kZXByb2ovcHJvamVjdC5wYnhwcm9qCSh3 b3JraW5nIGNvcHkpCkBAIC00ODksNyArNDg5LDYgQEAKIAkJMEYxNURBOEEwRjNBQUVFNzAwMDBD RTQ3IC8qIEFuaW1hdGlvbkNvbnRyb2xsZXJQcml2YXRlLmggaW4gSGVhZGVycyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAwRjE1REE4OTBGM0FBRUU3MDAwMENFNDcgLyogQW5p bWF0aW9uQ29udHJvbGxlclByaXZhdGUuaCAqLzsgfTsKIAkJMEYxNzc0ODAxMzc4Qjc3MjAwOURB NzZBIC8qIFNjcm9sbEFuaW1hdG9ySU9TLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSAwRjE3NzQ3RTEzNzhCNzcxMDA5REE3NkEgLyogU2Nyb2xsQW5pbWF0 b3JJT1MuaCAqLzsgfTsKIAkJMEYxNzc0ODExMzc4Qjc3MjAwOURBNzZBIC8qIFNjcm9sbEFuaW1h dG9ySU9TLm1tIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0g MEYxNzc0N0YxMzc4Qjc3MjAwOURBNzZBIC8qIFNjcm9sbEFuaW1hdG9ySU9TLm1tICovOyB9Owot CQkwRjI5QzE2RTEzMDBDMkUyMDAyRDc5NEUgLyogQWNjZXNzaWJpbGl0eUFsbEluT25lLmNwcCBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDBGMjlDMTZEMTMw MEMyRTIwMDJENzk0RSAvKiBBY2Nlc3NpYmlsaXR5QWxsSW5PbmUuY3BwICovOyB9OwogCQkwRjND NzI1RTE5NzQ4NzRCMDBBRUREMEMgLyogSW1hZ2VTb3VyY2UuY3BwIGluIFNvdXJjZXMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEYzQzcyNUQxOTc0ODc0QjAwQUVERDBDIC8q IEltYWdlU291cmNlLmNwcCAqLzsgfTsKIAkJMEYzREQ0NEYxMkY1RUExQjAwMEQ5MTkwIC8qIFNo YWRvd0JsdXIuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVm ID0gMEYzREQ0NEQxMkY1RUExQjAwMEQ5MTkwIC8qIFNoYWRvd0JsdXIuY3BwICovOyB9OwogCQkw RjNERDQ1MDEyRjVFQTFCMDAwRDkxOTAgLyogU2hhZG93Qmx1ci5oIGluIEhlYWRlcnMgKi8gPSB7 aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMEYzREQ0NEUxMkY1RUExQjAwMEQ5MTkwIC8q IFNoYWRvd0JsdXIuaCAqLzsgfTsKQEAgLTEzODUsNiArMTM4NCwyOSBAQAogCQkzN0UzNTI0RDEy NDUwQzY2MDBCQUY1RDkgLyogSW5wdXRUeXBlLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhC dWlsZEZpbGU7IGZpbGVSZWYgPSAzN0UzNTI0QzEyNDUwQzY2MDBCQUY1RDkgLyogSW5wdXRUeXBl LmggKi87IHNldHRpbmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJMzdF NjU5NTAxNjNCMTBDMjAwRUI0NTc0IC8qIFNpbXBsZUZvbnREYXRhSU9TLm1tIGluIFNvdXJjZXMg Ki8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMzdFNjU5NEYxNjNCMTBDMjAwRUI0 NTc0IC8qIFNpbXBsZUZvbnREYXRhSU9TLm1tICovOyB9OwogCQkzN0Y1NjdDRTE2NTM1OEY0MDBE REU5MkIgLyogUG9wdXBPcGVuaW5nT2JzZXJ2ZXIuaCBpbiBIZWFkZXJzICovID0ge2lzYSA9IFBC WEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDM3NzJCMDk1MTY1MzU4NTYwMDBBNDlDQSAvKiBQb3B1cE9w ZW5pbmdPYnNlcnZlci5oICovOyBzZXR0aW5ncyA9IHtBVFRSSUJVVEVTID0gKFByaXZhdGUsICk7 IH07IH07CisJCTM3RjU3QUI5MUE1MDcyNjkwMDg3NkY5OCAvKiBBY2Nlc3NpYmlsaXR5QVJJQUdy aWQuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMjk4 MUNBOUQxMzE4MjJFQzAwRDEyRjJBIC8qIEFjY2Vzc2liaWxpdHlBUklBR3JpZC5jcHAgKi87IH07 CisJCTM3RjU3QUJBMUE1MDcyNkYwMDg3NkY5OCAvKiBBY2Nlc3NpYmlsaXR5QVJJQUdyaWRDZWxs LmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDI5ODFD QTlFMTMxODIyRUMwMEQxMkYyQSAvKiBBY2Nlc3NpYmlsaXR5QVJJQUdyaWRDZWxsLmNwcCAqLzsg fTsKKwkJMzdGNTdBQkIxQTUwNzI3MzAwODc2Rjk4IC8qIEFjY2Vzc2liaWxpdHlBUklBR3JpZFJv dy5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyOTgx Q0E5RjEzMTgyMkVDMDBEMTJGMkEgLyogQWNjZXNzaWJpbGl0eUFSSUFHcmlkUm93LmNwcCAqLzsg fTsKKwkJMzdGNTdBQkMxQTUwNzI3NzAwODc2Rjk4IC8qIEFjY2Vzc2liaWxpdHlJbWFnZU1hcExp bmsuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMjk4 MUNBQTAxMzE4MjJFQzAwRDEyRjJBIC8qIEFjY2Vzc2liaWxpdHlJbWFnZU1hcExpbmsuY3BwICov OyB9OworCQkzN0Y1N0FCRDFBNTA3MjdBMDA4NzZGOTggLyogQWNjZXNzaWJpbGl0eUxpc3QuY3Bw IGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMjk4MUNBQTEx MzE4MjJFQzAwRDEyRjJBIC8qIEFjY2Vzc2liaWxpdHlMaXN0LmNwcCAqLzsgfTsKKwkJMzdGNTdB QkUxQTUwNzI3RTAwODc2Rjk4IC8qIEFjY2Vzc2liaWxpdHlMaXN0Qm94LmNwcCBpbiBTb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDI5ODFDQUEyMTMxODIyRUMwMEQx MkYyQSAvKiBBY2Nlc3NpYmlsaXR5TGlzdEJveC5jcHAgKi87IH07CisJCTM3RjU3QUJGMUE1MDcy ODEwMDg3NkY5OCAvKiBBY2Nlc3NpYmlsaXR5TGlzdEJveE9wdGlvbi5jcHAgaW4gU291cmNlcyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyOTgxQ0FBMzEzMTgyMkVDMDBEMTJG MkEgLyogQWNjZXNzaWJpbGl0eUxpc3RCb3hPcHRpb24uY3BwICovOyB9OworCQkzN0Y1N0FDMDFB NTA3Mjg0MDA4NzZGOTggLyogQWNjZXNzaWJpbGl0eU1lZGlhQ29udHJvbHMuY3BwIGluIFNvdXJj ZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMjk4MUNBQTQxMzE4MjJFQzAw RDEyRjJBIC8qIEFjY2Vzc2liaWxpdHlNZWRpYUNvbnRyb2xzLmNwcCAqLzsgfTsKKwkJMzdGNTdB QzExQTUwNzI4NzAwODc2Rjk4IC8qIEFjY2Vzc2liaWxpdHlOb2RlT2JqZWN0LmNwcCBpbiBTb3Vy Y2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDI5ODU3MDkyMTVDQzUzMkQw MDYzNTVDRCAvKiBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAgKi87IH07CisJCTM3RjU3QUMy MUE1MDcyOEIwMDg3NkY5OCAvKiBBY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcCBpbiBTb3VyY2VzICov ID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDI5ODFDQUE1MTMxODIyRUMwMEQxMkYy QSAvKiBBY2Nlc3NpYmlsaXR5T2JqZWN0LmNwcCAqLzsgfTsKKwkJMzdGNTdBQzMxQTUwNzI4RjAw ODc2Rjk4IC8qIEFjY2Vzc2liaWxpdHlQcm9ncmVzc0luZGljYXRvci5jcHAgaW4gU291cmNlcyAq LyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSBBNDA5Qzk4MjExNkQwREREMDA3MTk3 QkQgLyogQWNjZXNzaWJpbGl0eVByb2dyZXNzSW5kaWNhdG9yLmNwcCAqLzsgfTsKKwkJMzdGNTdB QzQxQTUwNzI5MzAwODc2Rjk4IC8qIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwIGluIFNv dXJjZXMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMjk4MUNBQTYxMzE4MjJF QzAwRDEyRjJBIC8qIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3QuY3BwICovOyB9OworCQkzN0Y1 N0FDNTFBNTA3Mjk3MDA4NzZGOTggLyogQWNjZXNzaWJpbGl0eVNjcm9sbGJhci5jcHAgaW4gU291 cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyOTgxQ0FBNzEzMTgyMkVD MDBEMTJGMkEgLyogQWNjZXNzaWJpbGl0eVNjcm9sbGJhci5jcHAgKi87IH07CisJCTM3RjU3QUM2 MUE1MDcyOUIwMDg3NkY5OCAvKiBBY2Nlc3NpYmlsaXR5U2Nyb2xsVmlldy5jcHAgaW4gU291cmNl cyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyOTgxQ0FBODEzMTgyMkVDMDBE MTJGMkEgLyogQWNjZXNzaWJpbGl0eVNjcm9sbFZpZXcuY3BwICovOyB9OworCQkzN0Y1N0FDNzFB NTA3MkExMDA4NzZGOTggLyogQWNjZXNzaWJpbGl0eVNlYXJjaEZpZWxkQnV0dG9ucy5jcHAgaW4g U291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSA0MTVCM0E2OTE3Q0JF MTcyMDAwRkNDRTggLyogQWNjZXNzaWJpbGl0eVNlYXJjaEZpZWxkQnV0dG9ucy5jcHAgKi87IH07 CisJCTM3RjU3QUM4MUE1MDcyQkMwMDg3NkY5OCAvKiBBY2Nlc3NpYmlsaXR5U2xpZGVyLmNwcCBp biBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDI5ODFDQUE5MTMx ODIyRUMwMEQxMkYyQSAvKiBBY2Nlc3NpYmlsaXR5U2xpZGVyLmNwcCAqLzsgfTsKKwkJMzdGNTdB QzkxQTUwNzJDQzAwODc2Rjk4IC8qIEFjY2Vzc2liaWxpdHlTVkdSb290LmNwcCBpbiBTb3VyY2Vz ICovID0ge2lzYSA9IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IEFBQzA4Q0YwMTVGOTQxRkMwMEYx RTE4OCAvKiBBY2Nlc3NpYmlsaXR5U1ZHUm9vdC5jcHAgKi87IH07CisJCTM3RjU3QUNBMUE1MDcy Q0YwMDg3NkY5OCAvKiBBY2Nlc3NpYmlsaXR5VGFibGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNh ID0gUEJYQnVpbGRGaWxlOyBmaWxlUmVmID0gMjk4MUNBQUExMzE4MjJFQzAwRDEyRjJBIC8qIEFj Y2Vzc2liaWxpdHlUYWJsZS5jcHAgKi87IH07CisJCTM3RjU3QUNCMUE1MDcyRDEwMDg3NkY5OCAv KiBBY2Nlc3NpYmlsaXR5VGFibGVDZWxsLmNwcCBpbiBTb3VyY2VzICovID0ge2lzYSA9IFBCWEJ1 aWxkRmlsZTsgZmlsZVJlZiA9IDI5ODFDQUFCMTMxODIyRUMwMEQxMkYyQSAvKiBBY2Nlc3NpYmls aXR5VGFibGVDZWxsLmNwcCAqLzsgfTsKKwkJMzdGNTdBQ0MxQTUwNzJENTAwODc2Rjk4IC8qIEFj Y2Vzc2liaWxpdHlUYWJsZUNvbHVtbi5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2EgPSBQQlhCdWls ZEZpbGU7IGZpbGVSZWYgPSAyOTgxQ0FBQzEzMTgyMkVDMDBEMTJGMkEgLyogQWNjZXNzaWJpbGl0 eVRhYmxlQ29sdW1uLmNwcCAqLzsgfTsKKwkJMzdGNTdBQ0QxQTUwNzJENzAwODc2Rjk4IC8qIEFj Y2Vzc2liaWxpdHlUYWJsZUhlYWRlckNvbnRhaW5lci5jcHAgaW4gU291cmNlcyAqLyA9IHtpc2Eg PSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyOTgxQ0FBRDEzMTgyMkVDMDBEMTJGMkEgLyogQWNj ZXNzaWJpbGl0eVRhYmxlSGVhZGVyQ29udGFpbmVyLmNwcCAqLzsgfTsKKwkJMzdGNTdBQ0UxQTUw NzJEQTAwODc2Rjk4IC8qIEFjY2Vzc2liaWxpdHlUYWJsZVJvdy5jcHAgaW4gU291cmNlcyAqLyA9 IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAyOTgxQ0FBRTEzMTgyMkVDMDBEMTJGMkEg LyogQWNjZXNzaWJpbGl0eVRhYmxlUm93LmNwcCAqLzsgfTsKKwkJMzdGNTdBQ0YxQTUwNzJERDAw ODc2Rjk4IC8qIEFYT2JqZWN0Q2FjaGUuY3BwIGluIFNvdXJjZXMgKi8gPSB7aXNhID0gUEJYQnVp bGRGaWxlOyBmaWxlUmVmID0gMjk4MUNBQUYxMzE4MjJFQzAwRDEyRjJBIC8qIEFYT2JqZWN0Q2Fj aGUuY3BwICovOyB9OwogCQkzN0Y4MThGRDBENjU3NjA2MDA1RTFGMDUgLyogV2ViQ29yZVVSTFJl c3BvbnNlLmggaW4gSGVhZGVycyAqLyA9IHtpc2EgPSBQQlhCdWlsZEZpbGU7IGZpbGVSZWYgPSAz N0Y4MThGQjBENjU3NjA2MDA1RTFGMDUgLyogV2ViQ29yZVVSTFJlc3BvbnNlLmggKi87IHNldHRp bmdzID0ge0FUVFJJQlVURVMgPSAoUHJpdmF0ZSwgKTsgfTsgfTsKIAkJMzdGODE4RkUwRDY1NzYw NjAwNUUxRjA1IC8qIFdlYkNvcmVVUkxSZXNwb25zZS5tbSBpbiBTb3VyY2VzICovID0ge2lzYSA9 IFBCWEJ1aWxkRmlsZTsgZmlsZVJlZiA9IDM3RjgxOEZDMEQ2NTc2MDYwMDVFMUYwNSAvKiBXZWJD b3JlVVJMUmVzcG9uc2UubW0gKi87IH07CiAJCTM3RkQ0Mjk4MTE4MzY4NDYwMDkzQzAyOSAvKiBU cmVlRGVwdGhMaW1pdC5oIGluIEhlYWRlcnMgKi8gPSB7aXNhID0gUEJYQnVpbGRGaWxlOyBmaWxl UmVmID0gMzdGRDQyOTcxMTgzNjg0NjAwOTNDMDI5IC8qIFRyZWVEZXB0aExpbWl0LmggKi87IH07 CkBAIC03NDY3LDcgKzc0ODksNiBAQAogCQkwRjE1REE4OTBGM0FBRUU3MDAwMENFNDcgLyogQW5p bWF0aW9uQ29udHJvbGxlclByaXZhdGUuaCAqLyA9IHtpc2EgPSBQQlhGaWxlUmVmZXJlbmNlOyBm aWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJjZWNvZGUuYy5oOyBuYW1l ID0gQW5pbWF0aW9uQ29udHJvbGxlclByaXZhdGUuaDsgcGF0aCA9IGFuaW1hdGlvbi9BbmltYXRp b25Db250cm9sbGVyUHJpdmF0ZS5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkwRjE3 NzQ3RTEzNzhCNzcxMDA5REE3NkEgLyogU2Nyb2xsQW5pbWF0b3JJT1MuaCAqLyA9IHtpc2EgPSBQ QlhGaWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNv dXJjZWNvZGUuYy5oOyBuYW1lID0gU2Nyb2xsQW5pbWF0b3JJT1MuaDsgcGF0aCA9IGlvcy9TY3Jv bGxBbmltYXRvcklPUy5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkwRjE3NzQ3RjEz NzhCNzcyMDA5REE3NkEgLyogU2Nyb2xsQW5pbWF0b3JJT1MubW0gKi8gPSB7aXNhID0gUEJYRmls ZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vj b2RlLmNwcC5vYmpjcHA7IG5hbWUgPSBTY3JvbGxBbmltYXRvcklPUy5tbTsgcGF0aCA9IGlvcy9T Y3JvbGxBbmltYXRvcklPUy5tbTsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKLQkJMEYyOUMx NkQxMzAwQzJFMjAwMkQ3OTRFIC8qIEFjY2Vzc2liaWxpdHlBbGxJbk9uZS5jcHAgKi8gPSB7aXNh ID0gUEJYRmlsZVJlZmVyZW5jZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUg PSBzb3VyY2Vjb2RlLmNwcC5jcHA7IHBhdGggPSBBY2Nlc3NpYmlsaXR5QWxsSW5PbmUuY3BwOyBz b3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkwRjNDNzI1RDE5NzQ4NzRCMDBBRUREMEMgLyog SW1hZ2VTb3VyY2UuY3BwICovID0ge2lzYSA9IFBCWEZpbGVSZWZlcmVuY2U7IGZpbGVFbmNvZGlu ZyA9IDQ7IGxhc3RLbm93bkZpbGVUeXBlID0gc291cmNlY29kZS5jcHAuY3BwOyBwYXRoID0gSW1h Z2VTb3VyY2UuY3BwOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9OwogCQkwRjNERDQ0RDEyRjVF QTFCMDAwRDkxOTAgLyogU2hhZG93Qmx1ci5jcHAgKi8gPSB7aXNhID0gUEJYRmlsZVJlZmVyZW5j ZTsgZmlsZUVuY29kaW5nID0gNDsgbGFzdEtub3duRmlsZVR5cGUgPSBzb3VyY2Vjb2RlLmNwcC5j cHA7IHBhdGggPSBTaGFkb3dCbHVyLmNwcDsgc291cmNlVHJlZSA9ICI8Z3JvdXA+IjsgfTsKIAkJ MEYzREQ0NEUxMkY1RUExQjAwMEQ5MTkwIC8qIFNoYWRvd0JsdXIuaCAqLyA9IHtpc2EgPSBQQlhG aWxlUmVmZXJlbmNlOyBmaWxlRW5jb2RpbmcgPSA0OyBsYXN0S25vd25GaWxlVHlwZSA9IHNvdXJj ZWNvZGUuYy5oOyBwYXRoID0gU2hhZG93Qmx1ci5oOyBzb3VyY2VUcmVlID0gIjxncm91cD4iOyB9 OwpAQCAtMTU0MTEsNyArMTU0MzIsNiBAQAogCQkJY2hpbGRyZW4gPSAoCiAJCQkJQUFBNzI4RUYx NkQxRDhCQzAwRDNCQkM2IC8qIGlvcyAqLywKIAkJCQkyOUE4MTIwNTBGQkI5QjUyMDA1MTAyOTMg LyogbWFjICovLAotCQkJCTBGMjlDMTZEMTMwMEMyRTIwMDJENzk0RSAvKiBBY2Nlc3NpYmlsaXR5 QWxsSW5PbmUuY3BwICovLAogCQkJCTI5ODFDQTlEMTMxODIyRUMwMEQxMkYyQSAvKiBBY2Nlc3Np YmlsaXR5QVJJQUdyaWQuY3BwICovLAogCQkJCTI5QTgxMjE2MEZCQjlDMUQwMDUxMDI5MyAvKiBB Y2Nlc3NpYmlsaXR5QVJJQUdyaWQuaCAqLywKIAkJCQkyOTgxQ0E5RTEzMTgyMkVDMDBEMTJGMkEg LyogQWNjZXNzaWJpbGl0eUFSSUFHcmlkQ2VsbC5jcHAgKi8sCkBAIC0yNzIxNywxNCArMjcyMzcs MzUgQEAKIAkJCWJ1aWxkQWN0aW9uTWFzayA9IDIxNDc0ODM2NDc7CiAJCQlmaWxlcyA9ICgKIAkJ CQk0MUUxQjFEMDBGRjU5ODY5MDA1NzZCM0IgLyogQWJzdHJhY3RXb3JrZXIuY3BwIGluIFNvdXJj ZXMgKi8sCi0JCQkJMEYyOUMxNkUxMzAwQzJFMjAwMkQ3OTRFIC8qIEFjY2Vzc2liaWxpdHlBbGxJ bk9uZS5jcHAgaW4gU291cmNlcyAqLywKKwkJCQkzN0Y1N0FCOTFBNTA3MjY5MDA4NzZGOTggLyog QWNjZXNzaWJpbGl0eUFSSUFHcmlkLmNwcCBpbiBTb3VyY2VzICovLAorCQkJCTM3RjU3QUJBMUE1 MDcyNkYwMDg3NkY5OCAvKiBBY2Nlc3NpYmlsaXR5QVJJQUdyaWRDZWxsLmNwcCBpbiBTb3VyY2Vz ICovLAorCQkJCTM3RjU3QUJCMUE1MDcyNzMwMDg3NkY5OCAvKiBBY2Nlc3NpYmlsaXR5QVJJQUdy aWRSb3cuY3BwIGluIFNvdXJjZXMgKi8sCisJCQkJMzdGNTdBQkMxQTUwNzI3NzAwODc2Rjk4IC8q IEFjY2Vzc2liaWxpdHlJbWFnZU1hcExpbmsuY3BwIGluIFNvdXJjZXMgKi8sCisJCQkJMzdGNTdB QkQxQTUwNzI3QTAwODc2Rjk4IC8qIEFjY2Vzc2liaWxpdHlMaXN0LmNwcCBpbiBTb3VyY2VzICov LAorCQkJCTM3RjU3QUJFMUE1MDcyN0UwMDg3NkY5OCAvKiBBY2Nlc3NpYmlsaXR5TGlzdEJveC5j cHAgaW4gU291cmNlcyAqLywKKwkJCQkzN0Y1N0FCRjFBNTA3MjgxMDA4NzZGOTggLyogQWNjZXNz aWJpbGl0eUxpc3RCb3hPcHRpb24uY3BwIGluIFNvdXJjZXMgKi8sCisJCQkJMzdGNTdBQzAxQTUw NzI4NDAwODc2Rjk4IC8qIEFjY2Vzc2liaWxpdHlNZWRpYUNvbnRyb2xzLmNwcCBpbiBTb3VyY2Vz ICovLAogCQkJCTc2Q0REMkYyMTEwM0RBNjYwMDY4MDUyMSAvKiBBY2Nlc3NpYmlsaXR5TWVudUxp c3QuY3BwIGluIFNvdXJjZXMgKi8sCiAJCQkJNzZDREQyRjYxMTAzREE2NjAwNjgwNTIxIC8qIEFj Y2Vzc2liaWxpdHlNZW51TGlzdE9wdGlvbi5jcHAgaW4gU291cmNlcyAqLywKIAkJCQk3NkNERDJG NDExMDNEQTY2MDA2ODA1MjEgLyogQWNjZXNzaWJpbGl0eU1lbnVMaXN0UG9wdXAuY3BwIGluIFNv dXJjZXMgKi8sCiAJCQkJMjlBQ0IyMTQxNDNFNzQ5ODAwNkJDQTVGIC8qIEFjY2Vzc2liaWxpdHlN b2NrT2JqZWN0LmNwcCBpbiBTb3VyY2VzICovLAorCQkJCTM3RjU3QUMxMUE1MDcyODcwMDg3NkY5 OCAvKiBBY2Nlc3NpYmlsaXR5Tm9kZU9iamVjdC5jcHAgaW4gU291cmNlcyAqLywKKwkJCQkzN0Y1 N0FDMjFBNTA3MjhCMDA4NzZGOTggLyogQWNjZXNzaWJpbGl0eU9iamVjdC5jcHAgaW4gU291cmNl cyAqLywKIAkJCQlBQUE3MjhGNjE2RDFEOEJDMDBEM0JCQzYgLyogQWNjZXNzaWJpbGl0eU9iamVj dElPUy5tbSBpbiBTb3VyY2VzICovLAogCQkJCTI5QTgxMjQ4MEZCQjlDQTkwMDUxMDI5MyAvKiBB Y2Nlc3NpYmlsaXR5T2JqZWN0TWFjLm1tIGluIFNvdXJjZXMgKi8sCisJCQkJMzdGNTdBQzMxQTUw NzI4RjAwODc2Rjk4IC8qIEFjY2Vzc2liaWxpdHlQcm9ncmVzc0luZGljYXRvci5jcHAgaW4gU291 cmNlcyAqLywKKwkJCQkzN0Y1N0FDNDFBNTA3MjkzMDA4NzZGOTggLyogQWNjZXNzaWJpbGl0eVJl bmRlck9iamVjdC5jcHAgaW4gU291cmNlcyAqLywKKwkJCQkzN0Y1N0FDOTFBNTA3MkNDMDA4NzZG OTggLyogQWNjZXNzaWJpbGl0eVNWR1Jvb3QuY3BwIGluIFNvdXJjZXMgKi8sCisJCQkJMzdGNTdB QzYxQTUwNzI5QjAwODc2Rjk4IC8qIEFjY2Vzc2liaWxpdHlTY3JvbGxWaWV3LmNwcCBpbiBTb3Vy Y2VzICovLAorCQkJCTM3RjU3QUM1MUE1MDcyOTcwMDg3NkY5OCAvKiBBY2Nlc3NpYmlsaXR5U2Ny b2xsYmFyLmNwcCBpbiBTb3VyY2VzICovLAorCQkJCTM3RjU3QUM3MUE1MDcyQTEwMDg3NkY5OCAv KiBBY2Nlc3NpYmlsaXR5U2VhcmNoRmllbGRCdXR0b25zLmNwcCBpbiBTb3VyY2VzICovLAorCQkJ CTM3RjU3QUM4MUE1MDcyQkMwMDg3NkY5OCAvKiBBY2Nlc3NpYmlsaXR5U2xpZGVyLmNwcCBpbiBT b3VyY2VzICovLAogCQkJCTI5RDdCQ0Y2MTQ0NEFGNTgwMDcwNjE5QyAvKiBBY2Nlc3NpYmlsaXR5 U3BpbkJ1dHRvbi5jcHAgaW4gU291cmNlcyAqLywKKwkJCQkzN0Y1N0FDQTFBNTA3MkNGMDA4NzZG OTggLyogQWNjZXNzaWJpbGl0eVRhYmxlLmNwcCBpbiBTb3VyY2VzICovLAorCQkJCTM3RjU3QUNC MUE1MDcyRDEwMDg3NkY5OCAvKiBBY2Nlc3NpYmlsaXR5VGFibGVDZWxsLmNwcCBpbiBTb3VyY2Vz ICovLAorCQkJCTM3RjU3QUNDMUE1MDcyRDUwMDg3NkY5OCAvKiBBY2Nlc3NpYmlsaXR5VGFibGVD b2x1bW4uY3BwIGluIFNvdXJjZXMgKi8sCisJCQkJMzdGNTdBQ0QxQTUwNzJENzAwODc2Rjk4IC8q IEFjY2Vzc2liaWxpdHlUYWJsZUhlYWRlckNvbnRhaW5lci5jcHAgaW4gU291cmNlcyAqLywKKwkJ CQkzN0Y1N0FDRTFBNTA3MkRBMDA4NzZGOTggLyogQWNjZXNzaWJpbGl0eVRhYmxlUm93LmNwcCBp biBTb3VyY2VzICovLAogCQkJCUI1RDMxREZBMTFDRjYxMEIwMDlGMjJCNCAvKiBBY3RpdmVET01D YWxsYmFjay5jcHAgaW4gU291cmNlcyAqLywKIAkJCQlFMUM0REU2RTBFQTc1QzY1MDAyM0NDRDYg LyogQWN0aXZlRE9NT2JqZWN0LmNwcCBpbiBTb3VyY2VzICovLAogCQkJCTg0RDBDNDA0MTExNUYx RDQwMDE4QUEzNCAvKiBBZmZpbmVUcmFuc2Zvcm0uY3BwIGluIFNvdXJjZXMgKi8sCkBAIC0yNzMw NCw2ICsyNzM0NSw3IEBACiAJCQkJMDcwMzYzRTcxODFBMUNEQzAwQzA3NEE1IC8qIEFWVmlkZW9D YXB0dXJlU291cmNlLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJRjQ3ODc1NTUxOTk4M0FGRjAwMjRB Mjg3IC8qIEF4aXNTY3JvbGxTbmFwQW5pbWF0b3IubW0gaW4gU291cmNlcyAqLywKIAkJCQlGNDVD MjMxRDE5OTVCNzNCMDBBNkUyRTMgLyogQXhpc1Njcm9sbFNuYXBPZmZzZXRzLmNwcCBpbiBTb3Vy Y2VzICovLAorCQkJCTM3RjU3QUNGMUE1MDcyREQwMDg3NkY5OCAvKiBBWE9iamVjdENhY2hlLmNw cCBpbiBTb3VyY2VzICovLAogCQkJCUFBQTcyOEY5MTZEMUQ4QkMwMEQzQkJDNiAvKiBBWE9iamVj dENhY2hlSU9TLm1tIGluIFNvdXJjZXMgKi8sCiAJCQkJMjlBODEyNEIwRkJCOUNBOTAwNTEwMjkz IC8qIEFYT2JqZWN0Q2FjaGVNYWMubW0gaW4gU291cmNlcyAqLywKIAkJCQlCQ0E4QzgxRjExRTNE MzY5MDA4MTJGQjcgLyogQmFja0ZvcndhcmRDb250cm9sbGVyLmNwcCBpbiBTb3VyY2VzICovLAo=