103758 2012-11-30 10:49:44 -0800 [Chromium] The ChromiumAndroidDriver constructor should not rely on adb being available 2012-12-04 08:26:20 -0800 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 peter peter abarth dpranke webkit.review.bot oldest_to_newest 780228 0 peter 2012-11-30 10:49:44 -0800 [Chromium] The ChromiumAndroidDriver constructor should not rely on adb being available 780230 1 176996 peter 2012-11-30 10:50:56 -0800 Created attachment 176996 Patch 780236 2 peter 2012-11-30 10:56:05 -0800 A subsequent cleanup would be to actually order methods on ChromiumAndroidDriver by visibility, similar to the public/private groups ChromiumAndroidPort has. 780239 3 webkit.review.bot 2012-11-30 11:01:39 -0800 Attachment 176996 did not pass style-queue: Failed to run "['Tools/Scripts/check-webkit-style', '--diff-files', u'Tools/ChangeLog', u'Tools/Scripts/webkitpy..." exit_code: 1 Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py:725: indentation is not a multiple of four [pep8/E111] [5] Total errors found: 1 in 2 files If any of these errors are false positives, please file a bug against check-webkit-style. 780242 4 176997 peter 2012-11-30 11:03:48 -0800 Created attachment 176997 Patch 780243 5 peter 2012-11-30 11:04:50 -0800 (In reply to comment #3) > If any of these errors are false positives, please file a bug against check-webkit-style. webkit-patch check-style-local was clean :/. Something is really wrong with my local checkout, I'm going to fix that on Monday. 780245 6 176997 eric 2012-11-30 11:07:51 -0800 Comment on attachment 176997 Patch Looks reasonable. 780287 7 dpranke 2012-11-30 12:07:23 -0800 looks reasonable to me as well. 782544 8 176997 peter 2012-12-04 07:56:52 -0800 Comment on attachment 176997 Patch Forgot to set cq?/+. Thanks for the review guys! 782568 9 176997 webkit.review.bot 2012-12-04 08:26:17 -0800 Comment on attachment 176997 Patch Clearing flags on attachment: 176997 Committed r136510: <http://trac.webkit.org/changeset/136510> 782569 10 webkit.review.bot 2012-12-04 08:26:20 -0800 All reviewed patches have been landed. Closing bug. 176996 2012-11-30 10:50:56 -0800 2012-11-30 11:03:41 -0800 Patch bug-103758-20121130184827.patch text/plain 5940 peter U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2MjQzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmE5ZjExNjMxOThlNzdhZTg3ZTM4MDA1NDM5YzVjYTIx ZmVlMGUyYy4uZDFlODcxYTgxYTFmYjYxZWY1ODUxMTI2MzRjYTM4NDQ5YzcxNTQ3NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDEyLTExLTMwICBQZXRlciBCZXZlcmxvbyAgPHBldGVyQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBbQ2hyb21pdW1dIFRoZSBDaHJvbWl1bUFuZHJvaWREcml2ZXIgY29uc3RydWN0b3Ig c2hvdWxkIG5vdCByZWx5IG9uIGFkYiBiZWluZyBhdmFpbGFibGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzc1OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExhemlseSBpbml0aWFsaXplIHRoZSBhZGIg Y29tbWFuZCBwYXJhbWV0ZXJzIHJhdGhlciB0aGFuIGluaXRpYWxpemluZyBpdCBpbiB0aGUKKyAg ICAgICAgY29uc3RydWN0b3Igbm93IHRoYXQgdGhlcmUgaXMgYW4gYXNzZXJ0IGlmIGFkYiBpcyBu b3QgYXZhaWxhYmxlIG9uIHRoZSBzeXN0ZW0gYW5kCisgICAgICAgIHdlJ3JlIG5vdCBpbiBhIENo cm9taXVtIEFuZHJvaWQgY2hlY2tvdXQuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHk6CisgICAgICAgIChDaHJvbWl1bUFu ZHJvaWREcml2ZXIuX19pbml0X18pOgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLl9w dXNoX2ZpbGVfaWZfbmVlZGVkKToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZlci5fcnVu X2FkYl9jb21tYW5kKToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZlci5jbWRfbGluZSk6 CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWREcml2ZXIuX3N0YXJ0X29uY2UpOgorICAgICAgICAo Q2hyb21pdW1BbmRyb2lkRHJpdmVyLl9yZWFkX3Byb21wdCk6CisgICAgICAgIChDaHJvbWl1bUFu ZHJvaWREcml2ZXIpOgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLl9hZGJfY29tbWFu ZCk6CisKIDIwMTItMTEtMjkgIFRvbW15IFdpZGVuZmx5Y2h0ICA8dG9tbXl3QGdvb2dsZS5jb20+ CiAKICAgICAgICAgU3BlZWNoIFJlY29nbml0aW9uIEFQSTogVXBkYXRlIFNwZWVjaFJlY29nbml0 aW9uRXZlbnQgdG8gbWF0Y2ggdGhlIHNwZWNpZmljYXRpb24KZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5w eQppbmRleCA5MWNkMzEwMGMwOGFlMDc2MDMxMjRjNjY0ZGEyYmZhODBmYjQ3YTZjLi44NjY3ZGE1 ZjA3NDU3ZjBjMTc1ODZhZDMyZWY4NDI5ZjdlMGI5Y2MxIDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lk LnB5CkBAIC0zNzMsNyArMzczLDcgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyKGRyaXZl ci5Ecml2ZXIpOgogICAgICAgICBzZWxmLl9oYXNfc2V0dXAgPSBGYWxzZQogICAgICAgICBzZWxm Ll9vcmlnaW5hbF9nb3Zlcm5vcnMgPSB7fQogICAgICAgICBzZWxmLl9kZXZpY2Vfc2VyaWFsID0g cG9ydC5fZ2V0X2RldmljZV9zZXJpYWwod29ya2VyX251bWJlcikKLSAgICAgICAgc2VsZi5fYWRi X2NvbW1hbmQgPSBbcG9ydC5wYXRoX3RvX2FkYigpLCAnLXMnLCBzZWxmLl9kZXZpY2Vfc2VyaWFs XQorICAgICAgICBzZWxmLl9hZGJfY29tbWFuZF9iYXNlID0gTm9uZQogCiAgICAgZGVmIF9fZGVs X18oc2VsZik6CiAgICAgICAgIHNlbGYuX3RlYXJkb3duX3BlcmZvcm1hbmNlKCkKQEAgLTQyOCw3 ICs0MjgsNyBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRyaXZlcik6CiAg ICAgZGVmIF9wdXNoX2ZpbGVfaWZfbmVlZGVkKHNlbGYsIGhvc3RfZmlsZSwgZGV2aWNlX2ZpbGUp OgogICAgICAgICBhc3NlcnQgb3MucGF0aC5leGlzdHMoaG9zdF9maWxlKQogICAgICAgICBkZXZp Y2VfaGFzaGVzID0gc2VsZi5fZXh0cmFjdF9oYXNoZXNfZnJvbV9tZDVzdW1fb3V0cHV0KAotICAg ICAgICAgICAgICAgIHNlbGYuX3BvcnQuaG9zdC5leGVjdXRpdmUucG9wZW4oc2VsZi5fYWRiX2Nv bW1hbmQgKyBbJ3NoZWxsJywgTUQ1U1VNX0RFVklDRV9QQVRILCBkZXZpY2VfZmlsZV0sCisgICAg ICAgICAgICAgICAgc2VsZi5fcG9ydC5ob3N0LmV4ZWN1dGl2ZS5wb3BlbihzZWxmLl9hZGJfY29t bWFuZCgpICsgWydzaGVsbCcsIE1ENVNVTV9ERVZJQ0VfUEFUSCwgZGV2aWNlX2ZpbGVdLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PXN1YnBy b2Nlc3MuUElQRSkuc3Rkb3V0KQogICAgICAgICBob3N0X2hhc2hlcyA9IHNlbGYuX2V4dHJhY3Rf aGFzaGVzX2Zyb21fbWQ1c3VtX291dHB1dCgKICAgICAgICAgICAgICAgICBzZWxmLl9wb3J0Lmhv c3QuZXhlY3V0aXZlLnBvcGVuKGFyZ3M9Wyclc19ob3N0JyAlIHNlbGYuX21kNXN1bV9wYXRoLCBo b3N0X2ZpbGVdLApAQCAtNDgwLDcgKzQ4MCw3IEBAIGNsYXNzIENocm9taXVtQW5kcm9pZERyaXZl cihkcml2ZXIuRHJpdmVyKToKICAgICAgICAgICAgIGVycm9yX2hhbmRsZXIgPSBzZWxmLl9wb3J0 Ll9leGVjdXRpdmUuaWdub3JlX2Vycm9yCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBlcnJv cl9oYW5kbGVyID0gTm9uZQotICAgICAgICByZXN1bHQgPSBzZWxmLl9wb3J0Ll9leGVjdXRpdmUu cnVuX2NvbW1hbmQoc2VsZi5fYWRiX2NvbW1hbmQgKyBjbWQsIGVycm9yX2hhbmRsZXI9ZXJyb3Jf aGFuZGxlcikKKyAgICAgICAgcmVzdWx0ID0gc2VsZi5fcG9ydC5fZXhlY3V0aXZlLnJ1bl9jb21t YW5kKHNlbGYuX2FkYl9jb21tYW5kKCkgKyBjbWQsIGVycm9yX2hhbmRsZXI9ZXJyb3JfaGFuZGxl cikKICAgICAgICAgIyBMaW1pdCB0aGUgbGVuZ3RoIHRvIGF2b2lkIHRvbyB2ZXJib3NlIG91dHB1 dCBvZiBjb21tYW5kcyBsaWtlICdhZGIgbG9nY2F0JyBhbmQgJ2NhdCAvZGF0YS90b21ic3RvbmVz L3RvbWJzdG9uZTAxJwogICAgICAgICAjIHdob3NlIG91dHB1dHMgYXJlIG5vcm1hbGx5IHByaW50 ZWQgaW4gbGF0ZXIgbG9ncy4KICAgICAgICAgc2VsZi5fbG9nX2RlYnVnKCdSdW4gYWRiIHJlc3Vs dDogJyArIHJlc3VsdFs6ODBdKQpAQCAtNTUwLDcgKzU1MCw3IEBAIGNsYXNzIENocm9taXVtQW5k cm9pZERyaXZlcihkcml2ZXIuRHJpdmVyKToKICAgICBkZWYgY21kX2xpbmUoc2VsZiwgcGl4ZWxf dGVzdHMsIHBlcl90ZXN0X2FyZ3MpOgogICAgICAgICAjIFRoZSByZXR1cm5lZCBjb21tYW5kIGxp bmUgaXMgdXNlZCB0byBzdGFydCBfc2VydmVyX3Byb2Nlc3MuIEluIG91ciBjYXNlLCBpdCdzIGFu IGludGVyYWN0aXZlICdhZGIgc2hlbGwnLgogICAgICAgICAjIFRoZSBjb21tYW5kIGxpbmUgcGFz c2VkIHRvIHRoZSBEUlQgcHJvY2VzcyBpcyByZXR1cm5lZCBieSBfZHJ0X2NtZF9saW5lKCkgaW5z dGVhZC4KLSAgICAgICAgcmV0dXJuIHNlbGYuX2FkYl9jb21tYW5kICsgWydzaGVsbCddCisgICAg ICAgIHJldHVybiBzZWxmLl9hZGJfY29tbWFuZCgpICsgWydzaGVsbCddCiAKICAgICBkZWYgX2Zp bGVfZXhpc3RzX29uX2RldmljZShzZWxmLCBmdWxsX2ZpbGVfcGF0aCk6CiAgICAgICAgIGFzc2Vy dCBmdWxsX2ZpbGVfcGF0aC5zdGFydHN3aXRoKCcvJykKQEAgLTYxMyw3ICs2MTMsNyBAQCBjbGFz cyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRyaXZlcik6CiAKICAgICAgICAgc2VsZi5f bG9nX2RlYnVnKCdTdGFydGluZyBmb3J3YXJkZXInKQogICAgICAgICBzZWxmLl9mb3J3YXJkZXJf cHJvY2VzcyA9IHNlbGYuX3BvcnQuX3NlcnZlcl9wcm9jZXNzX2NvbnN0cnVjdG9yKAotICAgICAg ICAgICAgc2VsZi5fcG9ydCwgJ0ZvcndhcmRlcicsIHNlbGYuX2FkYl9jb21tYW5kICsgWydzaGVs bCcsICclcyAtRCAlcycgJSAoREVWSUNFX0ZPUldBUkRFUl9QQVRILCBGT1JXQVJEX1BPUlRTKV0p CisgICAgICAgICAgICBzZWxmLl9wb3J0LCAnRm9yd2FyZGVyJywgc2VsZi5fYWRiX2NvbW1hbmQo KSArIFsnc2hlbGwnLCAnJXMgLUQgJXMnICUgKERFVklDRV9GT1JXQVJERVJfUEFUSCwgRk9SV0FS RF9QT1JUUyldKQogICAgICAgICBzZWxmLl9mb3J3YXJkZXJfcHJvY2Vzcy5zdGFydCgpCiAKICAg ICAgICAgc2VsZi5fcnVuX2FkYl9jb21tYW5kKFsnbG9nY2F0JywgJy1jJ10pCkBAIC02MzUsMTMg KzYzNSwxMyBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRyaXZlcik6CiAg ICAgICAgICMgU3RhcnQgYSBwcm9jZXNzIHRvIHJlYWQgZnJvbSB0aGUgc3Rkb3V0IGZpZm8gb2Yg dGhlIER1bXBSZW5kZXJUcmVlIGFwcCBhbmQgcHJpbnQgdG8gc3Rkb3V0LgogICAgICAgICBzZWxm Ll9sb2dfZGVidWcoJ1JlZGlyZWN0aW5nIHN0ZG91dCB0byAnICsgc2VsZi5fb3V0X2ZpZm9fcGF0 aCkKICAgICAgICAgc2VsZi5fcmVhZF9zdGRvdXRfcHJvY2VzcyA9IHNlbGYuX3BvcnQuX3NlcnZl cl9wcm9jZXNzX2NvbnN0cnVjdG9yKAotICAgICAgICAgICAgc2VsZi5fcG9ydCwgJ1JlYWRTdGRv dXQnLCBzZWxmLl9hZGJfY29tbWFuZCArIFsnc2hlbGwnLCAnY2F0Jywgc2VsZi5fb3V0X2ZpZm9f cGF0aF0pCisgICAgICAgICAgICBzZWxmLl9wb3J0LCAnUmVhZFN0ZG91dCcsIHNlbGYuX2FkYl9j b21tYW5kKCkgKyBbJ3NoZWxsJywgJ2NhdCcsIHNlbGYuX291dF9maWZvX3BhdGhdKQogICAgICAg ICBzZWxmLl9yZWFkX3N0ZG91dF9wcm9jZXNzLnN0YXJ0KCkKIAogICAgICAgICAjIFN0YXJ0IGEg cHJvY2VzcyB0byByZWFkIGZyb20gdGhlIHN0ZGVyciBmaWZvIG9mIHRoZSBEdW1wUmVuZGVyVHJl ZSBhcHAgYW5kIHByaW50IHRvIHN0ZG91dC4KICAgICAgICAgc2VsZi5fbG9nX2RlYnVnKCdSZWRp cmVjdGluZyBzdGRlcnIgdG8gJyArIHNlbGYuX2Vycl9maWZvX3BhdGgpCiAgICAgICAgIHNlbGYu X3JlYWRfc3RkZXJyX3Byb2Nlc3MgPSBzZWxmLl9wb3J0Ll9zZXJ2ZXJfcHJvY2Vzc19jb25zdHJ1 Y3RvcigKLSAgICAgICAgICAgIHNlbGYuX3BvcnQsICdSZWFkU3RkZXJyJywgc2VsZi5fYWRiX2Nv bW1hbmQgKyBbJ3NoZWxsJywgJ2NhdCcsIHNlbGYuX2Vycl9maWZvX3BhdGhdKQorICAgICAgICAg ICAgc2VsZi5fcG9ydCwgJ1JlYWRTdGRlcnInLCBzZWxmLl9hZGJfY29tbWFuZCgpICsgWydzaGVs bCcsICdjYXQnLCBzZWxmLl9lcnJfZmlmb19wYXRoXSkKICAgICAgICAgc2VsZi5fcmVhZF9zdGRl cnJfcHJvY2Vzcy5zdGFydCgpCiAKICAgICAgICAgc2VsZi5fbG9nX2RlYnVnKCdSZWRpcmVjdGlu ZyBzdGRpbiB0byAnICsgc2VsZi5faW5fZmlmb19wYXRoKQpAQCAtNzE5LDMgKzcxOSw4IEBAIGNs YXNzIENocm9taXVtQW5kcm9pZERyaXZlcihkcml2ZXIuRHJpdmVyKToKICAgICAgICAgICAgICAg ICBpZiBsYXN0X2NoYXIgaW4gKCcjJywgJyQnKToKICAgICAgICAgICAgICAgICAgICAgcmV0dXJu CiAgICAgICAgICAgICBsYXN0X2NoYXIgPSBjdXJyZW50X2NoYXIKKworICAgIGRlZiBfYWRiX2Nv bW1hbmQoc2VsZik6CisgICAgICAgIGlmIG5vdCBzZWxmLl9hZGJfY29tbWFuZF9iYXNlOgorICAg ICAgICAgICBzZWxmLl9hZGJfY29tbWFuZF9iYXNlID0gW3NlbGYuX3BvcnQucGF0aF90b19hZGIo KSwgJy1zJywgc2VsZi5fZGV2aWNlX3NlcmlhbF0KKyAgICAgICAgcmV0dXJuIHNlbGYuX2FkYl9j b21tYW5kX2Jhc2UK 176997 2012-11-30 11:03:48 -0800 2012-12-04 08:26:17 -0800 Patch bug-103758-20121130190119.patch text/plain 5941 peter U3VidmVyc2lvbiBSZXZpc2lvbjogMTM2MjQzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZmE5ZjExNjMxOThlNzdhZTg3ZTM4MDA1NDM5YzVjYTIx ZmVlMGUyYy4uZDFlODcxYTgxYTFmYjYxZWY1ODUxMTI2MzRjYTM4NDQ5YzcxNTQ3NyAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0 IEBACisyMDEyLTExLTMwICBQZXRlciBCZXZlcmxvbyAgPHBldGVyQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBbQ2hyb21pdW1dIFRoZSBDaHJvbWl1bUFuZHJvaWREcml2ZXIgY29uc3RydWN0b3Ig c2hvdWxkIG5vdCByZWx5IG9uIGFkYiBiZWluZyBhdmFpbGFibGUKKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEwMzc1OAorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIExhemlseSBpbml0aWFsaXplIHRoZSBhZGIg Y29tbWFuZCBwYXJhbWV0ZXJzIHJhdGhlciB0aGFuIGluaXRpYWxpemluZyBpdCBpbiB0aGUKKyAg ICAgICAgY29uc3RydWN0b3Igbm93IHRoYXQgdGhlcmUgaXMgYW4gYXNzZXJ0IGlmIGFkYiBpcyBu b3QgYXZhaWxhYmxlIG9uIHRoZSBzeXN0ZW0gYW5kCisgICAgICAgIHdlJ3JlIG5vdCBpbiBhIENo cm9taXVtIEFuZHJvaWQgY2hlY2tvdXQuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2xh eW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHk6CisgICAgICAgIChDaHJvbWl1bUFu ZHJvaWREcml2ZXIuX19pbml0X18pOgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLl9w dXNoX2ZpbGVfaWZfbmVlZGVkKToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZlci5fcnVu X2FkYl9jb21tYW5kKToKKyAgICAgICAgKENocm9taXVtQW5kcm9pZERyaXZlci5jbWRfbGluZSk6 CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWREcml2ZXIuX3N0YXJ0X29uY2UpOgorICAgICAgICAo Q2hyb21pdW1BbmRyb2lkRHJpdmVyLl9yZWFkX3Byb21wdCk6CisgICAgICAgIChDaHJvbWl1bUFu ZHJvaWREcml2ZXIpOgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkRHJpdmVyLl9hZGJfY29tbWFu ZCk6CisKIDIwMTItMTEtMjkgIFRvbW15IFdpZGVuZmx5Y2h0ICA8dG9tbXl3QGdvb2dsZS5jb20+ CiAKICAgICAgICAgU3BlZWNoIFJlY29nbml0aW9uIEFQSTogVXBkYXRlIFNwZWVjaFJlY29nbml0 aW9uRXZlbnQgdG8gbWF0Y2ggdGhlIHNwZWNpZmljYXRpb24KZGlmZiAtLWdpdCBhL1Rvb2xzL1Nj cmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weSBiL1Rv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5w eQppbmRleCA5MWNkMzEwMGMwOGFlMDc2MDMxMjRjNjY0ZGEyYmZhODBmYjQ3YTZjLi43ZGVmMGMw ZmFiMWMyZDQ3NzhhYTcyZjUyNDU5MWRjMWE5ZTY5YjM5IDEwMDY0NAotLS0gYS9Ub29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lk LnB5CkBAIC0zNzMsNyArMzczLDcgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkRHJpdmVyKGRyaXZl ci5Ecml2ZXIpOgogICAgICAgICBzZWxmLl9oYXNfc2V0dXAgPSBGYWxzZQogICAgICAgICBzZWxm Ll9vcmlnaW5hbF9nb3Zlcm5vcnMgPSB7fQogICAgICAgICBzZWxmLl9kZXZpY2Vfc2VyaWFsID0g cG9ydC5fZ2V0X2RldmljZV9zZXJpYWwod29ya2VyX251bWJlcikKLSAgICAgICAgc2VsZi5fYWRi X2NvbW1hbmQgPSBbcG9ydC5wYXRoX3RvX2FkYigpLCAnLXMnLCBzZWxmLl9kZXZpY2Vfc2VyaWFs XQorICAgICAgICBzZWxmLl9hZGJfY29tbWFuZF9iYXNlID0gTm9uZQogCiAgICAgZGVmIF9fZGVs X18oc2VsZik6CiAgICAgICAgIHNlbGYuX3RlYXJkb3duX3BlcmZvcm1hbmNlKCkKQEAgLTQyOCw3 ICs0MjgsNyBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRyaXZlcik6CiAg ICAgZGVmIF9wdXNoX2ZpbGVfaWZfbmVlZGVkKHNlbGYsIGhvc3RfZmlsZSwgZGV2aWNlX2ZpbGUp OgogICAgICAgICBhc3NlcnQgb3MucGF0aC5leGlzdHMoaG9zdF9maWxlKQogICAgICAgICBkZXZp Y2VfaGFzaGVzID0gc2VsZi5fZXh0cmFjdF9oYXNoZXNfZnJvbV9tZDVzdW1fb3V0cHV0KAotICAg ICAgICAgICAgICAgIHNlbGYuX3BvcnQuaG9zdC5leGVjdXRpdmUucG9wZW4oc2VsZi5fYWRiX2Nv bW1hbmQgKyBbJ3NoZWxsJywgTUQ1U1VNX0RFVklDRV9QQVRILCBkZXZpY2VfZmlsZV0sCisgICAg ICAgICAgICAgICAgc2VsZi5fcG9ydC5ob3N0LmV4ZWN1dGl2ZS5wb3BlbihzZWxmLl9hZGJfY29t bWFuZCgpICsgWydzaGVsbCcsIE1ENVNVTV9ERVZJQ0VfUEFUSCwgZGV2aWNlX2ZpbGVdLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgc3Rkb3V0PXN1YnBy b2Nlc3MuUElQRSkuc3Rkb3V0KQogICAgICAgICBob3N0X2hhc2hlcyA9IHNlbGYuX2V4dHJhY3Rf aGFzaGVzX2Zyb21fbWQ1c3VtX291dHB1dCgKICAgICAgICAgICAgICAgICBzZWxmLl9wb3J0Lmhv c3QuZXhlY3V0aXZlLnBvcGVuKGFyZ3M9Wyclc19ob3N0JyAlIHNlbGYuX21kNXN1bV9wYXRoLCBo b3N0X2ZpbGVdLApAQCAtNDgwLDcgKzQ4MCw3IEBAIGNsYXNzIENocm9taXVtQW5kcm9pZERyaXZl cihkcml2ZXIuRHJpdmVyKToKICAgICAgICAgICAgIGVycm9yX2hhbmRsZXIgPSBzZWxmLl9wb3J0 Ll9leGVjdXRpdmUuaWdub3JlX2Vycm9yCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICBlcnJv cl9oYW5kbGVyID0gTm9uZQotICAgICAgICByZXN1bHQgPSBzZWxmLl9wb3J0Ll9leGVjdXRpdmUu cnVuX2NvbW1hbmQoc2VsZi5fYWRiX2NvbW1hbmQgKyBjbWQsIGVycm9yX2hhbmRsZXI9ZXJyb3Jf aGFuZGxlcikKKyAgICAgICAgcmVzdWx0ID0gc2VsZi5fcG9ydC5fZXhlY3V0aXZlLnJ1bl9jb21t YW5kKHNlbGYuX2FkYl9jb21tYW5kKCkgKyBjbWQsIGVycm9yX2hhbmRsZXI9ZXJyb3JfaGFuZGxl cikKICAgICAgICAgIyBMaW1pdCB0aGUgbGVuZ3RoIHRvIGF2b2lkIHRvbyB2ZXJib3NlIG91dHB1 dCBvZiBjb21tYW5kcyBsaWtlICdhZGIgbG9nY2F0JyBhbmQgJ2NhdCAvZGF0YS90b21ic3RvbmVz L3RvbWJzdG9uZTAxJwogICAgICAgICAjIHdob3NlIG91dHB1dHMgYXJlIG5vcm1hbGx5IHByaW50 ZWQgaW4gbGF0ZXIgbG9ncy4KICAgICAgICAgc2VsZi5fbG9nX2RlYnVnKCdSdW4gYWRiIHJlc3Vs dDogJyArIHJlc3VsdFs6ODBdKQpAQCAtNTUwLDcgKzU1MCw3IEBAIGNsYXNzIENocm9taXVtQW5k cm9pZERyaXZlcihkcml2ZXIuRHJpdmVyKToKICAgICBkZWYgY21kX2xpbmUoc2VsZiwgcGl4ZWxf dGVzdHMsIHBlcl90ZXN0X2FyZ3MpOgogICAgICAgICAjIFRoZSByZXR1cm5lZCBjb21tYW5kIGxp bmUgaXMgdXNlZCB0byBzdGFydCBfc2VydmVyX3Byb2Nlc3MuIEluIG91ciBjYXNlLCBpdCdzIGFu IGludGVyYWN0aXZlICdhZGIgc2hlbGwnLgogICAgICAgICAjIFRoZSBjb21tYW5kIGxpbmUgcGFz c2VkIHRvIHRoZSBEUlQgcHJvY2VzcyBpcyByZXR1cm5lZCBieSBfZHJ0X2NtZF9saW5lKCkgaW5z dGVhZC4KLSAgICAgICAgcmV0dXJuIHNlbGYuX2FkYl9jb21tYW5kICsgWydzaGVsbCddCisgICAg ICAgIHJldHVybiBzZWxmLl9hZGJfY29tbWFuZCgpICsgWydzaGVsbCddCiAKICAgICBkZWYgX2Zp bGVfZXhpc3RzX29uX2RldmljZShzZWxmLCBmdWxsX2ZpbGVfcGF0aCk6CiAgICAgICAgIGFzc2Vy dCBmdWxsX2ZpbGVfcGF0aC5zdGFydHN3aXRoKCcvJykKQEAgLTYxMyw3ICs2MTMsNyBAQCBjbGFz cyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRyaXZlcik6CiAKICAgICAgICAgc2VsZi5f bG9nX2RlYnVnKCdTdGFydGluZyBmb3J3YXJkZXInKQogICAgICAgICBzZWxmLl9mb3J3YXJkZXJf cHJvY2VzcyA9IHNlbGYuX3BvcnQuX3NlcnZlcl9wcm9jZXNzX2NvbnN0cnVjdG9yKAotICAgICAg ICAgICAgc2VsZi5fcG9ydCwgJ0ZvcndhcmRlcicsIHNlbGYuX2FkYl9jb21tYW5kICsgWydzaGVs bCcsICclcyAtRCAlcycgJSAoREVWSUNFX0ZPUldBUkRFUl9QQVRILCBGT1JXQVJEX1BPUlRTKV0p CisgICAgICAgICAgICBzZWxmLl9wb3J0LCAnRm9yd2FyZGVyJywgc2VsZi5fYWRiX2NvbW1hbmQo KSArIFsnc2hlbGwnLCAnJXMgLUQgJXMnICUgKERFVklDRV9GT1JXQVJERVJfUEFUSCwgRk9SV0FS RF9QT1JUUyldKQogICAgICAgICBzZWxmLl9mb3J3YXJkZXJfcHJvY2Vzcy5zdGFydCgpCiAKICAg ICAgICAgc2VsZi5fcnVuX2FkYl9jb21tYW5kKFsnbG9nY2F0JywgJy1jJ10pCkBAIC02MzUsMTMg KzYzNSwxMyBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWREcml2ZXIoZHJpdmVyLkRyaXZlcik6CiAg ICAgICAgICMgU3RhcnQgYSBwcm9jZXNzIHRvIHJlYWQgZnJvbSB0aGUgc3Rkb3V0IGZpZm8gb2Yg dGhlIER1bXBSZW5kZXJUcmVlIGFwcCBhbmQgcHJpbnQgdG8gc3Rkb3V0LgogICAgICAgICBzZWxm Ll9sb2dfZGVidWcoJ1JlZGlyZWN0aW5nIHN0ZG91dCB0byAnICsgc2VsZi5fb3V0X2ZpZm9fcGF0 aCkKICAgICAgICAgc2VsZi5fcmVhZF9zdGRvdXRfcHJvY2VzcyA9IHNlbGYuX3BvcnQuX3NlcnZl cl9wcm9jZXNzX2NvbnN0cnVjdG9yKAotICAgICAgICAgICAgc2VsZi5fcG9ydCwgJ1JlYWRTdGRv dXQnLCBzZWxmLl9hZGJfY29tbWFuZCArIFsnc2hlbGwnLCAnY2F0Jywgc2VsZi5fb3V0X2ZpZm9f cGF0aF0pCisgICAgICAgICAgICBzZWxmLl9wb3J0LCAnUmVhZFN0ZG91dCcsIHNlbGYuX2FkYl9j b21tYW5kKCkgKyBbJ3NoZWxsJywgJ2NhdCcsIHNlbGYuX291dF9maWZvX3BhdGhdKQogICAgICAg ICBzZWxmLl9yZWFkX3N0ZG91dF9wcm9jZXNzLnN0YXJ0KCkKIAogICAgICAgICAjIFN0YXJ0IGEg cHJvY2VzcyB0byByZWFkIGZyb20gdGhlIHN0ZGVyciBmaWZvIG9mIHRoZSBEdW1wUmVuZGVyVHJl ZSBhcHAgYW5kIHByaW50IHRvIHN0ZG91dC4KICAgICAgICAgc2VsZi5fbG9nX2RlYnVnKCdSZWRp cmVjdGluZyBzdGRlcnIgdG8gJyArIHNlbGYuX2Vycl9maWZvX3BhdGgpCiAgICAgICAgIHNlbGYu X3JlYWRfc3RkZXJyX3Byb2Nlc3MgPSBzZWxmLl9wb3J0Ll9zZXJ2ZXJfcHJvY2Vzc19jb25zdHJ1 Y3RvcigKLSAgICAgICAgICAgIHNlbGYuX3BvcnQsICdSZWFkU3RkZXJyJywgc2VsZi5fYWRiX2Nv bW1hbmQgKyBbJ3NoZWxsJywgJ2NhdCcsIHNlbGYuX2Vycl9maWZvX3BhdGhdKQorICAgICAgICAg ICAgc2VsZi5fcG9ydCwgJ1JlYWRTdGRlcnInLCBzZWxmLl9hZGJfY29tbWFuZCgpICsgWydzaGVs bCcsICdjYXQnLCBzZWxmLl9lcnJfZmlmb19wYXRoXSkKICAgICAgICAgc2VsZi5fcmVhZF9zdGRl cnJfcHJvY2Vzcy5zdGFydCgpCiAKICAgICAgICAgc2VsZi5fbG9nX2RlYnVnKCdSZWRpcmVjdGlu ZyBzdGRpbiB0byAnICsgc2VsZi5faW5fZmlmb19wYXRoKQpAQCAtNzE5LDMgKzcxOSw4IEBAIGNs YXNzIENocm9taXVtQW5kcm9pZERyaXZlcihkcml2ZXIuRHJpdmVyKToKICAgICAgICAgICAgICAg ICBpZiBsYXN0X2NoYXIgaW4gKCcjJywgJyQnKToKICAgICAgICAgICAgICAgICAgICAgcmV0dXJu CiAgICAgICAgICAgICBsYXN0X2NoYXIgPSBjdXJyZW50X2NoYXIKKworICAgIGRlZiBfYWRiX2Nv bW1hbmQoc2VsZik6CisgICAgICAgIGlmIG5vdCBzZWxmLl9hZGJfY29tbWFuZF9iYXNlOgorICAg ICAgICAgICAgc2VsZi5fYWRiX2NvbW1hbmRfYmFzZSA9IFtzZWxmLl9wb3J0LnBhdGhfdG9fYWRi KCksICctcycsIHNlbGYuX2RldmljZV9zZXJpYWxdCisgICAgICAgIHJldHVybiBzZWxmLl9hZGJf Y29tbWFuZF9iYXNlCg==