88598 2012-06-07 17:39:52 -0700 [Chromium-Android] Build DumpRenderTree with Android SDK 2012-06-10 20:12:36 -0700 1 1 1 Unclassified WebKit Tools / Tests 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 66687 88542 1 wangxianzhu wangxianzhu abarth dpranke james.wei ojan peter tony webkit.review.bot zhenghao oldest_to_newest 644130 0 wangxianzhu 2012-06-07 17:39:52 -0700 This is follow-up of bug 86862, to change WebKit side accordingly after some changes at chromium side. 644281 1 146468 wangxianzhu 2012-06-07 21:04:54 -0700 Created attachment 146468 patch 644327 2 james.wei 2012-06-07 22:10:15 -0700 *** Bug 88610 has been marked as a duplicate of this bug. *** 644329 3 james.wei 2012-06-07 22:11:22 -0700 *** Bug 88607 has been marked as a duplicate of this bug. *** 644833 4 146468 abarth 2012-06-08 11:03:23 -0700 Comment on attachment 146468 patch I'm happy to rubber-stamp this change. You might want to check with Peter before landing. 644864 5 146468 wangxianzhu 2012-06-08 11:21:52 -0700 Comment on attachment 146468 patch Peter (sorry I should have cc'ed you), does the patch look good to you? If yes, please just set cq+. Thanks. We will still have many layout test failures with this patch. Hao, could you create a meta bug for remaining Android DRT upstreaming tasks? Two things I just thought of are: test expectations, font settings. 644894 6 146468 peter 2012-06-08 11:41:55 -0700 Comment on attachment 146468 patch View in context: https://bugs.webkit.org/attachment.cgi?id=146468&action=review LGTM. I'm building the patch at the moment to verify it won't break the build. After it succeeds I'll put it on the commit queue. Cheers! > Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:433 > + 'action_name': 'apk_<(test_suite_name)', Since this gyp-code is copied and not marked as FIXME, can we get rid of the test_suite_name variable and just fill in "DumpRenderTree"? At one point we'll move all of these support scripts (including generate_native_test.py, for example) to their own repository. > Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:454 > + '--ant-compile', I think this may need a rebase, given that the patch from bug 88626 is already on the commit queue. > Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py:276 > + return self._build_path(configuration, 'DumpRenderTree_apk/DumpRenderTree-debug.apk') Why do we use "-debug" here, again? Seems fine, but I forgot the reason :). 644909 7 146468 wangxianzhu 2012-06-08 11:54:16 -0700 Comment on attachment 146468 patch View in context: https://bugs.webkit.org/attachment.cgi?id=146468&action=review Will upload the new patch soon after I verify it locally. >> Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:433 >> + 'action_name': 'apk_<(test_suite_name)', > > Since this gyp-code is copied and not marked as FIXME, can we get rid of the test_suite_name variable and just fill in "DumpRenderTree"? At one point we'll move all of these support scripts (including generate_native_test.py, for example) to their own repository. Agreed. Done. >> Tools/DumpRenderTree/DumpRenderTree.gyp/DumpRenderTree.gyp:454 >> + '--ant-compile', > > I think this may need a rebase, given that the patch from bug 88626 is already on the commit queue. Done. >> Tools/Scripts/webkitpy/layout_tests/port/chromium_android.py:276 >> + return self._build_path(configuration, 'DumpRenderTree_apk/DumpRenderTree-debug.apk') > > Why do we use "-debug" here, again? Seems fine, but I forgot the reason :). This is the naming convention of Android SDK's ant rule. In our ant build script (called from generate_native_test.py) the default type is 'debug'. 644923 8 146624 wangxianzhu 2012-06-08 12:11:01 -0700 Created attachment 146624 patch for landing Peter has verified it and admitted cq in offline. 644954 9 146624 webkit.review.bot 2012-06-08 12:51:00 -0700 Comment on attachment 146624 patch for landing Rejecting attachment 146624 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 1 ERROR: /mnt/git/webkit-commit-queue/Tools/ChangeLog neither lists a valid reviewer nor contains the string "Unreviewed" or "Rubber stamp" (case insensitive). Full output: http://queues.webkit.org/results/12924400 644969 10 146633 wangxianzhu 2012-06-08 13:12:39 -0700 Created attachment 146633 patch for landing (with correct reviewer line) 645218 11 146633 webkit.review.bot 2012-06-08 19:45:42 -0700 Comment on attachment 146633 patch for landing (with correct reviewer line) Clearing flags on attachment: 146633 Committed r119888: <http://trac.webkit.org/changeset/119888> 645219 12 webkit.review.bot 2012-06-08 19:45:47 -0700 All reviewed patches have been landed. Closing bug. 645679 13 zhenghao 2012-06-10 20:12:36 -0700 (In reply to comment #5) > (From update of attachment 146468 [details]) > Peter (sorry I should have cc'ed you), does the patch look good to you? If yes, please just set cq+. Thanks. > > We will still have many layout test failures with this patch. > > Hao, could you create a meta bug for remaining Android DRT upstreaming tasks? Two things I just thought of are: test expectations, font settings. Bug for font settings: https://bugs.webkit.org/show_bug.cgi?id=87006 We can file expectation bugs after we run layout test on some bot. 146468 2012-06-07 21:04:54 -0700 2012-06-08 12:11:01 -0700 patch 88598.txt text/plain 6341 wangxianzhu DQpJbmRleDogVG9vbHMvQ2hhbmdlTG9nDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09DQotLS0gVG9vbHMvQ2hhbmdlTG9n ICAgICAocmV2aXNpb24gMTE5NzkyKQ0KKysrIFRvb2xzL0NoYW5nZUxvZyAgICAgKHdvcmtpbmcg Y29weSkNCkBAIC0xLDMgKzEsMTcgQEANCisyMDEyLTA2LTA3ICBYaWFuemh1IFdhbmcgIDx3YW5n eGlhbnpodUBjaHJvbWl1bS5vcmc+DQorDQorICAgICAgICBbQ2hyb21pdW0tQW5kcm9pZF0gQnVp bGQgRHVtcFJlbmRlclRyZWUgd2l0aCBBbmRyb2lkIFNESw0KKyAgICAgICAgaHR0cHM6Ly9idWdz LndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4NTk4DQorDQorICAgICAgICBDaGFuZ2UgV2Vi S2l0IHNpZGUgb2YgRFJUIHJlbGF0ZWQgY29kZSBhY2NvcmRpbmcgdG8gc29tZSByZWNlbnQgY2hh bmdlcyBhdCBjaHJvbWl1bSBzaWRlLg0KKw0KKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuDQorDQorICAgICAgICAqIER1bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLmd5cC9E dW1wUmVuZGVyVHJlZS5neXA6DQorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rl c3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weToNCisgICAgICAgIChDaHJvbWl1bUFuZHJvaWRQ b3J0Ll9faW5pdF9fKToNCisgICAgICAgIChDaHJvbWl1bUFuZHJvaWRQb3J0Ll9wYXRoX3RvX2Ry aXZlcik6DQorDQogMjAxMi0wNi0wNyAgSm9zaHVhIExvY2sgIDxqb3NodWEubG9ja0BpbnRlbC5j b20+DQoNCiAgICAgICAgIFtFRkxdW0RSVF0gTm9ybWFsaXplIGZpbGU6Ly8vdG1wL0xheW91dFRl c3RzIGluIExheW91dFRlc3RDb250cm9sbGVyOjpwYXRoVG9Mb2NhbFJlc291cmNlKCkNCkluZGV4 OiBUb29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5neXAvRHVtcFJlbmRlclRyZWUu Z3lwDQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09DQotLS0gVG9vbHMvRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUu Z3lwL0R1bXBSZW5kZXJUcmVlLmd5cCAgKHJldmlzaW9uIDExOTc5MikNCisrKyBUb29scy9EdW1w UmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5neXAvRHVtcFJlbmRlclRyZWUuZ3lwICAod29ya2lu ZyBjb3B5KQ0KQEAgLTQwOCwzOCArNDA4LDUwIEBADQogICAgICAgICB9XSwNCiAgICAgICAgIFsn T1M9PSJhbmRyb2lkIicsIHsNCiAgICAgICAgICAgICAjIFdyYXAgbGliRHVtcFJlbmRlclRyZWUu c28gaW50byBhbiBhbmRyb2lkIGFwayBmb3IgZXhlY3V0aW9uLg0KLSAgICAgICAgICAgICMgU2Vl IDwoY2hyb21pdW1fc3JjX2RpcikvYmFzZS9iYXNlLmd5cCBmb3IgVE9ETyhqcmcpcyBhYm91dCB0 aGlzIHN0cmF0ZWd5Lg0KICAgICAgICAgICAgICd0YXJnZXRzJzogW3sNCiAgICAgICAgICAgICAg ICAgJ3RhcmdldF9uYW1lJzogJ0R1bXBSZW5kZXJUcmVlX2FwaycsDQogICAgICAgICAgICAgICAg ICd0eXBlJzogJ25vbmUnLA0KICAgICAgICAgICAgICAgICAnZGVwZW5kZW5jaWVzJzogWw0KKyAg ICAgICAgICAgICAgICAgICAgJzwoY2hyb21pdW1fc3JjX2RpcikvYmFzZS9iYXNlLmd5cDpiYXNl X2phdmEnLA0KKyAgICAgICAgICAgICAgICAgICAgJzwoY2hyb21pdW1fc3JjX2RpcikvbmV0L25l dC5neXA6bmV0X2phdmEnLA0KKyAgICAgICAgICAgICAgICAgICAgJzwoY2hyb21pdW1fc3JjX2Rp cikvbWVkaWEvbWVkaWEuZ3lwOm1lZGlhX2phdmEnLA0KICAgICAgICAgICAgICAgICAgICAgJ0R1 bXBSZW5kZXJUcmVlJywNCiAgICAgICAgICAgICAgICAgXSwNCisgICAgICAgICAgICAgICAgJ3Zh cmlhYmxlcyc6IHsNCisgICAgICAgICAgICAgICAgICAgICd0ZXN0X3N1aXRlX25hbWUnOiAnRHVt cFJlbmRlclRyZWUnLA0KKyAgICAgICAgICAgICAgICAgICAgJ2lucHV0X3NobGliX3BhdGgnOiAn PChTSEFSRURfTElCX0RJUikvPChTSEFSRURfTElCX1BSRUZJWClEdW1wUmVuZGVyVHJlZTwoU0hB UkVEX0xJQl9TVUZGSVgpJywNCisgICAgICAgICAgICAgICAgICAgICdpbnB1dF9qYXJzX3BhdGhz JzogWw0KKyAgICAgICAgICAgICAgICAgICAgICAgICc8KFBST0RVQ1RfRElSKS9saWIuamF2YS9j aHJvbWl1bV9iYXNlLmphcicsDQorICAgICAgICAgICAgICAgICAgICAgICAgJzwoUFJPRFVDVF9E SVIpL2xpYi5qYXZhL2Nocm9taXVtX25ldC5qYXInLA0KKyAgICAgICAgICAgICAgICAgICAgICAg ICc8KFBST0RVQ1RfRElSKS9saWIuamF2YS9jaHJvbWl1bV9tZWRpYS5qYXInLA0KKyAgICAgICAg ICAgICAgICAgICAgXSwNCisgICAgICAgICAgICAgICAgfSwNCisgICAgICAgICAgICAgICAgIyBQ YXJ0IG9mIHRoZSBmb2xsb3dpbmcgd2FzIGNvcGllZCBmcm9tIDwoY2hyb21pdW1fc3JjX2Rpcikv YnVpbGQvYXBrX3Rlc3QuZ3B5aS4NCisgICAgICAgICAgICAgICAgIyBOb3QgaW5jbHVkaW5nIGl0 IGJlY2F1c2UgZ3lwIGluY2x1ZGUgZG9lc24ndCBzdXBwb3J0IHZhcmlhYmxlIGluIHBhdGggb3Ig dW5kZXINCisgICAgICAgICAgICAgICAgIyBjb25kaXRpb25zLiBBbmQgd2UgYWxzbyBoYXZlIHNv bWUgZGlmZmVyZW50IHJlcXVpcmVtZW50cy4NCiAgICAgICAgICAgICAgICAgJ2FjdGlvbnMnOiBb ew0KLSAgICAgICAgICAgICAgICAgICAgIyBHZW5lcmF0ZSBhcGsgZmlsZXMgKGluY2x1ZGluZyBz b3VyY2UgYW5kIGFudGZpbGUpIGZyb20NCi0gICAgICAgICAgICAgICAgICAgICMgYSB0ZW1wbGF0 ZSwgYW5kIGJ1aWxkcyB0aGVtLg0KLSAgICAgICAgICAgICAgICAgICAgJ2FjdGlvbl9uYW1lJzog J2dlbmVyYXRlX2FuZF9idWlsZCcsDQorICAgICAgICAgICAgICAgICAgICAnYWN0aW9uX25hbWUn OiAnYXBrXzwodGVzdF9zdWl0ZV9uYW1lKScsDQorICAgICAgICAgICAgICAgICAgICAnbWVzc2Fn ZSc6ICdCdWlsZGluZyA8KHRlc3Rfc3VpdGVfbmFtZSkgdGVzdCBhcGsuJywNCiAgICAgICAgICAg ICAgICAgICAgICdpbnB1dHMnOiBbDQorICAgICAgICAgICAgICAgICAgICAgICAgJzwoY2hyb21p dW1fc3JjX2RpcikvdGVzdGluZy9hbmRyb2lkL0FuZHJvaWRNYW5pZmVzdC54bWwnLA0KICAgICAg ICAgICAgICAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL3Rlc3RpbmcvYW5kcm9pZC9n ZW5lcmF0ZV9uYXRpdmVfdGVzdC5weScsDQotICAgICAgICAgICAgICAgICAgICAgICAgJzwoU0hB UkVEX0xJQl9ESVIpLzwoU0hBUkVEX0xJQl9QUkVGSVgpRHVtcFJlbmRlclRyZWU8KFNIQVJFRF9M SUJfU1VGRklYKScsDQotICAgICAgICAgICAgICAgICAgICAgICAgIyBGSVhNRTogQnVpbGQgdGhl IGphciBmb3IgbmF0aXZlIHRlc3RzIHdpdGggU0RLLg0KLSAgICAgICAgICAgICAgICAgICAgICAg ICMgRm9yIG5vdyB3ZSBhcmUgdXNpbmcgQW5kcm9pZC5tayB0byBidWlsZCB0aGUgYXBrLg0KKyAg ICAgICAgICAgICAgICAgICAgICAgICc8KGlucHV0X3NobGliX3BhdGgpJywNCisgICAgICAgICAg ICAgICAgICAgICAgICAnPEAoaW5wdXRfamFyc19wYXRocyknLA0KICAgICAgICAgICAgICAgICAg ICAgXSwNCiAgICAgICAgICAgICAgICAgICAgICdvdXRwdXRzJzogWw0KLSAgICAgICAgICAgICAg ICAgICAgICAgICc8KFBST0RVQ1RfRElSKS9EdW1wUmVuZGVyVHJlZV9hcGsvQ2hyb21lTmF0aXZl VGVzdHMtZGVidWcuYXBrJywNCisgICAgICAgICAgICAgICAgICAgICAgICAnPChQUk9EVUNUX0RJ UikvPCh0ZXN0X3N1aXRlX25hbWUpX2Fway88KHRlc3Rfc3VpdGVfbmFtZSktZGVidWcuYXBrJywN CiAgICAgICAgICAgICAgICAgICAgIF0sDQogICAgICAgICAgICAgICAgICAgICAnYWN0aW9uJzog Ww0KICAgICAgICAgICAgICAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL3Rlc3Rpbmcv YW5kcm9pZC9nZW5lcmF0ZV9uYXRpdmVfdGVzdC5weScsDQogICAgICAgICAgICAgICAgICAgICAg ICAgJy0tbmF0aXZlX2xpYnJhcnknLA0KLSAgICAgICAgICAgICAgICAgICAgICAgICc8KFNIQVJF RF9MSUJfRElSKS88KFNIQVJFRF9MSUJfUFJFRklYKUR1bXBSZW5kZXJUcmVlPChTSEFSRURfTElC X1NVRkZJWCknLA0KLSAgICAgICAgICAgICAgICAgICAgICAgICMgRklYTUU6IEJ1aWxkIHRoZSBq YXIgZm9yIG5hdGl2ZSB0ZXN0cyB3aXRoIFNESy4NCi0gICAgICAgICAgICAgICAgICAgICAgICAj ICctLWphcicsDQotICAgICAgICAgICAgICAgICAgICAgICAgIyAnZm9vL2Jhci5qYXInLA0KKyAg ICAgICAgICAgICAgICAgICAgICAgICc8KGlucHV0X3NobGliX3BhdGgpJywNCisgICAgICAgICAg ICAgICAgICAgICAgICAnLS1qYXJzJywNCisgICAgICAgICAgICAgICAgICAgICAgICAnIjxAKGlu cHV0X2phcnNfcGF0aHMpIicsDQogICAgICAgICAgICAgICAgICAgICAgICAgJy0tb3V0cHV0JywN Ci0gICAgICAgICAgICAgICAgICAgICAgICAnPChQUk9EVUNUX0RJUikvRHVtcFJlbmRlclRyZWVf YXBrJywNCisgICAgICAgICAgICAgICAgICAgICAgICAnPChQUk9EVUNUX0RJUikvPCh0ZXN0X3N1 aXRlX25hbWUpX2FwaycsDQogICAgICAgICAgICAgICAgICAgICAgICAgJy0tYW50LWFyZ3MnLA0K ICAgICAgICAgICAgICAgICAgICAgICAgICctRFBST0RVQ1RfRElSPTwoYW50X2J1aWxkX291dCkn LA0KLSAgICAgICAgICAgICAgICAgICAgICAgICctLWFudC1jb21waWxlJw0KKyAgICAgICAgICAg ICAgICAgICAgICAgICctLWFudC1jb21waWxlJywNCiAgICAgICAgICAgICAgICAgICAgIF0sDQog ICAgICAgICAgICAgICAgIH1dLA0KICAgICAgICAgICAgIH1dLA0KSW5kZXg6IFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weQ0KPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQ0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21p dW1fYW5kcm9pZC5weSAgICAgICAgKHJldmlzaW9uIDExOTc5MikNCisrKyBUb29scy9TY3JpcHRz L3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkgICAgICAgICh3 b3JraW5nIGNvcHkpDQpAQCAtMTUyLDYgKzE1MiwxMiBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWRQ b3J0KGNocm9taXVtLkNocm9tDQogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25h bWUsICoqa3dhcmdzKToNCiAgICAgICAgIGNocm9taXVtLkNocm9taXVtUG9ydC5fX2luaXRfXyhz ZWxmLCBob3N0LCBwb3J0X25hbWUsICoqa3dhcmdzKQ0KDQorICAgICAgICAjIEZJWE1FOiBTdG9w IHVzaW5nIHRlc3Rfc2hlbGwgbW9kZTogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTg4NTQyDQorICAgICAgICBpZiBub3QgaGFzYXR0cihzZWxmLl9vcHRpb25zLCAnYWRk aXRpb25hbF9kcnRfZmxhZycpOg0KKyAgICAgICAgICAgIHNlbGYuX29wdGlvbnMuYWRkaXRpb25h bF9kcnRfZmxhZyA9IFtdDQorICAgICAgICBpZiBub3QgJy0tdGVzdC1zaGVsbCcgaW4gc2VsZi5f b3B0aW9ucy5hZGRpdGlvbmFsX2RydF9mbGFnOg0KKyAgICAgICAgICAgIHNlbGYuX29wdGlvbnMu YWRkaXRpb25hbF9kcnRfZmxhZy5hcHBlbmQoJy0tdGVzdC1zaGVsbCcpDQorDQogICAgICAgICAj IFRoZSBDaHJvbWl1bSBwb3J0IGZvciBBbmRyb2lkIGFsd2F5cyB1c2VzIHRoZSBoYXJkd2FyZSBH UFUgcGF0aC4NCiAgICAgICAgIHNlbGYuX29wdGlvbnMuZW5hYmxlX2hhcmR3YXJlX2dwdSA9IFRy dWUNCg0KQEAgLTI2Nyw3ICsyNzMsNyBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWRQb3J0KGNocm9t aXVtLkNocm9tDQogICAgIGRlZiBfcGF0aF90b19kcml2ZXIoc2VsZiwgY29uZmlndXJhdGlvbj1O b25lKToNCiAgICAgICAgIGlmIG5vdCBjb25maWd1cmF0aW9uOg0KICAgICAgICAgICAgIGNvbmZp Z3VyYXRpb24gPSBzZWxmLmdldF9vcHRpb24oJ2NvbmZpZ3VyYXRpb24nKQ0KLSAgICAgICAgcmV0 dXJuIHNlbGYuX2J1aWxkX3BhdGgoY29uZmlndXJhdGlvbiwgJ0R1bXBSZW5kZXJUcmVlX2Fway9D aHJvbWVOYXRpdmVUZXN0cy1kZWJ1Zy5hcGsnKQ0KKyAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxk X3BhdGgoY29uZmlndXJhdGlvbiwgJ0R1bXBSZW5kZXJUcmVlX2Fway9EdW1wUmVuZGVyVHJlZS1k ZWJ1Zy5hcGsnKQ0KDQogICAgIGRlZiBfcGF0aF90b19oZWxwZXIoc2VsZik6DQogICAgICAgICBy ZXR1cm4gc2VsZi5fYnVpbGRfcGF0aChzZWxmLmdldF9vcHRpb24oJ2NvbmZpZ3VyYXRpb24nKSwg J2ZvcndhcmRlcicpDQo= 146624 2012-06-08 12:11:01 -0700 2012-06-08 13:12:39 -0700 patch for landing 88598a text/plain 5804 wangxianzhu SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDExOTg1MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDEyLTA2LTA3ICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIEJ1aWxkIER1bXBSZW5kZXJUcmVl IHdpdGggQW5kcm9pZCBTREsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg4NTk4CisKKyAgICAgICAgQ2hhbmdlIFdlYktpdCBzaWRlIG9mIERSVCByZWxh dGVkIGNvZGUgYWNjb3JkaW5nIHRvIHNvbWUgcmVjZW50IGNoYW5nZXMgYXQgY2hyb21pdW0gc2lk ZS4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIER1 bXBSZW5kZXJUcmVlL0R1bXBSZW5kZXJUcmVlLmd5cC9EdW1wUmVuZGVyVHJlZS5neXA6CisgICAg ICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvcG9ydC9jaHJvbWl1bV9hbmRyb2lk LnB5OgorICAgICAgICAoQ2hyb21pdW1BbmRyb2lkUG9ydC5fX2luaXRfXyk6CisgICAgICAgIChD aHJvbWl1bUFuZHJvaWRQb3J0Ll9wYXRoX3RvX2RyaXZlcik6CisKIDIwMTItMDYtMDggIFdlaSBK YW1lcyAgPGphbWVzLndlaUBpbnRlbC5jb20+CiAKICAgICAgICAgQWRkIGFwcF9hYmkgb3B0aW9u IGZvciBEdW1wUmVuZGVyVHJlZV9hcGsKSW5kZXg6IFRvb2xzL0R1bXBSZW5kZXJUcmVlL0R1bXBS ZW5kZXJUcmVlLmd5cC9EdW1wUmVuZGVyVHJlZS5neXAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvRHVt cFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUuZ3lwL0R1bXBSZW5kZXJUcmVlLmd5cAkocmV2aXNp b24gMTE5ODUyKQorKysgVG9vbHMvRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRlclRyZWUuZ3lwL0R1 bXBSZW5kZXJUcmVlLmd5cAkod29ya2luZyBjb3B5KQpAQCAtNDA4LDMzICs0MDgsNDQgQEAKICAg ICAgICAgfV0sCiAgICAgICAgIFsnT1M9PSJhbmRyb2lkIicsIHsKICAgICAgICAgICAgICMgV3Jh cCBsaWJEdW1wUmVuZGVyVHJlZS5zbyBpbnRvIGFuIGFuZHJvaWQgYXBrIGZvciBleGVjdXRpb24u Ci0gICAgICAgICAgICAjIFNlZSA8KGNocm9taXVtX3NyY19kaXIpL2Jhc2UvYmFzZS5neXAgZm9y IFRPRE8oanJnKXMgYWJvdXQgdGhpcyBzdHJhdGVneS4KICAgICAgICAgICAgICd0YXJnZXRzJzog W3sKICAgICAgICAgICAgICAgICAndGFyZ2V0X25hbWUnOiAnRHVtcFJlbmRlclRyZWVfYXBrJywK ICAgICAgICAgICAgICAgICAndHlwZSc6ICdub25lJywKICAgICAgICAgICAgICAgICAnZGVwZW5k ZW5jaWVzJzogWworICAgICAgICAgICAgICAgICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS9iYXNl L2Jhc2UuZ3lwOmJhc2VfamF2YScsCisgICAgICAgICAgICAgICAgICAgICc8KGNocm9taXVtX3Ny Y19kaXIpL25ldC9uZXQuZ3lwOm5ldF9qYXZhJywKKyAgICAgICAgICAgICAgICAgICAgJzwoY2hy b21pdW1fc3JjX2RpcikvbWVkaWEvbWVkaWEuZ3lwOm1lZGlhX2phdmEnLAogICAgICAgICAgICAg ICAgICAgICAnRHVtcFJlbmRlclRyZWUnLAogICAgICAgICAgICAgICAgIF0sCisgICAgICAgICAg ICAgICAgJ3ZhcmlhYmxlcyc6IHsKKyAgICAgICAgICAgICAgICAgICAgJ2lucHV0X3NobGliX3Bh dGgnOiAnPChTSEFSRURfTElCX0RJUikvPChTSEFSRURfTElCX1BSRUZJWClEdW1wUmVuZGVyVHJl ZTwoU0hBUkVEX0xJQl9TVUZGSVgpJywKKyAgICAgICAgICAgICAgICAgICAgJ2lucHV0X2phcnNf cGF0aHMnOiBbCisgICAgICAgICAgICAgICAgICAgICAgICAnPChQUk9EVUNUX0RJUikvbGliLmph dmEvY2hyb21pdW1fYmFzZS5qYXInLAorICAgICAgICAgICAgICAgICAgICAgICAgJzwoUFJPRFVD VF9ESVIpL2xpYi5qYXZhL2Nocm9taXVtX25ldC5qYXInLAorICAgICAgICAgICAgICAgICAgICAg ICAgJzwoUFJPRFVDVF9ESVIpL2xpYi5qYXZhL2Nocm9taXVtX21lZGlhLmphcicsCisgICAgICAg ICAgICAgICAgICAgIF0sCisgICAgICAgICAgICAgICAgfSwKKyAgICAgICAgICAgICAgICAjIFBh cnQgb2YgdGhlIGZvbGxvd2luZyB3YXMgY29waWVkIGZyb20gPChjaHJvbWl1bV9zcmNfZGlyKS9i dWlsZC9hcGtfdGVzdC5ncHlpLgorICAgICAgICAgICAgICAgICMgTm90IGluY2x1ZGluZyBpdCBi ZWNhdXNlIGd5cCBpbmNsdWRlIGRvZXNuJ3Qgc3VwcG9ydCB2YXJpYWJsZSBpbiBwYXRoIG9yIHVu ZGVyCisgICAgICAgICAgICAgICAgIyBjb25kaXRpb25zLiBBbmQgd2UgYWxzbyBoYXZlIHNvbWUg ZGlmZmVyZW50IHJlcXVpcmVtZW50cy4KICAgICAgICAgICAgICAgICAnYWN0aW9ucyc6IFt7Ci0g ICAgICAgICAgICAgICAgICAgICMgR2VuZXJhdGUgYXBrIGZpbGVzIChpbmNsdWRpbmcgc291cmNl IGFuZCBhbnRmaWxlKSBmcm9tCi0gICAgICAgICAgICAgICAgICAgICMgYSB0ZW1wbGF0ZSwgYW5k IGJ1aWxkcyB0aGVtLgotICAgICAgICAgICAgICAgICAgICAnYWN0aW9uX25hbWUnOiAnZ2VuZXJh dGVfYW5kX2J1aWxkJywKKyAgICAgICAgICAgICAgICAgICAgJ2FjdGlvbl9uYW1lJzogJ2Fwa19E dW1wUmVuZGVyVHJlZScsCisgICAgICAgICAgICAgICAgICAgICdtZXNzYWdlJzogJ0J1aWxkaW5n IER1bXBSZW5kZXJUcmVlIHRlc3QgYXBrLicsCiAgICAgICAgICAgICAgICAgICAgICdpbnB1dHMn OiBbCisgICAgICAgICAgICAgICAgICAgICAgICAnPChjaHJvbWl1bV9zcmNfZGlyKS90ZXN0aW5n L2FuZHJvaWQvQW5kcm9pZE1hbmlmZXN0LnhtbCcsCiAgICAgICAgICAgICAgICAgICAgICAgICAn PChjaHJvbWl1bV9zcmNfZGlyKS90ZXN0aW5nL2FuZHJvaWQvZ2VuZXJhdGVfbmF0aXZlX3Rlc3Qu cHknLAotICAgICAgICAgICAgICAgICAgICAgICAgJzwoU0hBUkVEX0xJQl9ESVIpLzwoU0hBUkVE X0xJQl9QUkVGSVgpRHVtcFJlbmRlclRyZWU8KFNIQVJFRF9MSUJfU1VGRklYKScsCi0gICAgICAg ICAgICAgICAgICAgICAgICAjIEZJWE1FOiBCdWlsZCB0aGUgamFyIGZvciBuYXRpdmUgdGVzdHMg d2l0aCBTREsuCi0gICAgICAgICAgICAgICAgICAgICAgICAjIEZvciBub3cgd2UgYXJlIHVzaW5n IEFuZHJvaWQubWsgdG8gYnVpbGQgdGhlIGFway4KKyAgICAgICAgICAgICAgICAgICAgICAgICc8 KGlucHV0X3NobGliX3BhdGgpJywKKyAgICAgICAgICAgICAgICAgICAgICAgICc8QChpbnB1dF9q YXJzX3BhdGhzKScsCiAgICAgICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAgICAg ICdvdXRwdXRzJzogWwotICAgICAgICAgICAgICAgICAgICAgICAgJzwoUFJPRFVDVF9ESVIpL0R1 bXBSZW5kZXJUcmVlX2Fway9DaHJvbWVOYXRpdmVUZXN0cy1kZWJ1Zy5hcGsnLAorICAgICAgICAg ICAgICAgICAgICAgICAgJzwoUFJPRFVDVF9ESVIpL0R1bXBSZW5kZXJUcmVlX2Fway9EdW1wUmVu ZGVyVHJlZS1kZWJ1Zy5hcGsnLAogICAgICAgICAgICAgICAgICAgICBdLAogICAgICAgICAgICAg ICAgICAgICAnYWN0aW9uJzogWwogICAgICAgICAgICAgICAgICAgICAgICAgJzwoY2hyb21pdW1f c3JjX2RpcikvdGVzdGluZy9hbmRyb2lkL2dlbmVyYXRlX25hdGl2ZV90ZXN0LnB5JywKICAgICAg ICAgICAgICAgICAgICAgICAgICctLW5hdGl2ZV9saWJyYXJ5JywKLSAgICAgICAgICAgICAgICAg ICAgICAgICc8KFNIQVJFRF9MSUJfRElSKS88KFNIQVJFRF9MSUJfUFJFRklYKUR1bXBSZW5kZXJU cmVlPChTSEFSRURfTElCX1NVRkZJWCknLAotICAgICAgICAgICAgICAgICAgICAgICAgIyBGSVhN RTogQnVpbGQgdGhlIGphciBmb3IgbmF0aXZlIHRlc3RzIHdpdGggU0RLLgotICAgICAgICAgICAg ICAgICAgICAgICAgIyAnLS1qYXInLAotICAgICAgICAgICAgICAgICAgICAgICAgIyAnZm9vL2Jh ci5qYXInLAorICAgICAgICAgICAgICAgICAgICAgICAgJzwoaW5wdXRfc2hsaWJfcGF0aCknLAor ICAgICAgICAgICAgICAgICAgICAgICAgJy0tamFycycsCisgICAgICAgICAgICAgICAgICAgICAg ICAnIjxAKGlucHV0X2phcnNfcGF0aHMpIicsCiAgICAgICAgICAgICAgICAgICAgICAgICAnLS1v dXRwdXQnLAogICAgICAgICAgICAgICAgICAgICAgICAgJzwoUFJPRFVDVF9ESVIpL0R1bXBSZW5k ZXJUcmVlX2FwaycsCiAgICAgICAgICAgICAgICAgICAgICAgICAnLS1hbnQtYXJncycsCkluZGV4 OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJv aWQucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMv cG9ydC9jaHJvbWl1bV9hbmRyb2lkLnB5CShyZXZpc2lvbiAxMTk4NTIpCisrKyBUb29scy9TY3Jp cHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHkJKHdvcmtp bmcgY29weSkKQEAgLTE1Miw2ICsxNTIsMTIgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkUG9ydChj aHJvbWl1bS5DaHJvbQogICAgIGRlZiBfX2luaXRfXyhzZWxmLCBob3N0LCBwb3J0X25hbWUsICoq a3dhcmdzKToKICAgICAgICAgY2hyb21pdW0uQ2hyb21pdW1Qb3J0Ll9faW5pdF9fKHNlbGYsIGhv c3QsIHBvcnRfbmFtZSwgKiprd2FyZ3MpCiAKKyAgICAgICAgIyBGSVhNRTogU3RvcCB1c2luZyB0 ZXN0X3NoZWxsIG1vZGU6IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD04 ODU0MgorICAgICAgICBpZiBub3QgaGFzYXR0cihzZWxmLl9vcHRpb25zLCAnYWRkaXRpb25hbF9k cnRfZmxhZycpOgorICAgICAgICAgICAgc2VsZi5fb3B0aW9ucy5hZGRpdGlvbmFsX2RydF9mbGFn ID0gW10KKyAgICAgICAgaWYgbm90ICctLXRlc3Qtc2hlbGwnIGluIHNlbGYuX29wdGlvbnMuYWRk aXRpb25hbF9kcnRfZmxhZzoKKyAgICAgICAgICAgIHNlbGYuX29wdGlvbnMuYWRkaXRpb25hbF9k cnRfZmxhZy5hcHBlbmQoJy0tdGVzdC1zaGVsbCcpCisKICAgICAgICAgIyBUaGUgQ2hyb21pdW0g cG9ydCBmb3IgQW5kcm9pZCBhbHdheXMgdXNlcyB0aGUgaGFyZHdhcmUgR1BVIHBhdGguCiAgICAg ICAgIHNlbGYuX29wdGlvbnMuZW5hYmxlX2hhcmR3YXJlX2dwdSA9IFRydWUKIApAQCAtMjY3LDcg KzI3Myw3IEBAIGNsYXNzIENocm9taXVtQW5kcm9pZFBvcnQoY2hyb21pdW0uQ2hyb20KICAgICBk ZWYgX3BhdGhfdG9fZHJpdmVyKHNlbGYsIGNvbmZpZ3VyYXRpb249Tm9uZSk6CiAgICAgICAgIGlm IG5vdCBjb25maWd1cmF0aW9uOgogICAgICAgICAgICAgY29uZmlndXJhdGlvbiA9IHNlbGYuZ2V0 X29wdGlvbignY29uZmlndXJhdGlvbicpCi0gICAgICAgIHJldHVybiBzZWxmLl9idWlsZF9wYXRo KGNvbmZpZ3VyYXRpb24sICdEdW1wUmVuZGVyVHJlZV9hcGsvQ2hyb21lTmF0aXZlVGVzdHMtZGVi dWcuYXBrJykKKyAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoY29uZmlndXJhdGlvbiwg J0R1bXBSZW5kZXJUcmVlX2Fway9EdW1wUmVuZGVyVHJlZS1kZWJ1Zy5hcGsnKQogCiAgICAgZGVm IF9wYXRoX3RvX2hlbHBlcihzZWxmKToKICAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgo c2VsZi5nZXRfb3B0aW9uKCdjb25maWd1cmF0aW9uJyksICdmb3J3YXJkZXInKQo= 146633 2012-06-08 13:12:39 -0700 2012-06-08 19:45:42 -0700 patch for landing (with correct reviewer line) 88598a text/plain 5800 wangxianzhu SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDExOTg1MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDEyLTA2LTA3ICBYaWFuemh1IFdhbmcgIDx3YW5neGlhbnpodUBjaHJvbWl1 bS5vcmc+CisKKyAgICAgICAgW0Nocm9taXVtLUFuZHJvaWRdIEJ1aWxkIER1bXBSZW5kZXJUcmVl IHdpdGggQW5kcm9pZCBTREsKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTg4NTk4CisKKyAgICAgICAgQ2hhbmdlIFdlYktpdCBzaWRlIG9mIERSVCByZWxh dGVkIGNvZGUgYWNjb3JkaW5nIHRvIHNvbWUgcmVjZW50IGNoYW5nZXMgYXQgY2hyb21pdW0gc2lk ZS4KKworICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgorCisgICAgICAgICogRHVtcFJl bmRlclRyZWUvRHVtcFJlbmRlclRyZWUuZ3lwL0R1bXBSZW5kZXJUcmVlLmd5cDoKKyAgICAgICAg KiBTY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0L2Nocm9taXVtX2FuZHJvaWQucHk6 CisgICAgICAgIChDaHJvbWl1bUFuZHJvaWRQb3J0Ll9faW5pdF9fKToKKyAgICAgICAgKENocm9t aXVtQW5kcm9pZFBvcnQuX3BhdGhfdG9fZHJpdmVyKToKKwogMjAxMi0wNi0wOCAgV2VpIEphbWVz ICA8amFtZXMud2VpQGludGVsLmNvbT4KIAogICAgICAgICBBZGQgYXBwX2FiaSBvcHRpb24gZm9y IER1bXBSZW5kZXJUcmVlX2FwawpJbmRleDogVG9vbHMvRHVtcFJlbmRlclRyZWUvRHVtcFJlbmRl clRyZWUuZ3lwL0R1bXBSZW5kZXJUcmVlLmd5cAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9EdW1wUmVu ZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5neXAvRHVtcFJlbmRlclRyZWUuZ3lwCShyZXZpc2lvbiAx MTk4NTIpCisrKyBUb29scy9EdW1wUmVuZGVyVHJlZS9EdW1wUmVuZGVyVHJlZS5neXAvRHVtcFJl bmRlclRyZWUuZ3lwCSh3b3JraW5nIGNvcHkpCkBAIC00MDgsMzMgKzQwOCw0NCBAQAogICAgICAg ICB9XSwKICAgICAgICAgWydPUz09ImFuZHJvaWQiJywgewogICAgICAgICAgICAgIyBXcmFwIGxp YkR1bXBSZW5kZXJUcmVlLnNvIGludG8gYW4gYW5kcm9pZCBhcGsgZm9yIGV4ZWN1dGlvbi4KLSAg ICAgICAgICAgICMgU2VlIDwoY2hyb21pdW1fc3JjX2RpcikvYmFzZS9iYXNlLmd5cCBmb3IgVE9E TyhqcmcpcyBhYm91dCB0aGlzIHN0cmF0ZWd5LgogICAgICAgICAgICAgJ3RhcmdldHMnOiBbewog ICAgICAgICAgICAgICAgICd0YXJnZXRfbmFtZSc6ICdEdW1wUmVuZGVyVHJlZV9hcGsnLAogICAg ICAgICAgICAgICAgICd0eXBlJzogJ25vbmUnLAogICAgICAgICAgICAgICAgICdkZXBlbmRlbmNp ZXMnOiBbCisgICAgICAgICAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL2Jhc2UvYmFz ZS5neXA6YmFzZV9qYXZhJywKKyAgICAgICAgICAgICAgICAgICAgJzwoY2hyb21pdW1fc3JjX2Rp cikvbmV0L25ldC5neXA6bmV0X2phdmEnLAorICAgICAgICAgICAgICAgICAgICAnPChjaHJvbWl1 bV9zcmNfZGlyKS9tZWRpYS9tZWRpYS5neXA6bWVkaWFfamF2YScsCiAgICAgICAgICAgICAgICAg ICAgICdEdW1wUmVuZGVyVHJlZScsCiAgICAgICAgICAgICAgICAgXSwKKyAgICAgICAgICAgICAg ICAndmFyaWFibGVzJzogeworICAgICAgICAgICAgICAgICAgICAnaW5wdXRfc2hsaWJfcGF0aCc6 ICc8KFNIQVJFRF9MSUJfRElSKS88KFNIQVJFRF9MSUJfUFJFRklYKUR1bXBSZW5kZXJUcmVlPChT SEFSRURfTElCX1NVRkZJWCknLAorICAgICAgICAgICAgICAgICAgICAnaW5wdXRfamFyc19wYXRo cyc6IFsKKyAgICAgICAgICAgICAgICAgICAgICAgICc8KFBST0RVQ1RfRElSKS9saWIuamF2YS9j aHJvbWl1bV9iYXNlLmphcicsCisgICAgICAgICAgICAgICAgICAgICAgICAnPChQUk9EVUNUX0RJ UikvbGliLmphdmEvY2hyb21pdW1fbmV0LmphcicsCisgICAgICAgICAgICAgICAgICAgICAgICAn PChQUk9EVUNUX0RJUikvbGliLmphdmEvY2hyb21pdW1fbWVkaWEuamFyJywKKyAgICAgICAgICAg ICAgICAgICAgXSwKKyAgICAgICAgICAgICAgICB9LAorICAgICAgICAgICAgICAgICMgUGFydCBv ZiB0aGUgZm9sbG93aW5nIHdhcyBjb3BpZWQgZnJvbSA8KGNocm9taXVtX3NyY19kaXIpL2J1aWxk L2Fwa190ZXN0LmdweWkuCisgICAgICAgICAgICAgICAgIyBOb3QgaW5jbHVkaW5nIGl0IGJlY2F1 c2UgZ3lwIGluY2x1ZGUgZG9lc24ndCBzdXBwb3J0IHZhcmlhYmxlIGluIHBhdGggb3IgdW5kZXIK KyAgICAgICAgICAgICAgICAjIGNvbmRpdGlvbnMuIEFuZCB3ZSBhbHNvIGhhdmUgc29tZSBkaWZm ZXJlbnQgcmVxdWlyZW1lbnRzLgogICAgICAgICAgICAgICAgICdhY3Rpb25zJzogW3sKLSAgICAg ICAgICAgICAgICAgICAgIyBHZW5lcmF0ZSBhcGsgZmlsZXMgKGluY2x1ZGluZyBzb3VyY2UgYW5k IGFudGZpbGUpIGZyb20KLSAgICAgICAgICAgICAgICAgICAgIyBhIHRlbXBsYXRlLCBhbmQgYnVp bGRzIHRoZW0uCi0gICAgICAgICAgICAgICAgICAgICdhY3Rpb25fbmFtZSc6ICdnZW5lcmF0ZV9h bmRfYnVpbGQnLAorICAgICAgICAgICAgICAgICAgICAnYWN0aW9uX25hbWUnOiAnYXBrX0R1bXBS ZW5kZXJUcmVlJywKKyAgICAgICAgICAgICAgICAgICAgJ21lc3NhZ2UnOiAnQnVpbGRpbmcgRHVt cFJlbmRlclRyZWUgdGVzdCBhcGsuJywKICAgICAgICAgICAgICAgICAgICAgJ2lucHV0cyc6IFsK KyAgICAgICAgICAgICAgICAgICAgICAgICc8KGNocm9taXVtX3NyY19kaXIpL3Rlc3RpbmcvYW5k cm9pZC9BbmRyb2lkTWFuaWZlc3QueG1sJywKICAgICAgICAgICAgICAgICAgICAgICAgICc8KGNo cm9taXVtX3NyY19kaXIpL3Rlc3RpbmcvYW5kcm9pZC9nZW5lcmF0ZV9uYXRpdmVfdGVzdC5weScs Ci0gICAgICAgICAgICAgICAgICAgICAgICAnPChTSEFSRURfTElCX0RJUikvPChTSEFSRURfTElC X1BSRUZJWClEdW1wUmVuZGVyVHJlZTwoU0hBUkVEX0xJQl9TVUZGSVgpJywKLSAgICAgICAgICAg ICAgICAgICAgICAgICMgRklYTUU6IEJ1aWxkIHRoZSBqYXIgZm9yIG5hdGl2ZSB0ZXN0cyB3aXRo IFNESy4KLSAgICAgICAgICAgICAgICAgICAgICAgICMgRm9yIG5vdyB3ZSBhcmUgdXNpbmcgQW5k cm9pZC5tayB0byBidWlsZCB0aGUgYXBrLgorICAgICAgICAgICAgICAgICAgICAgICAgJzwoaW5w dXRfc2hsaWJfcGF0aCknLAorICAgICAgICAgICAgICAgICAgICAgICAgJzxAKGlucHV0X2phcnNf cGF0aHMpJywKICAgICAgICAgICAgICAgICAgICAgXSwKICAgICAgICAgICAgICAgICAgICAgJ291 dHB1dHMnOiBbCi0gICAgICAgICAgICAgICAgICAgICAgICAnPChQUk9EVUNUX0RJUikvRHVtcFJl bmRlclRyZWVfYXBrL0Nocm9tZU5hdGl2ZVRlc3RzLWRlYnVnLmFwaycsCisgICAgICAgICAgICAg ICAgICAgICAgICAnPChQUk9EVUNUX0RJUikvRHVtcFJlbmRlclRyZWVfYXBrL0R1bXBSZW5kZXJU cmVlLWRlYnVnLmFwaycsCiAgICAgICAgICAgICAgICAgICAgIF0sCiAgICAgICAgICAgICAgICAg ICAgICdhY3Rpb24nOiBbCiAgICAgICAgICAgICAgICAgICAgICAgICAnPChjaHJvbWl1bV9zcmNf ZGlyKS90ZXN0aW5nL2FuZHJvaWQvZ2VuZXJhdGVfbmF0aXZlX3Rlc3QucHknLAogICAgICAgICAg ICAgICAgICAgICAgICAgJy0tbmF0aXZlX2xpYnJhcnknLAotICAgICAgICAgICAgICAgICAgICAg ICAgJzwoU0hBUkVEX0xJQl9ESVIpLzwoU0hBUkVEX0xJQl9QUkVGSVgpRHVtcFJlbmRlclRyZWU8 KFNIQVJFRF9MSUJfU1VGRklYKScsCi0gICAgICAgICAgICAgICAgICAgICAgICAjIEZJWE1FOiBC dWlsZCB0aGUgamFyIGZvciBuYXRpdmUgdGVzdHMgd2l0aCBTREsuCi0gICAgICAgICAgICAgICAg ICAgICAgICAjICctLWphcicsCi0gICAgICAgICAgICAgICAgICAgICAgICAjICdmb28vYmFyLmph cicsCisgICAgICAgICAgICAgICAgICAgICAgICAnPChpbnB1dF9zaGxpYl9wYXRoKScsCisgICAg ICAgICAgICAgICAgICAgICAgICAnLS1qYXJzJywKKyAgICAgICAgICAgICAgICAgICAgICAgICci PEAoaW5wdXRfamFyc19wYXRocykiJywKICAgICAgICAgICAgICAgICAgICAgICAgICctLW91dHB1 dCcsCiAgICAgICAgICAgICAgICAgICAgICAgICAnPChQUk9EVUNUX0RJUikvRHVtcFJlbmRlclRy ZWVfYXBrJywKICAgICAgICAgICAgICAgICAgICAgICAgICctLWFudC1hcmdzJywKSW5kZXg6IFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2xheW91dF90ZXN0cy9wb3J0 L2Nocm9taXVtX2FuZHJvaWQucHkJKHJldmlzaW9uIDExOTg1MikKKysrIFRvb2xzL1NjcmlwdHMv d2Via2l0cHkvbGF5b3V0X3Rlc3RzL3BvcnQvY2hyb21pdW1fYW5kcm9pZC5weQkod29ya2luZyBj b3B5KQpAQCAtMTUyLDYgKzE1MiwxMiBAQCBjbGFzcyBDaHJvbWl1bUFuZHJvaWRQb3J0KGNocm9t aXVtLkNocm9tCiAgICAgZGVmIF9faW5pdF9fKHNlbGYsIGhvc3QsIHBvcnRfbmFtZSwgKiprd2Fy Z3MpOgogICAgICAgICBjaHJvbWl1bS5DaHJvbWl1bVBvcnQuX19pbml0X18oc2VsZiwgaG9zdCwg cG9ydF9uYW1lLCAqKmt3YXJncykKIAorICAgICAgICAjIEZJWE1FOiBTdG9wIHVzaW5nIHRlc3Rf c2hlbGwgbW9kZTogaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTg4NTQy CisgICAgICAgIGlmIG5vdCBoYXNhdHRyKHNlbGYuX29wdGlvbnMsICdhZGRpdGlvbmFsX2RydF9m bGFnJyk6CisgICAgICAgICAgICBzZWxmLl9vcHRpb25zLmFkZGl0aW9uYWxfZHJ0X2ZsYWcgPSBb XQorICAgICAgICBpZiBub3QgJy0tdGVzdC1zaGVsbCcgaW4gc2VsZi5fb3B0aW9ucy5hZGRpdGlv bmFsX2RydF9mbGFnOgorICAgICAgICAgICAgc2VsZi5fb3B0aW9ucy5hZGRpdGlvbmFsX2RydF9m bGFnLmFwcGVuZCgnLS10ZXN0LXNoZWxsJykKKwogICAgICAgICAjIFRoZSBDaHJvbWl1bSBwb3J0 IGZvciBBbmRyb2lkIGFsd2F5cyB1c2VzIHRoZSBoYXJkd2FyZSBHUFUgcGF0aC4KICAgICAgICAg c2VsZi5fb3B0aW9ucy5lbmFibGVfaGFyZHdhcmVfZ3B1ID0gVHJ1ZQogCkBAIC0yNjcsNyArMjcz LDcgQEAgY2xhc3MgQ2hyb21pdW1BbmRyb2lkUG9ydChjaHJvbWl1bS5DaHJvbQogICAgIGRlZiBf cGF0aF90b19kcml2ZXIoc2VsZiwgY29uZmlndXJhdGlvbj1Ob25lKToKICAgICAgICAgaWYgbm90 IGNvbmZpZ3VyYXRpb246CiAgICAgICAgICAgICBjb25maWd1cmF0aW9uID0gc2VsZi5nZXRfb3B0 aW9uKCdjb25maWd1cmF0aW9uJykKLSAgICAgICAgcmV0dXJuIHNlbGYuX2J1aWxkX3BhdGgoY29u ZmlndXJhdGlvbiwgJ0R1bXBSZW5kZXJUcmVlX2Fway9DaHJvbWVOYXRpdmVUZXN0cy1kZWJ1Zy5h cGsnKQorICAgICAgICByZXR1cm4gc2VsZi5fYnVpbGRfcGF0aChjb25maWd1cmF0aW9uLCAnRHVt cFJlbmRlclRyZWVfYXBrL0R1bXBSZW5kZXJUcmVlLWRlYnVnLmFwaycpCiAKICAgICBkZWYgX3Bh dGhfdG9faGVscGVyKHNlbGYpOgogICAgICAgICByZXR1cm4gc2VsZi5fYnVpbGRfcGF0aChzZWxm LmdldF9vcHRpb24oJ2NvbmZpZ3VyYXRpb24nKSwgJ2ZvcndhcmRlcicpCg==