93841 2012-08-13 06:40:28 -0700 [Chromium] Fix apk generation for the Android platform 2012-08-14 04:33:10 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 peter peter fmalita laszlo.gombos webkit.review.bot yutak oldest_to_newest 693621 0 peter 2012-08-13 06:40:28 -0700 [Chromium] Fix apk generation for the Android platform 693624 1 157987 peter 2012-08-13 06:42:21 -0700 Created attachment 157987 Patch 693626 2 157987 peter 2012-08-13 07:01:31 -0700 Comment on attachment 157987 Patch The Chromium-side commit is in: https://src.chromium.org/viewvc/chrome?view=rev&revision=151257 This is safe to land even without a WebKit Chromium roll. Regardless, we're really close to ToT, so when the Chromium Waterfall rolls green on that patch, we can roll it to WebKit and the Android builders should become green again. 693736 3 157987 webkit.review.bot 2012-08-13 09:41:00 -0700 Comment on attachment 157987 Patch Clearing flags on attachment: 157987 Committed r125422: <http://trac.webkit.org/changeset/125422> 693737 4 webkit.review.bot 2012-08-13 09:41:04 -0700 All reviewed patches have been landed. Closing bug. 694052 5 fmalita 2012-08-13 13:59:56 -0700 There's still a path problem: WK builds are still broken, as are the CR builds now - http://build.chromium.org/p/chromium.webkit/builders/Android%20Builder?numbuilds=50 Error on WK builders: /mnt/data/b/WebKit-BuildSlave/chromium-linux-android/build/out/Release/webkit_unit_tests_apk/native_test_apk.xml:21: Cannot find /mnt/data/b/WebKit-BuildSlave/chromium-linux-android/build/out/WebKit/chromium/build/android/ant/common.xml imported from /mnt/data/b/WebKit-BuildSlave/chromium-linux-android/build/out/Release/webkit_unit_tests_apk/native_test_apk.xml Error on CR builders: /mnt/data/b/build/slave/Android_Builder/build/src/out/Release/TestWebKitAPI_apk/native_test_apk.xml:21: Cannot find /mnt/data/b/build/slave/Android_Builder/build/android/ant/common.xml imported from /mnt/data/b/build/slave/Android_Builder/build/src/out/Release/TestWebKitAPI_apk/native_test_apk.xml 694114 6 webkit.review.bot 2012-08-13 14:44:59 -0700 Re-opened since this is blocked by 93902 694116 7 fmalita 2012-08-13 14:46:03 -0700 I'm reverting this for now, to hopefully get the canary bot green again and be able to roll WK. 694128 8 fmalita 2012-08-13 14:55:50 -0700 http://trac.webkit.org/changeset/125454 694779 9 158288 peter 2012-08-14 03:56:20 -0700 Created attachment 158288 Patch 694782 10 peter 2012-08-14 03:57:54 -0700 Sorry about that, Florin! The updated patch also takes the different paths Chromium uses into account. To emphasize, the made modifications are to Android-specific sections of the gyp files. The larger problem causing all of this will be addressed on the Chromium side, eventually getting rid of this condition block as a whole. 694785 11 158289 peter 2012-08-14 04:01:21 -0700 Created attachment 158289 Patch for landing Since Dimitri rubberstamped a version similar to this, and it is, after all, an Android-specific build fix, I'm going to go ahead and land this unreviewed. 694786 12 peter 2012-08-14 04:02:46 -0700 Committed r125538: <http://trac.webkit.org/changeset/125538> 694806 13 peter 2012-08-14 04:33:10 -0700 Committed r125542: <http://trac.webkit.org/changeset/125542> 157987 2012-08-13 06:42:21 -0700 2012-08-14 03:56:15 -0700 Patch bug-93841-20120813144149.patch text/plain 4006 peter U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NDE2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGFiY2UzZTgxMDY4Zjc1OWFiYWZjOWNmZWVmODAxMmZiZWU1Y2U0MjcuLjFhYmExOWIyMmZkMTI0 NzMwNzYwNjFjMjkwZjdhMmY1YThjYTIyM2UgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTItMDgtMTMgIFBldGVyIEJldmVybG9vICA8cGV0ZXJAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gRml4IGFwayBnZW5lcmF0aW9uIGZvciB0aGUg QW5kcm9pZCBwbGF0Zm9ybQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTM4NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBUEsgZ2VuZXJhdGlvbiB3YXMgYnJva2VuIGFzIHRoZSBjb25maWd1cmF0aW9uIGZp bGUgYXNzdW1lZCBjb21waWxhdGlvbgorICAgICAgICB3b3VsZCBvbmx5IG9jY3VyIGluIHRoZSBD aHJvbWl1bSB0cmVlLiBQYXNzIHRoZSBwYXRoIHRvIENocm9taXVtJ3Mgc291cmNlCisgICAgICAg IGJhc2UgZGlyZWN0b3J5IGFzIGEgcHJvcGVydHkgdG8gYW50LgorCisgICAgICAgICogV2ViS2l0 VW5pdFRlc3RzLmd5cDoKKwogMjAxMi0wOC0xMyAgU2hlcmlmZiBCb3QgIDx3ZWJraXQucmV2aWV3 LmJvdEBnbWFpbC5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZC4gIFJvbGxlZCBERVBTLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXRVbml0VGVzdHMuZ3lwIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXRVbml0VGVzdHMuZ3lwCmluZGV4IGIwNWE1NTI3MTgy N2IxZTczNjc4MjFhMTIwYjkxNDNhMzAwNDA3M2UuLjgwMmRlN2Y1ZTEyZDVhMThmMDk3OGVjNmU0 YjA3YjI3MTQ2OWM5YTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0 VW5pdFRlc3RzLmd5cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdFVuaXRUZXN0 cy5neXAKQEAgLTE4Myw2ICsxODMsOCBAQAogICAgICAgICAgICAgICAgICAgICAgICAgJy1EQU5E Uk9JRF9UT09MQ0hBSU49PChhbmRyb2lkX3Rvb2xjaGFpbiknLAogICAgICAgICAgICAgICAgICAg ICAgICAgJy0tYW50LWFyZ3MnLAogICAgICAgICAgICAgICAgICAgICAgICAgJy1EUFJPRFVDVF9E SVI9PChhbnRfYnVpbGRfb3V0KScsCisgICAgICAgICAgICAgICAgICAgICAgICAnLS1hbnQtYXJn cycsCisgICAgICAgICAgICAgICAgICAgICAgICAnLURDSFJPTUlVTV9TUkM9PChjaHJvbWl1bV9z cmNfZGlyKScsCiAgICAgICAgICAgICAgICAgICAgICAgICAnLS1zZGstYnVpbGQ9PChzZGtfYnVp bGQpJywKICAgICAgICAgICAgICAgICAgICAgICAgICctLWFwcF9hYmknLAogICAgICAgICAgICAg ICAgICAgICAgICAgJzwoYW5kcm9pZF9hcHBfYWJpKScsCmRpZmYgLS1naXQgYS9Ub29scy9DaGFu Z2VMb2cgYi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggYTAxMTE5MWY4NTczYzc4YmI2NTk3ZDIwMzRi OGVkNjFkNzZiZWI2ZS4uZDlmNmM0YjYyN2U4Mjk3NzM5ZTAzZmM4MjNiN2NkYjEzMTg5MzhmNSAx MDA2NDQKLS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE3IEBACisyMDEyLTA4LTEzICBQZXRlciBCZXZlcmxvbyAgPHBldGVyQGNocm9taXVtLm9y Zz4KKworICAgICAgICBbQ2hyb21pdW1dIEZpeCBhcGsgZ2VuZXJhdGlvbiBmb3IgdGhlIEFuZHJv aWQgcGxhdGZvcm0KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTkzODQxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAg ICAgQVBLIGdlbmVyYXRpb24gd2FzIGJyb2tlbiBhcyB0aGUgY29uZmlndXJhdGlvbiBmaWxlIGFz c3VtZWQgY29tcGlsYXRpb24KKyAgICAgICAgd291bGQgb25seSBvY2N1ciBpbiB0aGUgQ2hyb21p dW0gdHJlZS4gUGFzcyB0aGUgcGF0aCB0byBDaHJvbWl1bSdzIHNvdXJjZQorICAgICAgICBiYXNl IGRpcmVjdG9yeSBhcyBhIHByb3BlcnR5IHRvIGFudC4KKworICAgICAgICAqIER1bXBSZW5kZXJU cmVlL0R1bXBSZW5kZXJUcmVlLmd5cC9EdW1wUmVuZGVyVHJlZS5neXA6CisgICAgICAgICogVGVz dFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLmd5cC9UZXN0V2ViS2l0QVBJLmd5cDoKKwogMjAxMi0w OC0xMyAgS3dhbmcgWXVsIFNlbyAgPHNreXVsQGNvbXBhbnkxMDAubmV0PgogCiAgICAgICAgIFtR dF0gQWRkIGdwcm9mLnByZiB0byBidWlsZCBXZWJLaXQgd2l0aCBncHJvZiBlbmFibGVkCmRpZmYg LS1naXQgYS9Ub29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5neXAvRHVtcFJlbmRl clRyZWUuZ3lwIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUuZ3lwL0R1bXBS ZW5kZXJUcmVlLmd5cAppbmRleCBmMDQ3MDgzMjI3NTJkZTgwMzE0ZjY1YjcwMjIyZTFhM2U0MTZk ODRiLi41YTU2MTE2NDIzYWY3NjFkNzgwMjM0M2Y1MmNjNTc5MmMyOTUxYTE0IDEwMDY0NAotLS0g YS9Ub29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5neXAvRHVtcFJlbmRlclRyZWUu Z3lwCisrKyBiL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLmd5cC9EdW1wUmVu ZGVyVHJlZS5neXAKQEAgLTUwMCw2ICs1MDAsOCBAQAogICAgICAgICAgICAgICAgICAgICAgICAg Jy1EQU5EUk9JRF9UT09MQ0hBSU49PChhbmRyb2lkX3Rvb2xjaGFpbiknLAogICAgICAgICAgICAg ICAgICAgICAgICAgJy0tYW50LWFyZ3MnLAogICAgICAgICAgICAgICAgICAgICAgICAgJy1EUFJP RFVDVF9ESVI9PChhbnRfYnVpbGRfb3V0KScsCisgICAgICAgICAgICAgICAgICAgICAgICAnLS1h bnQtYXJncycsCisgICAgICAgICAgICAgICAgICAgICAgICAnLURDSFJPTUlVTV9TUkM9PChjaHJv bWl1bV9zcmNfZGlyKScsCiAgICAgICAgICAgICAgICAgICAgICAgICAnLS1zZGstYnVpbGQ9PChz ZGtfYnVpbGQpJywKICAgICAgICAgICAgICAgICAgICAgICAgICctLWFwcF9hYmknLAogICAgICAg ICAgICAgICAgICAgICAgICAgJzwoYW5kcm9pZF9hcHBfYWJpKScsCmRpZmYgLS1naXQgYS9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkuZ3lwL1Rlc3RXZWJLaXRBUEkuZ3lwIGIvVG9v bHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLmd5cC9UZXN0V2ViS2l0QVBJLmd5cAppbmRl eCBlODQzODZmMThiMzQ0ZDA2ZjczOTlmZDBlMDQ2NDBkYjEwZjg4YmQ4Li5mODU0MjNkNWI1OTFh MjAwZDRjMDJiOWQ1MjM0MzkxMWY2NzQ1ZDIyIDEwMDY0NAotLS0gYS9Ub29scy9UZXN0V2ViS2l0 QVBJL1Rlc3RXZWJLaXRBUEkuZ3lwL1Rlc3RXZWJLaXRBUEkuZ3lwCisrKyBiL1Rvb2xzL1Rlc3RX ZWJLaXRBUEkvVGVzdFdlYktpdEFQSS5neXAvVGVzdFdlYktpdEFQSS5neXAKQEAgLTE0Myw2ICsx NDMsOCBAQAogICAgICAgICAgICAgICAgICAgICAgICAgJy1EQU5EUk9JRF9UT09MQ0hBSU49PChh bmRyb2lkX3Rvb2xjaGFpbiknLAogICAgICAgICAgICAgICAgICAgICAgICAgJy0tYW50LWFyZ3Mn LAogICAgICAgICAgICAgICAgICAgICAgICAgJy1EUFJPRFVDVF9ESVI9PChhbnRfYnVpbGRfb3V0 KScsCisgICAgICAgICAgICAgICAgICAgICAgICAnLS1hbnQtYXJncycsCisgICAgICAgICAgICAg ICAgICAgICAgICAnLURDSFJPTUlVTV9TUkM9PChjaHJvbWl1bV9zcmNfZGlyKScsCiAgICAgICAg ICAgICAgICAgICAgICAgICAnLS1zZGstYnVpbGQ9PChzZGtfYnVpbGQpJywKICAgICAgICAgICAg ICAgICAgICAgICAgICctLWFwcF9hYmknLAogICAgICAgICAgICAgICAgICAgICAgICAgJzwoYW5k cm9pZF9hcHBfYWJpKScsCg== 158288 2012-08-14 03:56:20 -0700 2012-08-14 04:01:17 -0700 Patch bug-93841-20120814115547.patch text/plain 6301 peter U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGE1YjI2YjQ1OGYyZmJlODE2ZWRlODE3YWZmNTMwNGRjZGQyMDA3MjUuLjQ3ODY3NjgwODMwMDU4 OWFlOWNkZjRhNzM0MTQwNjdmMmNkNmRlZWUgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTItMDgtMTQgIFBldGVyIEJldmVybG9vICA8cGV0ZXJAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gRml4IGFwayBnZW5lcmF0aW9uIGZvciB0aGUg QW5kcm9pZCBwbGF0Zm9ybQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTM4NDEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKwor ICAgICAgICBBUEsgZ2VuZXJhdGlvbiB3YXMgYnJva2VuIGFzIHRoZSBjb25maWd1cmF0aW9uIGZp bGUgYXNzdW1lZCBjb21waWxhdGlvbgorICAgICAgICB3b3VsZCBvbmx5IG9jY3VyIGluIHRoZSBD aHJvbWl1bSB0cmVlLiBQYXNzIHRoZSBwYXRoIHRvIENocm9taXVtJ3Mgc291cmNlCisgICAgICAg IGJhc2UgZGlyZWN0b3J5IGFzIGEgcHJvcGVydHkgdG8gYW50LgorCisgICAgICAgICogV2ViS2l0 VW5pdFRlc3RzLmd5cDoKKwogMjAxMi0wOC0xMyAgVG9tIFNlcGV6ICA8dHNlcGV6QGNocm9taXVt Lm9yZz4KIAogICAgICAgICBbY2hyb21pdW1dIHJlbGVhc2UgRnJhbWVMb2FkZXJDbGllbnRJbXBs OjptX3BsdWdpbldpZGdldCByZWZwdHIgdXBvbiBQbHVnaW4gRG9jdW1lbnQgZGV0YWNoLgpkaWZm IC0tZ2l0IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXRVbml0VGVzdHMuZ3lwIGIvU291 cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXRVbml0VGVzdHMuZ3lwCmluZGV4IGIwNWE1NTI3MTgy N2IxZTczNjc4MjFhMTIwYjkxNDNhMzAwNDA3M2UuLjNhNTkxYTc1YjUzNjJiOTNmMTY5YmIxN2Iz Yzg2ZmI5OWY1NGRhMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0 VW5pdFRlc3RzLmd5cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdFVuaXRUZXN0 cy5neXAKQEAgLTE0Nyw2ICsxNDcsMTMgQEAKICAgICAgICAgICAgICAgICAgICAgJ2lucHV0X2ph cnNfcGF0aHMnOiBbCiAgICAgICAgICAgICAgICAgICAgICAgICAnPChQUk9EVUNUX0RJUikvbGli LmphdmEvY2hyb21pdW1fYmFzZS5qYXInLAogICAgICAgICAgICAgICAgICAgICBdLAorICAgICAg ICAgICAgICAgICAgICAnY29uZGl0aW9ucyc6IFsKKyAgICAgICAgICAgICAgICAgICAgICAgIFsn aW5zaWRlX2Nocm9taXVtX2J1aWxkPT0xJywgeworICAgICAgICAgICAgICAgICAgICAgICAgICAg ICdhbnRfYnVpbGRfdG9fY2hyb21pdW1fc3JjJzogJzwoYW50X2J1aWxkX291dCkvLi4vLi4vJywK KyAgICAgICAgICAgICAgICAgICAgICAgIH0sIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAnYW50X2J1aWxkX3RvX2Nocm9taXVtX3NyYyc6ICc8KGNocm9taXVtX3NyY19kaXIpJywKKyAg ICAgICAgICAgICAgICAgICAgICAgIH1dLAorICAgICAgICAgICAgICAgICAgICBdLAogICAgICAg ICAgICAgICAgIH0sCiAgICAgICAgICAgICAgICAgIyBQYXJ0IG9mIHRoZSBmb2xsb3dpbmcgd2Fz IGNvcGllZCBmcm9tIDwoY2hyb21pdW1fc3JjX2RpcikvYnVpbGQvYXBrX3Rlc3QuZ3B5aS4KICAg ICAgICAgICAgICAgICAjIE5vdCBpbmNsdWRpbmcgaXQgYmVjYXVzZSBneXAgaW5jbHVkZSBkb2Vz bid0IHN1cHBvcnQgdmFyaWFibGUgaW4gcGF0aCBvciB1bmRlcgpAQCAtMTgzLDYgKzE5MCw4IEBA CiAgICAgICAgICAgICAgICAgICAgICAgICAnLURBTkRST0lEX1RPT0xDSEFJTj08KGFuZHJvaWRf dG9vbGNoYWluKScsCiAgICAgICAgICAgICAgICAgICAgICAgICAnLS1hbnQtYXJncycsCiAgICAg ICAgICAgICAgICAgICAgICAgICAnLURQUk9EVUNUX0RJUj08KGFudF9idWlsZF9vdXQpJywKKyAg ICAgICAgICAgICAgICAgICAgICAgICctLWFudC1hcmdzJywKKyAgICAgICAgICAgICAgICAgICAg ICAgICctRENIUk9NSVVNX1NSQz08KGFudF9idWlsZF90b19jaHJvbWl1bV9zcmMpJywKICAgICAg ICAgICAgICAgICAgICAgICAgICctLXNkay1idWlsZD08KHNka19idWlsZCknLAogICAgICAgICAg ICAgICAgICAgICAgICAgJy0tYXBwX2FiaScsCiAgICAgICAgICAgICAgICAgICAgICAgICAnPChh bmRyb2lkX2FwcF9hYmkpJywKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0No YW5nZUxvZwppbmRleCBmMDgyN2ZkMmMyYWYzMGZmN2FiOWFlNmVjYzJhOTY0MGMwN2Y1N2MwLi44 NTBiMWM0OTYxYmFlMzViNTRkYjNlZjFmZGYyNjczYTc5MDliN2VlIDEwMDY0NAotLS0gYS9Ub29s cy9DaGFuZ2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTIt MDgtMTQgIFBldGVyIEJldmVybG9vICA8cGV0ZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtD aHJvbWl1bV0gRml4IGFwayBnZW5lcmF0aW9uIGZvciB0aGUgQW5kcm9pZCBwbGF0Zm9ybQorICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTM4NDEKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBBUEsgZ2VuZXJhdGlv biB3YXMgYnJva2VuIGFzIHRoZSBjb25maWd1cmF0aW9uIGZpbGUgYXNzdW1lZCBjb21waWxhdGlv bgorICAgICAgICB3b3VsZCBvbmx5IG9jY3VyIGluIHRoZSBDaHJvbWl1bSB0cmVlLiBQYXNzIHRo ZSBwYXRoIHRvIENocm9taXVtJ3Mgc291cmNlCisgICAgICAgIGJhc2UgZGlyZWN0b3J5IGFzIGEg cHJvcGVydHkgdG8gYW50LgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRy ZWUuZ3lwL0R1bXBSZW5kZXJUcmVlLmd5cDoKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RX ZWJLaXRBUEkuZ3lwL1Rlc3RXZWJLaXRBUEkuZ3lwOgorCiAyMDEyLTA4LTE0ICBTZXJnaW8gVmls bGFyIFNlbmluICA8c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIFJFR1JFU1NJ T04gKHIxMjI0MjgpIFdlYktpdDJBUElUZXN0cy9UZXN0V2ViS2l0RmluZENvbnRyb2xsZXIgZmFp bHMgIm5leHQiIHRlc3QKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5k ZXJUcmVlLmd5cC9EdW1wUmVuZGVyVHJlZS5neXAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9EdW1w UmVuZGVyVHJlZS5neXAvRHVtcFJlbmRlclRyZWUuZ3lwCmluZGV4IGYwNDcwODMyMjc1MmRlODAz MTRmNjViNzAyMjJlMWEzZTQxNmQ4NGIuLjMxZTg5MDk1YWEzM2IxMzYxYmE3MWYxOWIyYWZkYjJi NjQzODIzY2MgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVl Lmd5cC9EdW1wUmVuZGVyVHJlZS5neXAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvRHVtcFJl bmRlclRyZWUuZ3lwL0R1bXBSZW5kZXJUcmVlLmd5cApAQCAtNDY0LDYgKzQ2NCwxMyBAQAogICAg ICAgICAgICAgICAgICAgICAgICAgJzwoUFJPRFVDVF9ESVIpL2xpYi5qYXZhL2Nocm9taXVtX25l dC5qYXInLAogICAgICAgICAgICAgICAgICAgICAgICAgJzwoUFJPRFVDVF9ESVIpL2xpYi5qYXZh L2Nocm9taXVtX21lZGlhLmphcicsCiAgICAgICAgICAgICAgICAgICAgIF0sCisgICAgICAgICAg ICAgICAgICAgICdjb25kaXRpb25zJzogWworICAgICAgICAgICAgICAgICAgICAgICAgWydpbnNp ZGVfY2hyb21pdW1fYnVpbGQ9PTEnLCB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2Fu dF9idWlsZF90b19jaHJvbWl1bV9zcmMnOiAnPChhbnRfYnVpbGRfb3V0KS8uLi8uLi8nLAorICAg ICAgICAgICAgICAgICAgICAgICAgfSwgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgICdh bnRfYnVpbGRfdG9fY2hyb21pdW1fc3JjJzogJzwoY2hyb21pdW1fc3JjX2RpciknLAorICAgICAg ICAgICAgICAgICAgICAgICAgfV0sCisgICAgICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAg ICAgICAgfSwKICAgICAgICAgICAgICAgICAjIFBhcnQgb2YgdGhlIGZvbGxvd2luZyB3YXMgY29w aWVkIGZyb20gPChjaHJvbWl1bV9zcmNfZGlyKS9idWlsZC9hcGtfdGVzdC5ncHlpLgogICAgICAg ICAgICAgICAgICMgTm90IGluY2x1ZGluZyBpdCBiZWNhdXNlIGd5cCBpbmNsdWRlIGRvZXNuJ3Qg c3VwcG9ydCB2YXJpYWJsZSBpbiBwYXRoIG9yIHVuZGVyCkBAIC01MDAsNiArNTA3LDggQEAKICAg ICAgICAgICAgICAgICAgICAgICAgICctREFORFJPSURfVE9PTENIQUlOPTwoYW5kcm9pZF90b29s Y2hhaW4pJywKICAgICAgICAgICAgICAgICAgICAgICAgICctLWFudC1hcmdzJywKICAgICAgICAg ICAgICAgICAgICAgICAgICctRFBST0RVQ1RfRElSPTwoYW50X2J1aWxkX291dCknLAorICAgICAg ICAgICAgICAgICAgICAgICAgJy0tYW50LWFyZ3MnLAorICAgICAgICAgICAgICAgICAgICAgICAg Jy1EQ0hST01JVU1fU1JDPTwoYW50X2J1aWxkX3RvX2Nocm9taXVtX3NyYyknLAogICAgICAgICAg ICAgICAgICAgICAgICAgJy0tc2RrLWJ1aWxkPTwoc2RrX2J1aWxkKScsCiAgICAgICAgICAgICAg ICAgICAgICAgICAnLS1hcHBfYWJpJywKICAgICAgICAgICAgICAgICAgICAgICAgICc8KGFuZHJv aWRfYXBwX2FiaSknLApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0 QVBJLmd5cC9UZXN0V2ViS2l0QVBJLmd5cCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktp dEFQSS5neXAvVGVzdFdlYktpdEFQSS5neXAKaW5kZXggZTg0Mzg2ZjE4YjM0NGQwNmY3Mzk5ZmQw ZTA0NjQwZGIxMGY4OGJkOC4uZTZkODk3ZjYzN2FmYmM3M2Y4MTk1MTEzNGQ1Y2JkMjQyNzMyZmI2 OSAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLmd5cC9UZXN0 V2ViS2l0QVBJLmd5cAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkuZ3lw L1Rlc3RXZWJLaXRBUEkuZ3lwCkBAIC0xMDcsNiArMTA3LDEzIEBACiAgICAgICAgICAgICAgICAg ICAgICdpbnB1dF9qYXJzX3BhdGhzJzogWwogICAgICAgICAgICAgICAgICAgICAgICAgJzwoUFJP RFVDVF9ESVIpL2xpYi5qYXZhL2Nocm9taXVtX2Jhc2UuamFyJywKICAgICAgICAgICAgICAgICAg ICAgXSwKKyAgICAgICAgICAgICAgICAgICAgJ2NvbmRpdGlvbnMnOiBbCisgICAgICAgICAgICAg ICAgICAgICAgICBbJ2luc2lkZV9jaHJvbWl1bV9idWlsZD09MScsIHsKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICAnYW50X2J1aWxkX3RvX2Nocm9taXVtX3NyYyc6ICc8KGFudF9idWlsZF9v dXQpLy4uLy4uLycsCisgICAgICAgICAgICAgICAgICAgICAgICB9LCB7CisgICAgICAgICAgICAg ICAgICAgICAgICAgICAgJ2FudF9idWlsZF90b19jaHJvbWl1bV9zcmMnOiAnPChjaHJvbWl1bV9z cmNfZGlyKScsCisgICAgICAgICAgICAgICAgICAgICAgICB9XSwKKyAgICAgICAgICAgICAgICAg ICAgXSwKICAgICAgICAgICAgICAgICB9LAogICAgICAgICAgICAgICAgICMgUGFydCBvZiB0aGUg Zm9sbG93aW5nIHdhcyBjb3BpZWQgZnJvbSA8KGNocm9taXVtX3NyY19kaXIpL2J1aWxkL2Fwa190 ZXN0LmdweWkuCiAgICAgICAgICAgICAgICAgIyBOb3QgaW5jbHVkaW5nIGl0IGJlY2F1c2UgZ3lw IGluY2x1ZGUgZG9lc24ndCBzdXBwb3J0IHZhcmlhYmxlIGluIHBhdGggb3IgdW5kZXIKQEAgLTE0 Myw2ICsxNTAsOCBAQAogICAgICAgICAgICAgICAgICAgICAgICAgJy1EQU5EUk9JRF9UT09MQ0hB SU49PChhbmRyb2lkX3Rvb2xjaGFpbiknLAogICAgICAgICAgICAgICAgICAgICAgICAgJy0tYW50 LWFyZ3MnLAogICAgICAgICAgICAgICAgICAgICAgICAgJy1EUFJPRFVDVF9ESVI9PChhbnRfYnVp bGRfb3V0KScsCisgICAgICAgICAgICAgICAgICAgICAgICAnLS1hbnQtYXJncycsCisgICAgICAg ICAgICAgICAgICAgICAgICAnLURDSFJPTUlVTV9TUkM9PChhbnRfYnVpbGRfdG9fY2hyb21pdW1f c3JjKScsCiAgICAgICAgICAgICAgICAgICAgICAgICAnLS1zZGstYnVpbGQ9PChzZGtfYnVpbGQp JywKICAgICAgICAgICAgICAgICAgICAgICAgICctLWFwcF9hYmknLAogICAgICAgICAgICAgICAg ICAgICAgICAgJzwoYW5kcm9pZF9hcHBfYWJpKScsCg== 158289 2012-08-14 04:01:21 -0700 2012-08-14 04:01:21 -0700 Patch for landing bug-93841-20120814120048.patch text/plain 6289 peter U3VidmVyc2lvbiBSZXZpc2lvbjogMTI1NTMzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L2No cm9taXVtL0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCmluZGV4 IGE1YjI2YjQ1OGYyZmJlODE2ZWRlODE3YWZmNTMwNGRjZGQyMDA3MjUuLjVhYjlmZGFkZWUyMDJl ZTk0M2M4MDZjYzFjYmQxMDdhYmZlMTcwOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hy b21pdW0vQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vQ2hhbmdlTG9nCkBA IC0xLDMgKzEsMTYgQEAKKzIwMTItMDgtMTQgIFBldGVyIEJldmVybG9vICA8cGV0ZXJAY2hyb21p dW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1bV0gRml4IGFwayBnZW5lcmF0aW9uIGZvciB0aGUg QW5kcm9pZCBwbGF0Zm9ybQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1 Zy5jZ2k/aWQ9OTM4NDEKKworICAgICAgICBVbnJldmlld2VkIGJ1aWxkIGZpeC4KKworICAgICAg ICBBUEsgZ2VuZXJhdGlvbiB3YXMgYnJva2VuIGFzIHRoZSBjb25maWd1cmF0aW9uIGZpbGUgYXNz dW1lZCBjb21waWxhdGlvbgorICAgICAgICB3b3VsZCBvbmx5IG9jY3VyIGluIHRoZSBDaHJvbWl1 bSB0cmVlLiBQYXNzIHRoZSBwYXRoIHRvIENocm9taXVtJ3Mgc291cmNlCisgICAgICAgIGJhc2Ug ZGlyZWN0b3J5IGFzIGEgcHJvcGVydHkgdG8gYW50LgorCisgICAgICAgICogV2ViS2l0VW5pdFRl c3RzLmd5cDoKKwogMjAxMi0wOC0xMyAgVG9tIFNlcGV6ICA8dHNlcGV6QGNocm9taXVtLm9yZz4K IAogICAgICAgICBbY2hyb21pdW1dIHJlbGVhc2UgRnJhbWVMb2FkZXJDbGllbnRJbXBsOjptX3Bs dWdpbldpZGdldCByZWZwdHIgdXBvbiBQbHVnaW4gRG9jdW1lbnQgZGV0YWNoLgpkaWZmIC0tZ2l0 IGEvU291cmNlL1dlYktpdC9jaHJvbWl1bS9XZWJLaXRVbml0VGVzdHMuZ3lwIGIvU291cmNlL1dl YktpdC9jaHJvbWl1bS9XZWJLaXRVbml0VGVzdHMuZ3lwCmluZGV4IGIwNWE1NTI3MTgyN2IxZTcz Njc4MjFhMTIwYjkxNDNhMzAwNDA3M2UuLjNhNTkxYTc1YjUzNjJiOTNmMTY5YmIxN2IzYzg2ZmI5 OWY1NGRhMjkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvY2hyb21pdW0vV2ViS2l0VW5pdFRl c3RzLmd5cAorKysgYi9Tb3VyY2UvV2ViS2l0L2Nocm9taXVtL1dlYktpdFVuaXRUZXN0cy5neXAK QEAgLTE0Nyw2ICsxNDcsMTMgQEAKICAgICAgICAgICAgICAgICAgICAgJ2lucHV0X2phcnNfcGF0 aHMnOiBbCiAgICAgICAgICAgICAgICAgICAgICAgICAnPChQUk9EVUNUX0RJUikvbGliLmphdmEv Y2hyb21pdW1fYmFzZS5qYXInLAogICAgICAgICAgICAgICAgICAgICBdLAorICAgICAgICAgICAg ICAgICAgICAnY29uZGl0aW9ucyc6IFsKKyAgICAgICAgICAgICAgICAgICAgICAgIFsnaW5zaWRl X2Nocm9taXVtX2J1aWxkPT0xJywgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgICdhbnRf YnVpbGRfdG9fY2hyb21pdW1fc3JjJzogJzwoYW50X2J1aWxkX291dCkvLi4vLi4vJywKKyAgICAg ICAgICAgICAgICAgICAgICAgIH0sIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICAnYW50 X2J1aWxkX3RvX2Nocm9taXVtX3NyYyc6ICc8KGNocm9taXVtX3NyY19kaXIpJywKKyAgICAgICAg ICAgICAgICAgICAgICAgIH1dLAorICAgICAgICAgICAgICAgICAgICBdLAogICAgICAgICAgICAg ICAgIH0sCiAgICAgICAgICAgICAgICAgIyBQYXJ0IG9mIHRoZSBmb2xsb3dpbmcgd2FzIGNvcGll ZCBmcm9tIDwoY2hyb21pdW1fc3JjX2RpcikvYnVpbGQvYXBrX3Rlc3QuZ3B5aS4KICAgICAgICAg ICAgICAgICAjIE5vdCBpbmNsdWRpbmcgaXQgYmVjYXVzZSBneXAgaW5jbHVkZSBkb2Vzbid0IHN1 cHBvcnQgdmFyaWFibGUgaW4gcGF0aCBvciB1bmRlcgpAQCAtMTgzLDYgKzE5MCw4IEBACiAgICAg ICAgICAgICAgICAgICAgICAgICAnLURBTkRST0lEX1RPT0xDSEFJTj08KGFuZHJvaWRfdG9vbGNo YWluKScsCiAgICAgICAgICAgICAgICAgICAgICAgICAnLS1hbnQtYXJncycsCiAgICAgICAgICAg ICAgICAgICAgICAgICAnLURQUk9EVUNUX0RJUj08KGFudF9idWlsZF9vdXQpJywKKyAgICAgICAg ICAgICAgICAgICAgICAgICctLWFudC1hcmdzJywKKyAgICAgICAgICAgICAgICAgICAgICAgICct RENIUk9NSVVNX1NSQz08KGFudF9idWlsZF90b19jaHJvbWl1bV9zcmMpJywKICAgICAgICAgICAg ICAgICAgICAgICAgICctLXNkay1idWlsZD08KHNka19idWlsZCknLAogICAgICAgICAgICAgICAg ICAgICAgICAgJy0tYXBwX2FiaScsCiAgICAgICAgICAgICAgICAgICAgICAgICAnPChhbmRyb2lk X2FwcF9hYmkpJywKZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxv ZwppbmRleCBmMDgyN2ZkMmMyYWYzMGZmN2FiOWFlNmVjYzJhOTY0MGMwN2Y1N2MwLi5lN2VkZjQ5 NWQ3YzVlODE0ZmM3MWJjOWRiNjAwN2FmYjE4ZTdmMTBjIDEwMDY0NAotLS0gYS9Ub29scy9DaGFu Z2VMb2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcgQEAKKzIwMTItMDgtMTQg IFBldGVyIEJldmVybG9vICA8cGV0ZXJAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFtDaHJvbWl1 bV0gRml4IGFwayBnZW5lcmF0aW9uIGZvciB0aGUgQW5kcm9pZCBwbGF0Zm9ybQorICAgICAgICBo dHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9OTM4NDEKKworICAgICAgICBV bnJldmlld2VkIGJ1aWxkIGZpeC4KKworICAgICAgICBBUEsgZ2VuZXJhdGlvbiB3YXMgYnJva2Vu IGFzIHRoZSBjb25maWd1cmF0aW9uIGZpbGUgYXNzdW1lZCBjb21waWxhdGlvbgorICAgICAgICB3 b3VsZCBvbmx5IG9jY3VyIGluIHRoZSBDaHJvbWl1bSB0cmVlLiBQYXNzIHRoZSBwYXRoIHRvIENo cm9taXVtJ3Mgc291cmNlCisgICAgICAgIGJhc2UgZGlyZWN0b3J5IGFzIGEgcHJvcGVydHkgdG8g YW50LgorCisgICAgICAgICogRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUuZ3lwL0R1bXBS ZW5kZXJUcmVlLmd5cDoKKyAgICAgICAgKiBUZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkuZ3lw L1Rlc3RXZWJLaXRBUEkuZ3lwOgorCiAyMDEyLTA4LTE0ICBTZXJnaW8gVmlsbGFyIFNlbmluICA8 c3ZpbGxhckBpZ2FsaWEuY29tPgogCiAgICAgICAgIFtHVEtdIFJFR1JFU1NJT04gKHIxMjI0Mjgp IFdlYktpdDJBUElUZXN0cy9UZXN0V2ViS2l0RmluZENvbnRyb2xsZXIgZmFpbHMgIm5leHQiIHRl c3QKZGlmZiAtLWdpdCBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLmd5cC9E dW1wUmVuZGVyVHJlZS5neXAgYi9Ub29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5n eXAvRHVtcFJlbmRlclRyZWUuZ3lwCmluZGV4IGYwNDcwODMyMjc1MmRlODAzMTRmNjViNzAyMjJl MWEzZTQxNmQ4NGIuLjMxZTg5MDk1YWEzM2IxMzYxYmE3MWYxOWIyYWZkYjJiNjQzODIzY2MgMTAw NjQ0Ci0tLSBhL1Rvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLmd5cC9EdW1wUmVu ZGVyVHJlZS5neXAKKysrIGIvVG9vbHMvRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUuZ3lw L0R1bXBSZW5kZXJUcmVlLmd5cApAQCAtNDY0LDYgKzQ2NCwxMyBAQAogICAgICAgICAgICAgICAg ICAgICAgICAgJzwoUFJPRFVDVF9ESVIpL2xpYi5qYXZhL2Nocm9taXVtX25ldC5qYXInLAogICAg ICAgICAgICAgICAgICAgICAgICAgJzwoUFJPRFVDVF9ESVIpL2xpYi5qYXZhL2Nocm9taXVtX21l ZGlhLmphcicsCiAgICAgICAgICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAgICAgICAgICdj b25kaXRpb25zJzogWworICAgICAgICAgICAgICAgICAgICAgICAgWydpbnNpZGVfY2hyb21pdW1f YnVpbGQ9PTEnLCB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgJ2FudF9idWlsZF90b19j aHJvbWl1bV9zcmMnOiAnPChhbnRfYnVpbGRfb3V0KS8uLi8uLi8nLAorICAgICAgICAgICAgICAg ICAgICAgICAgfSwgeworICAgICAgICAgICAgICAgICAgICAgICAgICAgICdhbnRfYnVpbGRfdG9f Y2hyb21pdW1fc3JjJzogJzwoY2hyb21pdW1fc3JjX2RpciknLAorICAgICAgICAgICAgICAgICAg ICAgICAgfV0sCisgICAgICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgfSwKICAg ICAgICAgICAgICAgICAjIFBhcnQgb2YgdGhlIGZvbGxvd2luZyB3YXMgY29waWVkIGZyb20gPChj aHJvbWl1bV9zcmNfZGlyKS9idWlsZC9hcGtfdGVzdC5ncHlpLgogICAgICAgICAgICAgICAgICMg Tm90IGluY2x1ZGluZyBpdCBiZWNhdXNlIGd5cCBpbmNsdWRlIGRvZXNuJ3Qgc3VwcG9ydCB2YXJp YWJsZSBpbiBwYXRoIG9yIHVuZGVyCkBAIC01MDAsNiArNTA3LDggQEAKICAgICAgICAgICAgICAg ICAgICAgICAgICctREFORFJPSURfVE9PTENIQUlOPTwoYW5kcm9pZF90b29sY2hhaW4pJywKICAg ICAgICAgICAgICAgICAgICAgICAgICctLWFudC1hcmdzJywKICAgICAgICAgICAgICAgICAgICAg ICAgICctRFBST0RVQ1RfRElSPTwoYW50X2J1aWxkX291dCknLAorICAgICAgICAgICAgICAgICAg ICAgICAgJy0tYW50LWFyZ3MnLAorICAgICAgICAgICAgICAgICAgICAgICAgJy1EQ0hST01JVU1f U1JDPTwoYW50X2J1aWxkX3RvX2Nocm9taXVtX3NyYyknLAogICAgICAgICAgICAgICAgICAgICAg ICAgJy0tc2RrLWJ1aWxkPTwoc2RrX2J1aWxkKScsCiAgICAgICAgICAgICAgICAgICAgICAgICAn LS1hcHBfYWJpJywKICAgICAgICAgICAgICAgICAgICAgICAgICc8KGFuZHJvaWRfYXBwX2FiaSkn LApkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLmd5cC9UZXN0 V2ViS2l0QVBJLmd5cCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdFdlYktpdEFQSS5neXAvVGVz dFdlYktpdEFQSS5neXAKaW5kZXggZTg0Mzg2ZjE4YjM0NGQwNmY3Mzk5ZmQwZTA0NjQwZGIxMGY4 OGJkOC4uZTZkODk3ZjYzN2FmYmM3M2Y4MTk1MTEzNGQ1Y2JkMjQyNzMyZmI2OSAxMDA2NDQKLS0t IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0V2ViS2l0QVBJLmd5cC9UZXN0V2ViS2l0QVBJLmd5 cAorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RXZWJLaXRBUEkuZ3lwL1Rlc3RXZWJLaXRB UEkuZ3lwCkBAIC0xMDcsNiArMTA3LDEzIEBACiAgICAgICAgICAgICAgICAgICAgICdpbnB1dF9q YXJzX3BhdGhzJzogWwogICAgICAgICAgICAgICAgICAgICAgICAgJzwoUFJPRFVDVF9ESVIpL2xp Yi5qYXZhL2Nocm9taXVtX2Jhc2UuamFyJywKICAgICAgICAgICAgICAgICAgICAgXSwKKyAgICAg ICAgICAgICAgICAgICAgJ2NvbmRpdGlvbnMnOiBbCisgICAgICAgICAgICAgICAgICAgICAgICBb J2luc2lkZV9jaHJvbWl1bV9idWlsZD09MScsIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAg ICAnYW50X2J1aWxkX3RvX2Nocm9taXVtX3NyYyc6ICc8KGFudF9idWlsZF9vdXQpLy4uLy4uLycs CisgICAgICAgICAgICAgICAgICAgICAgICB9LCB7CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgJ2FudF9idWlsZF90b19jaHJvbWl1bV9zcmMnOiAnPChjaHJvbWl1bV9zcmNfZGlyKScsCisg ICAgICAgICAgICAgICAgICAgICAgICB9XSwKKyAgICAgICAgICAgICAgICAgICAgXSwKICAgICAg ICAgICAgICAgICB9LAogICAgICAgICAgICAgICAgICMgUGFydCBvZiB0aGUgZm9sbG93aW5nIHdh cyBjb3BpZWQgZnJvbSA8KGNocm9taXVtX3NyY19kaXIpL2J1aWxkL2Fwa190ZXN0LmdweWkuCiAg ICAgICAgICAgICAgICAgIyBOb3QgaW5jbHVkaW5nIGl0IGJlY2F1c2UgZ3lwIGluY2x1ZGUgZG9l c24ndCBzdXBwb3J0IHZhcmlhYmxlIGluIHBhdGggb3IgdW5kZXIKQEAgLTE0Myw2ICsxNTAsOCBA QAogICAgICAgICAgICAgICAgICAgICAgICAgJy1EQU5EUk9JRF9UT09MQ0hBSU49PChhbmRyb2lk X3Rvb2xjaGFpbiknLAogICAgICAgICAgICAgICAgICAgICAgICAgJy0tYW50LWFyZ3MnLAogICAg ICAgICAgICAgICAgICAgICAgICAgJy1EUFJPRFVDVF9ESVI9PChhbnRfYnVpbGRfb3V0KScsCisg ICAgICAgICAgICAgICAgICAgICAgICAnLS1hbnQtYXJncycsCisgICAgICAgICAgICAgICAgICAg ICAgICAnLURDSFJPTUlVTV9TUkM9PChhbnRfYnVpbGRfdG9fY2hyb21pdW1fc3JjKScsCiAgICAg ICAgICAgICAgICAgICAgICAgICAnLS1zZGstYnVpbGQ9PChzZGtfYnVpbGQpJywKICAgICAgICAg ICAgICAgICAgICAgICAgICctLWFwcF9hYmknLAogICAgICAgICAgICAgICAgICAgICAgICAgJzwo YW5kcm9pZF9hcHBfYWJpKScsCg==