164845 2016-11-16 17:19:01 -0800 Fix build on macOS Sierra when WEB_PLAYBACK_CONTROLS_MANAGER is enabled 2016-11-16 21:46:37 -0800 1 1 1 Unclassified WebKit Platform WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 rniwa rniwa bdakin mitz wenson_hsieh oldest_to_newest 1252122 0 rniwa 2016-11-16 17:19:01 -0800 It looks like https://trac.webkit.org/changeset/208802 broke builds on macOS Sierra. 1252123 1 295001 rniwa 2016-11-16 17:20:30 -0800 Created attachment 295001 Patch 1252136 2 mitz 2016-11-16 17:36:22 -0800 Why is this the right fix? 1252139 3 rniwa 2016-11-16 17:37:51 -0800 (In reply to comment #2) > Why is this the right fix? This is similar to the fix we deployed in AVKit.h but I'm all ears if you have a better fix. 1252140 4 rniwa 2016-11-16 17:38:17 -0800 By the way, I've already committed this in https://trac.webkit.org/changeset/208833. 1252185 5 mitz 2016-11-16 19:56:37 -0800 (In reply to comment #3) > (In reply to comment #2) > > Why is this the right fix? > > This is similar to the fix we deployed in AVKit.h but I'm all ears if you > have a better fix. I don’t know what you’re referring to (AVKit.h is not in the WebKit source tree, is it?). When the Apple Internal SDK isn’t available, we normally use declarations in a *SPI.h header file rather than omit functionality from the build. 1252189 6 rniwa 2016-11-16 20:12:04 -0800 (In reply to comment #5) > (In reply to comment #3) > > (In reply to comment #2) > > > Why is this the right fix? > > > > This is similar to the fix we deployed in AVKit.h but I'm all ears if you > > have a better fix. > > I don’t know what you’re referring to (AVKit.h is not in the WebKit source > tree, is it?). When the Apple Internal SDK isn’t available, we normally use > declarations in a *SPI.h header file rather than omit functionality from the > build. Sorry, I meant to say AVKitSPI.h 1252191 7 mitz 2016-11-16 20:22:07 -0800 (In reply to comment #6) > (In reply to comment #5) > > (In reply to comment #3) > > > (In reply to comment #2) > > > > Why is this the right fix? > > > > > > This is similar to the fix we deployed in AVKit.h but I'm all ears if you > > > have a better fix. > > > > I don’t know what you’re referring to (AVKit.h is not in the WebKit source > > tree, is it?). When the Apple Internal SDK isn’t available, we normally use > > declarations in a *SPI.h header file rather than omit functionality from the > > build. > > Sorry, I meant to say AVKitSPI.h What’s guarded with #if USE(APPLE_INTERNAL_SDK) in AVKitSPI.h are just #import statements for headers that are only available in the Apple-internal SDK, and the #else clause provides equivalent declarations. What attachment 295001 guards with #if USE(APPLE_INTERNAL_SDK) are parts of the implementation, and the #else clauses don’t seem to be equivalent. 1252194 8 rniwa 2016-11-16 20:38:16 -0800 (In reply to comment #7) > (In reply to comment #6) > > (In reply to comment #5) > > > (In reply to comment #3) > > > > (In reply to comment #2) > > > > > Why is this the right fix? > > > > > > > > This is similar to the fix we deployed in AVKit.h but I'm all ears if you > > > > have a better fix. > > > > > > I don’t know what you’re referring to (AVKit.h is not in the WebKit source > > > tree, is it?). When the Apple Internal SDK isn’t available, we normally use > > > declarations in a *SPI.h header file rather than omit functionality from the > > > build. > > > > Sorry, I meant to say AVKitSPI.h > > What’s guarded with #if USE(APPLE_INTERNAL_SDK) in AVKitSPI.h are just > #import statements for headers that are only available in the Apple-internal > SDK, and the #else clause provides equivalent declarations. What attachment > 295001 [details] guards with #if USE(APPLE_INTERNAL_SDK) are parts of the > implementation, and the #else clauses don’t seem to be equivalent. Oh I see. So you think the correct fix is to declare the missing properties in AVKitSPI.h instead? 1252195 9 mitz 2016-11-16 20:41:07 -0800 (In reply to comment #8) > (In reply to comment #7) > > (In reply to comment #6) > > > (In reply to comment #5) > > > > (In reply to comment #3) > > > > > (In reply to comment #2) > > > > > > Why is this the right fix? > > > > > > > > > > This is similar to the fix we deployed in AVKit.h but I'm all ears if you > > > > > have a better fix. > > > > > > > > I don’t know what you’re referring to (AVKit.h is not in the WebKit source > > > > tree, is it?). When the Apple Internal SDK isn’t available, we normally use > > > > declarations in a *SPI.h header file rather than omit functionality from the > > > > build. > > > > > > Sorry, I meant to say AVKitSPI.h > > > > What’s guarded with #if USE(APPLE_INTERNAL_SDK) in AVKitSPI.h are just > > #import statements for headers that are only available in the Apple-internal > > SDK, and the #else clause provides equivalent declarations. What attachment > > 295001 [details] guards with #if USE(APPLE_INTERNAL_SDK) are parts of the > > implementation, and the #else clauses don’t seem to be equivalent. > > Oh I see. So you think the correct fix is to declare the missing properties > in AVKitSPI.h instead? I don’t know what the original build error was, but if there’s anything that’s declared in one of the Apple-internal headers that AVKitSPI.h imports, and that declaration is missing from the #else clause, and adding it would fix the build, then in principle that’s the right fix :-) 1252204 10 rniwa 2016-11-16 21:38:33 -0800 Reopening this to fix this properly. 1252205 11 295026 rniwa 2016-11-16 21:43:37 -0800 Created attachment 295026 Fixes the build properly 1252206 12 rniwa 2016-11-16 21:46:37 -0800 Committed r208838: <http://trac.webkit.org/changeset/208838> 295001 2016-11-16 17:20:30 -0800 2016-11-16 21:43:32 -0800 Patch fix164845.patch text/plain 6505 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwODgzMikKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIwIEBACisyMDE2LTExLTE2ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEZpeCBidWlsZCBvbiBtYWNPUyBT aWVycmEgd2hlbiBXRUJfUExBWUJBQ0tfQ09OVFJPTFNfTUFOQUdFUiBpcyBlbmFibGVkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjQ4NDUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBGaXggYnVpbGRzIGFm dGVyIHIyMDg4MDIgYnkgd3JhcHBpbmcgY29kZSBpbnNpZGUgVVNFKEFQUExFX0lOVEVSTkFMX1NE SykuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIu aDoKKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIubW06 CisgICAgICAgICogcGxhdGZvcm0vbWFjL1dlYlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYy5t bToKKyAgICAgICAgKFdlYkNvcmU6OldlYlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYzo6c2Vl a2FibGVSYW5nZXNDaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6OldlYlBsYXliYWNrU2Vzc2lv bkludGVyZmFjZU1hYzo6YXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbnNDaGFuZ2VkKToKKyAgICAg ICAgKFdlYkNvcmU6OldlYlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYzo6bGVnaWJsZU1lZGlh U2VsZWN0aW9uT3B0aW9uc0NoYW5nZWQpOgorICAgICAgICAoV2ViQ29yZTo6V2ViUGxheWJhY2tT ZXNzaW9uSW50ZXJmYWNlTWFjOjpzZXRQbGF5QmFja0NvbnRyb2xzTWFuYWdlcik6CisKIDIwMTYt MTEtMTYgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBTY3JpcHRF eGVjdXRpb25Db250ZXh0Ojpwcm9jZXNzTWVzc2FnZVBvcnRNZXNzYWdlc1Nvb24oKSBzaG91bGQg b25seSBwb3N0IHRhc2sgd2hlbiBuZWNlc3NhcnkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9XZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlci5oCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlci5oCShyZXZp c2lvbiAyMDg4MjQpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViUGxheWJhY2tD b250cm9sc01hbmFnZXIuaAkod29ya2luZyBjb3B5KQpAQCAtNDYsMTEgKzQ2LDEyIEBACiAgICAg UmV0YWluUHRyPE5TQXJyYXk+IF9zZWVrYWJsZVRpbWVSYW5nZXM7CiAgICAgQk9PTCBfaGFzRW5h YmxlZEF1ZGlvOwogICAgIEJPT0wgX2hhc0VuYWJsZWRWaWRlbzsKKyNpZiBVU0UoQVBQTEVfSU5U RVJOQUxfU0RLKQogICAgIFJldGFpblB0cjxOU0FycmF5PEFWRnVuY3Rpb25CYXJNZWRpYVNlbGVj dGlvbk9wdGlvbiAqPj4gX2F1ZGlvRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbnM7CiAg ICAgUmV0YWluUHRyPEFWRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbj4gX2N1cnJlbnRB dWRpb0Z1bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25PcHRpb247CiAgICAgUmV0YWluUHRyPE5TQXJy YXk8QVZGdW5jdGlvbkJhck1lZGlhU2VsZWN0aW9uT3B0aW9uICo+PiBfbGVnaWJsZUZ1bmN0aW9u QmFyTWVkaWFTZWxlY3Rpb25PcHRpb25zOwogICAgIFJldGFpblB0cjxBVkZ1bmN0aW9uQmFyTWVk aWFTZWxlY3Rpb25PcHRpb24+IF9jdXJyZW50TGVnaWJsZUZ1bmN0aW9uQmFyTWVkaWFTZWxlY3Rp b25PcHRpb247Ci0KKyNlbmRpZgogICAgIGZsb2F0IF9yYXRlOwogICAgIEJPT0wgX3BsYXlpbmc7 CiAgICAgQk9PTCBfY2FuVG9nZ2xlUGxheWJhY2s7CkBAIC03MSw2ICs3Miw3IEBACiAKIEBwcm9w ZXJ0eSAobm9uYXRvbWljKSBmbG9hdCByYXRlOwogCisjaWYgVVNFKEFQUExFX0lOVEVSTkFMX1NE SykKIC0gKEFWRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbiAqKWN1cnJlbnRBdWRpb0Z1 bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25PcHRpb247CiAtICh2b2lkKXNldEN1cnJlbnRBdWRpb0Z1 bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25PcHRpb246KEFWRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlv bk9wdGlvbiAqKW9wdGlvbjsKIC0gKEFWRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbiAq KWN1cnJlbnRMZWdpYmxlRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbjsKQEAgLTc3LDYg Kzc5LDcgQEAKIC0gKHZvaWQpc2V0Q3VycmVudExlZ2libGVGdW5jdGlvbkJhck1lZGlhU2VsZWN0 aW9uT3B0aW9uOihBVkZ1bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25PcHRpb24gKilvcHRpb247CiAt ICh2b2lkKXNldEF1ZGlvTWVkaWFTZWxlY3Rpb25PcHRpb25zOihjb25zdCBWZWN0b3I8V1RGOjpT dHJpbmc+JilvcHRpb25zIHdpdGhTZWxlY3RlZEluZGV4OihOU1VJbnRlZ2VyKXNlbGVjdGVkSW5k ZXg7CiAtICh2b2lkKXNldExlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnM6KGNvbnN0IFZlY3Rv cjxXVEY6OlN0cmluZz4mKW9wdGlvbnMgd2l0aFNlbGVjdGVkSW5kZXg6KE5TVUludGVnZXIpc2Vs ZWN0ZWRJbmRleDsKKyNlbmRpZgogQGVuZAogCiAjZW5kaWYgLy8gRU5BQkxFKFdFQl9QTEFZQkFD S19DT05UUk9MU19NQU5BR0VSKQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dl YlBsYXliYWNrQ29udHJvbHNNYW5hZ2VyLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21hYy9XZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlci5tbQkocmV2aXNpb24gMjA4 ODI0KQorKysgU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbWFjL1dlYlBsYXliYWNrQ29udHJvbHNN YW5hZ2VyLm1tCSh3b3JraW5nIGNvcHkpCkBAIC05MCw2ICs5MCw3IEBACiB7CiB9CiAKKyNpZiBV U0UoQVBQTEVfSU5URVJOQUxfU0RLKQogLSAodm9pZClnZW5lcmF0ZUZ1bmN0aW9uQmFyVGh1bWJu YWlsc0ZvclRpbWVzOihOU0FycmF5PE5TTnVtYmVyICo+ICopdGh1bWJuYWlsVGltZXMgc2l6ZToo TlNTaXplKXNpemUgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKE5TQXJyYXk8QVZUaHVtYm5h aWwgKj4gKnRodW1ibmFpbHMsIE5TRXJyb3IgKmVycm9yKSljb21wbGV0aW9uSGFuZGxlcgogewog ICAgIFVOVVNFRF9QQVJBTSh0aHVtYm5haWxUaW1lcyk7CkBAIC0xMDIsNiArMTAzLDcgQEAKICAg ICBVTlVTRURfUEFSQU0obnVtYmVyT2ZTYW1wbGVzKTsKICAgICBjb21wbGV0aW9uSGFuZGxlcihA WyBdLCBuaWwpOwogfQorI2VuZGlmCiAKIC0oQk9PTCljYW5CZWdpbkZ1bmN0aW9uQmFyU2NydWJi aW5nCiB7CkBAIC0xMjEsNiArMTIzLDcgQEAKICAgICBfd2ViUGxheWJhY2tTZXNzaW9uSW50ZXJm YWNlTWFjLT5lbmRTY3J1YmJpbmcoKTsKIH0KIAorI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREsp CiAtIChOU0FycmF5PEFWRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbiAqPiAqKWF1ZGlv RnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbnMKIHsKICAgICByZXR1cm4gX2F1ZGlvRnVu Y3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbnMuZ2V0KCk7CkBAIC0yMDYsNyArMjA5LDcgQEAK ICAgICBpZiAoc2VsZWN0ZWRJbmRleCA8IFt3ZWJPcHRpb25zIGNvdW50XSkKICAgICAgICAgW3Nl bGYgc2V0Q3VycmVudExlZ2libGVGdW5jdGlvbkJhck1lZGlhU2VsZWN0aW9uT3B0aW9uOlt3ZWJP cHRpb25zIG9iamVjdEF0SW5kZXg6c2VsZWN0ZWRJbmRleF1dOwogfQotCisjZW5kaWYKIC0gKFdl YkNvcmU6OldlYlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYyopd2ViUGxheWJhY2tTZXNzaW9u SW50ZXJmYWNlTWFjCiB7CiAgICAgcmV0dXJuIF93ZWJQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VN YWMuZ2V0KCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViUGxheWJhY2tT ZXNzaW9uSW50ZXJmYWNlTWFjLm1tCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL21hYy9XZWJQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VNYWMubW0JKHJldmlzaW9uIDIwODgy NCkKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJQbGF5YmFja1Nlc3Npb25JbnRl cmZhY2VNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTEzMSw3ICsxMzEsNyBAQAogCiB2b2lkIFdl YlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYzo6c2Vla2FibGVSYW5nZXNDaGFuZ2VkKGNvbnN0 IFRpbWVSYW5nZXMmIHRpbWVSYW5nZXMpCiB7Ci0jaWYgRU5BQkxFKFdFQl9QTEFZQkFDS19DT05U Uk9MU19NQU5BR0VSKQorI2lmIEVOQUJMRShXRUJfUExBWUJBQ0tfQ09OVFJPTFNfTUFOQUdFUikg JiYgVVNFKEFQUExFX0lOVEVSTkFMX1NESykKICAgICBbcGxheUJhY2tDb250cm9sc01hbmFnZXIo KSBzZXRTZWVrYWJsZVRpbWVSYW5nZXM6dGltZVJhbmdlc1RvQXJyYXkodGltZVJhbmdlcykuZ2V0 KCldOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0odGltZVJhbmdlcyk7CkBAIC0xNDAsNyArMTQw LDcgQEAKIAogdm9pZCBXZWJQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VNYWM6OmF1ZGlvTWVkaWFT ZWxlY3Rpb25PcHRpb25zQ2hhbmdlZChjb25zdCBWZWN0b3I8V1RGOjpTdHJpbmc+JiBvcHRpb25z LCB1aW50NjRfdCBzZWxlY3RlZEluZGV4KQogewotI2lmIEVOQUJMRShXRUJfUExBWUJBQ0tfQ09O VFJPTFNfTUFOQUdFUikKKyNpZiBFTkFCTEUoV0VCX1BMQVlCQUNLX0NPTlRST0xTX01BTkFHRVIp ICYmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCiAgICAgW3BsYXlCYWNrQ29udHJvbHNNYW5hZ2Vy KCkgc2V0QXVkaW9NZWRpYVNlbGVjdGlvbk9wdGlvbnM6b3B0aW9ucyB3aXRoU2VsZWN0ZWRJbmRl eDpzdGF0aWNfY2FzdDxOU1VJbnRlZ2VyPihzZWxlY3RlZEluZGV4KV07CiAjZWxzZQogICAgIFVO VVNFRF9QQVJBTShvcHRpb25zKTsKQEAgLTE1MCw3ICsxNTAsNyBAQAogCiB2b2lkIFdlYlBsYXli YWNrU2Vzc2lvbkludGVyZmFjZU1hYzo6bGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uc0NoYW5n ZWQoY29uc3QgVmVjdG9yPFdURjo6U3RyaW5nPiYgb3B0aW9ucywgdWludDY0X3Qgc2VsZWN0ZWRJ bmRleCkKIHsKLSNpZiBFTkFCTEUoV0VCX1BMQVlCQUNLX0NPTlRST0xTX01BTkFHRVIpCisjaWYg RU5BQkxFKFdFQl9QTEFZQkFDS19DT05UUk9MU19NQU5BR0VSKSAmJiBVU0UoQVBQTEVfSU5URVJO QUxfU0RLKQogICAgIFtwbGF5QmFja0NvbnRyb2xzTWFuYWdlcigpIHNldExlZ2libGVNZWRpYVNl bGVjdGlvbk9wdGlvbnM6b3B0aW9ucyB3aXRoU2VsZWN0ZWRJbmRleDpzdGF0aWNfY2FzdDxOU1VJ bnRlZ2VyPihzZWxlY3RlZEluZGV4KV07CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTShvcHRpb25z KTsKQEAgLTE5OCw4ICsxOTgsMTAgQEAKICAgICBtYW5hZ2VyLnNlZWthYmxlVGltZVJhbmdlcyA9 IHRpbWVSYW5nZXNUb0FycmF5KG1fcGxheWJhY2tTZXNzaW9uTW9kZWwtPnNlZWthYmxlUmFuZ2Vz KCkpLmdldCgpOwogICAgIG1hbmFnZXIuY2FuVG9nZ2xlUGxheWJhY2sgPSBZRVM7CiAgICAgbWFu YWdlci5wbGF5aW5nID0gbV9wbGF5YmFja1Nlc3Npb25Nb2RlbC0+aXNQbGF5aW5nKCk7CisjaWYg VVNFKEFQUExFX0lOVEVSTkFMX1NESykKICAgICBbbWFuYWdlciBzZXRBdWRpb01lZGlhU2VsZWN0 aW9uT3B0aW9uczptX3BsYXliYWNrU2Vzc2lvbk1vZGVsLT5hdWRpb01lZGlhU2VsZWN0aW9uT3B0 aW9ucygpIHdpdGhTZWxlY3RlZEluZGV4OnN0YXRpY19jYXN0PE5TVUludGVnZXI+KG1fcGxheWJh Y2tTZXNzaW9uTW9kZWwtPmF1ZGlvTWVkaWFTZWxlY3RlZEluZGV4KCkpXTsKICAgICBbbWFuYWdl ciBzZXRMZWdpYmxlTWVkaWFTZWxlY3Rpb25PcHRpb25zOm1fcGxheWJhY2tTZXNzaW9uTW9kZWwt PmxlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnMoKSB3aXRoU2VsZWN0ZWRJbmRleDpzdGF0aWNf Y2FzdDxOU1VJbnRlZ2VyPihtX3BsYXliYWNrU2Vzc2lvbk1vZGVsLT5sZWdpYmxlTWVkaWFTZWxl Y3RlZEluZGV4KCkpXTsKKyNlbmRpZgogfQogCiB2b2lkIFdlYlBsYXliYWNrU2Vzc2lvbkludGVy ZmFjZU1hYzo6dXBkYXRlUGxheWJhY2tDb250cm9sc01hbmFnZXJUaW1pbmcoZG91YmxlIGN1cnJl bnRUaW1lLCBkb3VibGUgYW5jaG9yVGltZSwgZG91YmxlIHBsYXliYWNrUmF0ZSwgYm9vbCBpc1Bs YXlpbmcpCg== 295026 2016-11-16 21:43:37 -0800 2016-11-16 21:44:28 -0800 Fixes the build properly bug-164845-20161116214333.patch text/plain 7534 rniwa SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIwODgzNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDIyIEBACisyMDE2LTExLTE2ICBSeW9zdWtl IE5pd2EgIDxybml3YUB3ZWJraXQub3JnPgorCisgICAgICAgIEZpeCBidWlsZCBvbiBtYWNPUyBT aWVycmEgd2hlbiBXRUJfUExBWUJBQ0tfQ09OVFJPTFNfTUFOQUdFUiBpcyBlbmFibGVkCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xNjQ4NDUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZXZlcnQgcjIwODgz MyBhbmQgZml4IHRoZSBidWlsZCBieSBkZWNsYXJpbmcgQVZGdW5jdGlvbkJhck1lZGlhU2VsZWN0 aW9uT3B0aW9uIGFuZCBBVlRodW1ibmFpbCBpbiBBVktpdFNQSS5oCisKKyAgICAgICAgKiBwbGF0 Zm9ybS9tYWMvV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIuaDoKKyAgICAgICAgKiBwbGF0Zm9y bS9tYWMvV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIubW06CisgICAgICAgICgtW1dlYlBsYXli YWNrQ29udHJvbHNNYW5hZ2VyIGdlbmVyYXRlRnVuY3Rpb25CYXJBdWRpb0FtcGxpdHVkZVNhbXBs ZXM6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgICogcGxhdGZvcm0vbWFjL1dlYlBsYXli YWNrU2Vzc2lvbkludGVyZmFjZU1hYy5tbToKKyAgICAgICAgKFdlYkNvcmU6OldlYlBsYXliYWNr U2Vzc2lvbkludGVyZmFjZU1hYzo6c2Vla2FibGVSYW5nZXNDaGFuZ2VkKToKKyAgICAgICAgKFdl YkNvcmU6OldlYlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYzo6YXVkaW9NZWRpYVNlbGVjdGlv bk9wdGlvbnNDaGFuZ2VkKToKKyAgICAgICAgKFdlYkNvcmU6OldlYlBsYXliYWNrU2Vzc2lvbklu dGVyZmFjZU1hYzo6bGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9uc0NoYW5nZWQpOgorICAgICAg ICAoV2ViQ29yZTo6V2ViUGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlTWFjOjpzZXRQbGF5QmFja0Nv bnRyb2xzTWFuYWdlcik6CisgICAgICAgICogcGxhdGZvcm0vc3BpL2NvY29hL0FWS2l0U1BJLmg6 CisKIDIwMTYtMTEtMTYgIFJ5b3N1a2UgTml3YSAgPHJuaXdhQHdlYmtpdC5vcmc+CiAKICAgICAg ICAgUkVHUkVTU0lPTihyMjA4MDgyKTogMSUgU3BlZWRvbWV0ZXIgcmVncmVzc2lvbiBvbiBpT1MK SW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJQbGF5YmFja0NvbnRyb2xzTWFu YWdlci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJQbGF5 YmFja0NvbnRyb2xzTWFuYWdlci5oCShyZXZpc2lvbiAyMDg4MzcpCisrKyBTb3VyY2UvV2ViQ29y ZS9wbGF0Zm9ybS9tYWMvV2ViUGxheWJhY2tDb250cm9sc01hbmFnZXIuaAkod29ya2luZyBjb3B5 KQpAQCAtNDYsMTIgKzQ2LDEwIEBAIEBpbnRlcmZhY2UgV2ViUGxheWJhY2tDb250cm9sc01hbmFn ZXIgOiAKICAgICBSZXRhaW5QdHI8TlNBcnJheT4gX3NlZWthYmxlVGltZVJhbmdlczsKICAgICBC T09MIF9oYXNFbmFibGVkQXVkaW87CiAgICAgQk9PTCBfaGFzRW5hYmxlZFZpZGVvOwotI2lmIFVT RShBUFBMRV9JTlRFUk5BTF9TREspCiAgICAgUmV0YWluUHRyPE5TQXJyYXk8QVZGdW5jdGlvbkJh ck1lZGlhU2VsZWN0aW9uT3B0aW9uICo+PiBfYXVkaW9GdW5jdGlvbkJhck1lZGlhU2VsZWN0aW9u T3B0aW9uczsKICAgICBSZXRhaW5QdHI8QVZGdW5jdGlvbkJhck1lZGlhU2VsZWN0aW9uT3B0aW9u PiBfY3VycmVudEF1ZGlvRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbjsKICAgICBSZXRh aW5QdHI8TlNBcnJheTxBVkZ1bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25PcHRpb24gKj4+IF9sZWdp YmxlRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbnM7CiAgICAgUmV0YWluUHRyPEFWRnVu Y3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbj4gX2N1cnJlbnRMZWdpYmxlRnVuY3Rpb25CYXJN ZWRpYVNlbGVjdGlvbk9wdGlvbjsKLSNlbmRpZgogICAgIGZsb2F0IF9yYXRlOwogICAgIEJPT0wg X3BsYXlpbmc7CiAgICAgQk9PTCBfY2FuVG9nZ2xlUGxheWJhY2s7CkBAIC03MiwxNCArNzAsMTIg QEAgQGludGVyZmFjZSBXZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlciA6IAogCiBAcHJvcGVydHkg KG5vbmF0b21pYykgZmxvYXQgcmF0ZTsKIAotI2lmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCiAt IChBVkZ1bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25PcHRpb24gKiljdXJyZW50QXVkaW9GdW5jdGlv bkJhck1lZGlhU2VsZWN0aW9uT3B0aW9uOwogLSAodm9pZClzZXRDdXJyZW50QXVkaW9GdW5jdGlv bkJhck1lZGlhU2VsZWN0aW9uT3B0aW9uOihBVkZ1bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25PcHRp b24gKilvcHRpb247CiAtIChBVkZ1bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25PcHRpb24gKiljdXJy ZW50TGVnaWJsZUZ1bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25PcHRpb247CiAtICh2b2lkKXNldEN1 cnJlbnRMZWdpYmxlRnVuY3Rpb25CYXJNZWRpYVNlbGVjdGlvbk9wdGlvbjooQVZGdW5jdGlvbkJh ck1lZGlhU2VsZWN0aW9uT3B0aW9uICopb3B0aW9uOwogLSAodm9pZClzZXRBdWRpb01lZGlhU2Vs ZWN0aW9uT3B0aW9uczooY29uc3QgVmVjdG9yPFdURjo6U3RyaW5nPiYpb3B0aW9ucyB3aXRoU2Vs ZWN0ZWRJbmRleDooTlNVSW50ZWdlcilzZWxlY3RlZEluZGV4OwogLSAodm9pZClzZXRMZWdpYmxl TWVkaWFTZWxlY3Rpb25PcHRpb25zOihjb25zdCBWZWN0b3I8V1RGOjpTdHJpbmc+JilvcHRpb25z IHdpdGhTZWxlY3RlZEluZGV4OihOU1VJbnRlZ2VyKXNlbGVjdGVkSW5kZXg7Ci0jZW5kaWYKIEBl bmQKIAogI2VuZGlmIC8vIEVOQUJMRShXRUJfUExBWUJBQ0tfQ09OVFJPTFNfTUFOQUdFUikKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdl ci5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9tYWMvV2ViUGxheWJh Y2tDb250cm9sc01hbmFnZXIubW0JKHJldmlzaW9uIDIwODgzNykKKysrIFNvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL21hYy9XZWJQbGF5YmFja0NvbnRyb2xzTWFuYWdlci5tbQkod29ya2luZyBjb3B5 KQpAQCAtOTAsNyArOTAsNiBAQCAtICh2b2lkKWNhbmNlbFRodW1ibmFpbEFuZEF1ZGlvQW1wbGl0 dWRlCiB7CiB9CiAKLSNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQogLSAodm9pZClnZW5lcmF0 ZUZ1bmN0aW9uQmFyVGh1bWJuYWlsc0ZvclRpbWVzOihOU0FycmF5PE5TTnVtYmVyICo+ICopdGh1 bWJuYWlsVGltZXMgc2l6ZTooTlNTaXplKXNpemUgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4p KE5TQXJyYXk8QVZUaHVtYm5haWwgKj4gKnRodW1ibmFpbHMsIE5TRXJyb3IgKmVycm9yKSljb21w bGV0aW9uSGFuZGxlcgogewogICAgIFVOVVNFRF9QQVJBTSh0aHVtYm5haWxUaW1lcyk7CkBAIC0x MDMsNyArMTAyLDYgQEAgLSAodm9pZClnZW5lcmF0ZUZ1bmN0aW9uQmFyQXVkaW9BbXBsaXR1ZAog ICAgIFVOVVNFRF9QQVJBTShudW1iZXJPZlNhbXBsZXMpOwogICAgIGNvbXBsZXRpb25IYW5kbGVy KEBbIF0sIG5pbCk7CiB9Ci0jZW5kaWYKIAogLShCT09MKWNhbkJlZ2luRnVuY3Rpb25CYXJTY3J1 YmJpbmcKIHsKQEAgLTEyMyw3ICsxMjEsNiBAQCAtICh2b2lkKWVuZEZ1bmN0aW9uQmFyU2NydWJi aW5nCiAgICAgX3dlYlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYy0+ZW5kU2NydWJiaW5nKCk7 CiB9CiAKLSNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQogLSAoTlNBcnJheTxBVkZ1bmN0aW9u QmFyTWVkaWFTZWxlY3Rpb25PcHRpb24gKj4gKilhdWRpb0Z1bmN0aW9uQmFyTWVkaWFTZWxlY3Rp b25PcHRpb25zCiB7CiAgICAgcmV0dXJuIF9hdWRpb0Z1bmN0aW9uQmFyTWVkaWFTZWxlY3Rpb25P cHRpb25zLmdldCgpOwpAQCAtMjA5LDcgKzIwNiw3IEBAIC0gKHZvaWQpc2V0TGVnaWJsZU1lZGlh U2VsZWN0aW9uT3B0aW9uczoKICAgICBpZiAoc2VsZWN0ZWRJbmRleCA8IFt3ZWJPcHRpb25zIGNv dW50XSkKICAgICAgICAgW3NlbGYgc2V0Q3VycmVudExlZ2libGVGdW5jdGlvbkJhck1lZGlhU2Vs ZWN0aW9uT3B0aW9uOlt3ZWJPcHRpb25zIG9iamVjdEF0SW5kZXg6c2VsZWN0ZWRJbmRleF1dOwog fQotI2VuZGlmCisKIC0gKFdlYkNvcmU6OldlYlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYyop d2ViUGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlTWFjCiB7CiAgICAgcmV0dXJuIF93ZWJQbGF5YmFj a1Nlc3Npb25JbnRlcmZhY2VNYWMuZ2V0KCk7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9y bS9tYWMvV2ViUGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlTWFjLm1tCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNv dXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VNYWMu bW0JKHJldmlzaW9uIDIwODgzNykKKysrIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL21hYy9XZWJQ bGF5YmFja1Nlc3Npb25JbnRlcmZhY2VNYWMubW0JKHdvcmtpbmcgY29weSkKQEAgLTEzMSw3ICsx MzEsNyBAQCBzdGF0aWMgUmV0YWluUHRyPE5TTXV0YWJsZUFycmF5PiB0aW1lUmFuCiAKIHZvaWQg V2ViUGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlTWFjOjpzZWVrYWJsZVJhbmdlc0NoYW5nZWQoY29u c3QgVGltZVJhbmdlcyYgdGltZVJhbmdlcykKIHsKLSNpZiBFTkFCTEUoV0VCX1BMQVlCQUNLX0NP TlRST0xTX01BTkFHRVIpICYmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCisjaWYgRU5BQkxFKFdF Ql9QTEFZQkFDS19DT05UUk9MU19NQU5BR0VSKQogICAgIFtwbGF5QmFja0NvbnRyb2xzTWFuYWdl cigpIHNldFNlZWthYmxlVGltZVJhbmdlczp0aW1lUmFuZ2VzVG9BcnJheSh0aW1lUmFuZ2VzKS5n ZXQoKV07CiAjZWxzZQogICAgIFVOVVNFRF9QQVJBTSh0aW1lUmFuZ2VzKTsKQEAgLTE0MCw3ICsx NDAsNyBAQCB2b2lkIFdlYlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYzo6c2VlCiAKIHZvaWQg V2ViUGxheWJhY2tTZXNzaW9uSW50ZXJmYWNlTWFjOjphdWRpb01lZGlhU2VsZWN0aW9uT3B0aW9u c0NoYW5nZWQoY29uc3QgVmVjdG9yPFdURjo6U3RyaW5nPiYgb3B0aW9ucywgdWludDY0X3Qgc2Vs ZWN0ZWRJbmRleCkKIHsKLSNpZiBFTkFCTEUoV0VCX1BMQVlCQUNLX0NPTlRST0xTX01BTkFHRVIp ICYmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCisjaWYgRU5BQkxFKFdFQl9QTEFZQkFDS19DT05U Uk9MU19NQU5BR0VSKQogICAgIFtwbGF5QmFja0NvbnRyb2xzTWFuYWdlcigpIHNldEF1ZGlvTWVk aWFTZWxlY3Rpb25PcHRpb25zOm9wdGlvbnMgd2l0aFNlbGVjdGVkSW5kZXg6c3RhdGljX2Nhc3Q8 TlNVSW50ZWdlcj4oc2VsZWN0ZWRJbmRleCldOwogI2Vsc2UKICAgICBVTlVTRURfUEFSQU0ob3B0 aW9ucyk7CkBAIC0xNTAsNyArMTUwLDcgQEAgdm9pZCBXZWJQbGF5YmFja1Nlc3Npb25JbnRlcmZh Y2VNYWM6OmF1ZAogCiB2b2lkIFdlYlBsYXliYWNrU2Vzc2lvbkludGVyZmFjZU1hYzo6bGVnaWJs ZU1lZGlhU2VsZWN0aW9uT3B0aW9uc0NoYW5nZWQoY29uc3QgVmVjdG9yPFdURjo6U3RyaW5nPiYg b3B0aW9ucywgdWludDY0X3Qgc2VsZWN0ZWRJbmRleCkKIHsKLSNpZiBFTkFCTEUoV0VCX1BMQVlC QUNLX0NPTlRST0xTX01BTkFHRVIpICYmIFVTRShBUFBMRV9JTlRFUk5BTF9TREspCisjaWYgRU5B QkxFKFdFQl9QTEFZQkFDS19DT05UUk9MU19NQU5BR0VSKQogICAgIFtwbGF5QmFja0NvbnRyb2xz TWFuYWdlcigpIHNldExlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnM6b3B0aW9ucyB3aXRoU2Vs ZWN0ZWRJbmRleDpzdGF0aWNfY2FzdDxOU1VJbnRlZ2VyPihzZWxlY3RlZEluZGV4KV07CiAjZWxz ZQogICAgIFVOVVNFRF9QQVJBTShvcHRpb25zKTsKQEAgLTE5OCwxMCArMTk4LDggQEAgdm9pZCBX ZWJQbGF5YmFja1Nlc3Npb25JbnRlcmZhY2VNYWM6OnNldAogICAgIG1hbmFnZXIuc2Vla2FibGVU aW1lUmFuZ2VzID0gdGltZVJhbmdlc1RvQXJyYXkobV9wbGF5YmFja1Nlc3Npb25Nb2RlbC0+c2Vl a2FibGVSYW5nZXMoKSkuZ2V0KCk7CiAgICAgbWFuYWdlci5jYW5Ub2dnbGVQbGF5YmFjayA9IFlF UzsKICAgICBtYW5hZ2VyLnBsYXlpbmcgPSBtX3BsYXliYWNrU2Vzc2lvbk1vZGVsLT5pc1BsYXlp bmcoKTsKLSNpZiBVU0UoQVBQTEVfSU5URVJOQUxfU0RLKQogICAgIFttYW5hZ2VyIHNldEF1ZGlv TWVkaWFTZWxlY3Rpb25PcHRpb25zOm1fcGxheWJhY2tTZXNzaW9uTW9kZWwtPmF1ZGlvTWVkaWFT ZWxlY3Rpb25PcHRpb25zKCkgd2l0aFNlbGVjdGVkSW5kZXg6c3RhdGljX2Nhc3Q8TlNVSW50ZWdl cj4obV9wbGF5YmFja1Nlc3Npb25Nb2RlbC0+YXVkaW9NZWRpYVNlbGVjdGVkSW5kZXgoKSldOwog ICAgIFttYW5hZ2VyIHNldExlZ2libGVNZWRpYVNlbGVjdGlvbk9wdGlvbnM6bV9wbGF5YmFja1Nl c3Npb25Nb2RlbC0+bGVnaWJsZU1lZGlhU2VsZWN0aW9uT3B0aW9ucygpIHdpdGhTZWxlY3RlZElu ZGV4OnN0YXRpY19jYXN0PE5TVUludGVnZXI+KG1fcGxheWJhY2tTZXNzaW9uTW9kZWwtPmxlZ2li bGVNZWRpYVNlbGVjdGVkSW5kZXgoKSldOwotI2VuZGlmCiB9CiAKIHZvaWQgV2ViUGxheWJhY2tT ZXNzaW9uSW50ZXJmYWNlTWFjOjp1cGRhdGVQbGF5YmFja0NvbnRyb2xzTWFuYWdlclRpbWluZyhk b3VibGUgY3VycmVudFRpbWUsIGRvdWJsZSBhbmNob3JUaW1lLCBkb3VibGUgcGxheWJhY2tSYXRl LCBib29sIGlzUGxheWluZykKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9jb2Nv YS9BVktpdFNQSS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL3NwaS9j b2NvYS9BVktpdFNQSS5oCShyZXZpc2lvbiAyMDg4MzcpCisrKyBTb3VyY2UvV2ViQ29yZS9wbGF0 Zm9ybS9zcGkvY29jb2EvQVZLaXRTUEkuaAkod29ya2luZyBjb3B5KQpAQCAtMTc5LDYgKzE3OSw5 IEBAIE5TX0FTU1VNRV9OT05OVUxMX0JFR0lOCiBAcHJvcGVydHkgKGFzc2lnbiwgbnVsbGFibGUp IGlkPEFWRnVuY3Rpb25CYXJQbGF5YmFja0NvbnRyb2xzQ29udHJvbGxpbmc+IHBsYXliYWNrQ29u dHJvbHNDb250cm9sbGVyOwogQGVuZAogCitAY2xhc3MgQVZGdW5jdGlvbkJhck1lZGlhU2VsZWN0 aW9uT3B0aW9uOworQGNsYXNzIEFWVGh1bWJuYWlsOworCiBOU19BU1NVTUVfTk9OTlVMTF9FTkQK IAogI2VuZGlmCg==