114034 2013-04-05 07:40:19 -0700 Remove Android from the EWS and WebKit build master 2013-04-05 10:46:37 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED DUPLICATE 113990 P2 Normal --- 1 peter peter abarth dpranke eric rniwa webkit.review.bot oldest_to_newest 869756 0 peter 2013-04-05 07:40:19 -0700 Remove Android from the EWS and WebKit build master 869758 1 196630 peter 2013-04-05 07:42:06 -0700 Created attachment 196630 Patch 869862 2 rniwa 2013-04-05 10:46:04 -0700 *** This bug has been marked as a duplicate of bug 113990 *** 869864 3 196630 rniwa 2013-04-05 10:46:37 -0700 Comment on attachment 196630 Patch We're going to land the patch on the bug 113990 instead. 196630 2013-04-05 07:42:06 -0700 2013-04-05 10:46:37 -0700 Patch bug-114034-20130405154153.patch text/plain 12631 peter U3VidmVyc2lvbiBSZXZpc2lvbjogMTQ3NzQzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggY2FhYzM2OTIyNTViYjY2YjdkZmE5ZWY3ZWMyYzg4MDgy ZDNmZGY0MC4uNjU3YTExMTQwNzBjZTgyYWUzNzI2OGY3ZDYzODZmMmFkNGJjZjUwOSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI1 IEBACisyMDEzLTA0LTA1ICBQZXRlciBCZXZlcmxvbyAgPHBldGVyQGNocm9taXVtLm9yZz4KKwor ICAgICAgICBSZW1vdmUgQW5kcm9pZCBmcm9tIHRoZSBFV1MgYW5kIFdlYktpdCBidWlsZCBtYXN0 ZXIKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTExNDAz NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRoaXMg cmVtb3ZlcyB0aGUgQ2hyb21pdW0gQW5kcm9pZCBib3RzIChidWlsZGVyLCB0ZXN0ZXIgYW5kCisg ICAgICAgIHBlcmZvcm1hbmNlIHRlc3RlciksIGFzIHdlbGwgYXMgdGhlIEVXUyBwb29sLCBmcm9t IHRoZSBwcm9qZWN0LgorCisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0 Lm9yZy1jb25maWcvY29uZmlnLmpzb246CisgICAgICAgICogQnVpbGRTbGF2ZVN1cHBvcnQvYnVp bGQud2Via2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZzoKKyAgICAgICAgKENsZWFudXBDaHJvbWl1 bUNyYXNoTG9ncyk6CisgICAgICAgIChhcHBlbmRDdXN0b21CdWlsZEZsYWdzKToKKyAgICAgICAg KFJ1blVuaXRUZXN0cy5zdGFydCk6CisgICAgICAgIChUZXN0RmFjdG9yeS5fX2luaXRfXyk6Cisg ICAgICAgIChEb3dubG9hZEFuZFBlcmZUZXN0RmFjdG9yeS5fX2luaXRfXyk6CisgICAgICAgICog QnVpbGRTbGF2ZVN1cHBvcnQvY2hyb21pdW0vb3V0cHV0LWFuZHJvaWQtZGV2aWNlLXN0YXR1czog UmVtb3ZlZC4KKyAgICAgICAgKiBRdWV1ZVN0YXR1c1NlcnZlci9jb25maWcvcXVldWVzLnB5Ogor ICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0 ZW0ucHk6CisgICAgICAgIChDaHJvbWl1bVdpbmRvd3NFV1MpOgorCiAyMDEzLTA0LTA0ICBLZW50 IFRhbXVyYSAgPHRrZW50QGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZW1vdmUgQ2hyb21pdW1Q dWJsaWNBcGkgcGF0dGVybiwgYW5kIGNjL21lc3NhZ2UgcnVsZXMgZm9yIGl0LgpkaWZmIC0tZ2l0 IGEvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Via2l0Lm9yZy1jb25maWcvY29uZmln Lmpzb24gYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9j b25maWcuanNvbgppbmRleCAyMjE0ZDQ5MjEyZmRmYjc0MzM5YzM5NjI4YTk3NTM0NGU5ZTllYTVi Li4zNzk1YTY2ZmEwYjJjMjZlNWY5M2E2MDYyYjE2ZTNiZjZiMTA5MmFlIDEwMDY0NAotLS0gYS9U b29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9jb25maWcuanNv bgorKysgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53ZWJraXQub3JnLWNvbmZpZy9j b25maWcuanNvbgpAQCAtNTcsOSArNTcsNiBAQAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1l IjogImdvb2dsZS1saW51eC0xIiwgInBsYXRmb3JtIjogImNocm9taXVtLWxpbnV4IiB9LAogICAg ICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImdvb2dsZS1saW51eC0yIiwgInBsYXRmb3JtIjog ImNocm9taXVtLWxpbnV4IiB9LAogICAgICAgICAgICAgICAgICAgICB7ICJuYW1lIjogImdvb2ds ZS1saW51eC1wZXJmIiwgInBsYXRmb3JtIjogImNocm9taXVtLWxpbnV4IiB9LAotICAgICAgICAg ICAgICAgICAgICB7ICJuYW1lIjogImdvb2dsZS1saW51eC1hbmRyb2lkIiwgInBsYXRmb3JtIjog ImNocm9taXVtLWFuZHJvaWQiIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiZ29v Z2xlLWFuZHJvaWQtdGVzdHMiLCAicGxhdGZvcm0iOiAiY2hyb21pdW0tYW5kcm9pZCIgfSwKLSAg ICAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJnb29nbGUtYW5kcm9pZC1wZXJmIiwgInBsYXRm b3JtIjogImNocm9taXVtLWFuZHJvaWQiIH0sCiAKICAgICAgICAgICAgICAgICAgICAgeyAibmFt ZSI6ICJ3aW5jYWlyby0xIiwgInBsYXRmb3JtIjogIndpbmNhaXJvIiB9LAogCkBAIC0yOTEsMjIg KzI4OCw2IEBACiAgICAgICAgICAgICAgICAgICAgICAgInNsYXZlbmFtZXMiOiBbImdvb2dsZS1s aW51eC1wZXJmIl0KICAgICAgICAgICAgICAgICAgICAgfSwKICAgICAgICAgICAgICAgICAgICAg ewotICAgICAgICAgICAgICAgICAgICAgICJuYW1lIjogIkNocm9taXVtIEFuZHJvaWQgUmVsZWFz ZSIsICJ0eXBlIjogIkJ1aWxkIiwgImJ1aWxkZGlyIjogImNocm9taXVtLWxpbnV4LWFuZHJvaWQi LAotICAgICAgICAgICAgICAgICAgICAgICJwbGF0Zm9ybSI6ICJjaHJvbWl1bS1hbmRyb2lkIiwg ImNvbmZpZ3VyYXRpb24iOiAicmVsZWFzZSIsICJhcmNoaXRlY3R1cmVzIjogWyJpMzg2Il0sCi0g ICAgICAgICAgICAgICAgICAgICAgInRyaWdnZXJzIjogWyJjaHJvbWl1bS1hbmRyb2lkLXJlbGVh c2UtdGVzdHMiLCAiY2hyb21pdW0tYW5kcm9pZC1yZWxlYXNlLXBlcmYiXSwKLSAgICAgICAgICAg ICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsiZ29vZ2xlLWxpbnV4LWFuZHJvaWQiXQotICAgICAg ICAgICAgICAgICAgICB9LAotICAgICAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAgICAgICAg ICAgICAgIm5hbWUiOiAiQ2hyb21pdW0gQW5kcm9pZCBSZWxlYXNlIChUZXN0cykiLCAidHlwZSI6 ICJUZXN0IiwgImJ1aWxkZGlyIjogImNocm9taXVtLWFuZHJvaWQtcmVsZWFzZS10ZXN0cyIsCi0g ICAgICAgICAgICAgICAgICAgICAgInBsYXRmb3JtIjogImNocm9taXVtLWFuZHJvaWQiLCAiY29u ZmlndXJhdGlvbiI6ICJyZWxlYXNlIiwgImFyY2hpdGVjdHVyZXMiOiBbImkzODYiXSwKLSAgICAg ICAgICAgICAgICAgICAgICAic2xhdmVuYW1lcyI6IFsiZ29vZ2xlLWFuZHJvaWQtdGVzdHMiXQot ICAgICAgICAgICAgICAgICAgICB9LAotICAgICAgICAgICAgICAgICAgICB7Ci0gICAgICAgICAg ICAgICAgICAgICAgIm5hbWUiOiAiQ2hyb21pdW0gQW5kcm9pZCBSZWxlYXNlIChQZXJmKSIsICJ0 eXBlIjogIkRvd25sb2FkQW5kUGVyZlRlc3QiLCAiYnVpbGRkaXIiOiAiY2hyb21pdW0tYW5kcm9p ZC1yZWxlYXNlLXBlcmYiLAotICAgICAgICAgICAgICAgICAgICAgICJwbGF0Zm9ybSI6ICJjaHJv bWl1bS1hbmRyb2lkIiwgImNvbmZpZ3VyYXRpb24iOiAicmVsZWFzZSIsICJhcmNoaXRlY3R1cmVz IjogWyJpMzg2Il0sCi0gICAgICAgICAgICAgICAgICAgICAgInNsYXZlbmFtZXMiOiBbImdvb2ds ZS1hbmRyb2lkLXBlcmYiXQotICAgICAgICAgICAgICAgICAgICB9LAotICAgICAgICAgICAgICAg ICAgICB7CiAgICAgICAgICAgICAgICAgICAgICAgIm5hbWUiOiAiV2luQ2Fpcm8gUmVsZWFzZSIs ICJ0eXBlIjogIkJ1aWxkQW5kVGVzdCIsICJidWlsZGRpciI6ICJ3aW4tY2Fpcm8tcmVsZWFzZSIs CiAgICAgICAgICAgICAgICAgICAgICAgInBsYXRmb3JtIjogIndpbmNhaXJvIiwgImNvbmZpZ3Vy YXRpb24iOiAicmVsZWFzZSIsICJhcmNoaXRlY3R1cmVzIjogWyJpMzg2Il0sCiAgICAgICAgICAg ICAgICAgICAgICAgInNsYXZlbmFtZXMiOiBbIndpbmNhaXJvLTEiXQpAQCAtNDE5LDEyICs0MDAs NiBAQAogICAgICAgICAgICAgICAgICAgICB7ICJ0eXBlIjogIlRyaWdnZXJhYmxlIiwgIm5hbWUi OiAiY2hyb21pdW0tbGludXgtcGVyZi10ZXN0cyIsCiAgICAgICAgICAgICAgICAgICAgICAgImJ1 aWxkZXJOYW1lcyI6IFsiQ2hyb21pdW0gTGludXggUmVsZWFzZSAoUGVyZikiXQogICAgICAgICAg ICAgICAgICAgICB9LAotICAgICAgICAgICAgICAgICAgICB7ICJ0eXBlIjogIlRyaWdnZXJhYmxl IiwgIm5hbWUiOiAiY2hyb21pdW0tYW5kcm9pZC1yZWxlYXNlLXRlc3RzIiwKLSAgICAgICAgICAg ICAgICAgICAgICAiYnVpbGRlck5hbWVzIjogWyJDaHJvbWl1bSBBbmRyb2lkIFJlbGVhc2UgKFRl c3RzKSJdCi0gICAgICAgICAgICAgICAgICAgIH0sCi0gICAgICAgICAgICAgICAgICAgIHsgInR5 cGUiOiAiVHJpZ2dlcmFibGUiLCAibmFtZSI6ICJjaHJvbWl1bS1hbmRyb2lkLXJlbGVhc2UtcGVy ZiIsCi0gICAgICAgICAgICAgICAgICAgICAgImJ1aWxkZXJOYW1lcyI6IFsiQ2hyb21pdW0gQW5k cm9pZCBSZWxlYXNlIChQZXJmKSJdCi0gICAgICAgICAgICAgICAgICAgIH0sCiAgICAgICAgICAg ICAgICAgICAgIHsgInR5cGUiOiAiVHJpZ2dlcmFibGUiLCAibmFtZSI6ICJndGstbGludXgtNjQt cmVsZWFzZS10ZXN0cy13azIiLAogICAgICAgICAgICAgICAgICAgICAgICJidWlsZGVyTmFtZXMi OiBbIkdUSyBMaW51eCA2NC1iaXQgUmVsZWFzZSBXSzIgKFRlc3RzKSJdCiAgICAgICAgICAgICAg ICAgICAgIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtp dC5vcmctY29uZmlnL21hc3Rlci5jZmcgYi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9idWlsZC53 ZWJraXQub3JnLWNvbmZpZy9tYXN0ZXIuY2ZnCmluZGV4IDk2MmNkZjBiZTJkY2Y0M2ZjNjMxZDcz NThlZDE1OGQxMDc4MWMwODYuLmZiN2E2MjU1YTMwNWIxMDdhYzgwMTI5ZDJjMjU0YjljYTMzYjVh NWUgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2J1aWxkLndlYmtpdC5vcmct Y29uZmlnL21hc3Rlci5jZmcKKysrIGIvVG9vbHMvQnVpbGRTbGF2ZVN1cHBvcnQvYnVpbGQud2Vi a2l0Lm9yZy1jb25maWcvbWFzdGVyLmNmZwpAQCAtMTY4LDkgKzE2OCw2IEBAIGNsYXNzIEluc3Rh bGxDaHJvbWl1bURlcGVuZGVuY2llcyhzaGVsbC5TaGVsbENvbW1hbmQpOgogICAgIGNvbW1hbmQg PSBbInBlcmwiLCAiLi9Ub29scy9TY3JpcHRzL3VwZGF0ZS13ZWJraXQtY2hyb21pdW0iLCAiLS1m b3JjZSJdCiAgICAgaGFsdE9uRmFpbHVyZSA9IFRydWUKICAgICBkZWYgc3RhcnQoc2VsZik6Ci0g ICAgICAgIGlmIHNlbGYuZ2V0UHJvcGVydHkoJ2Z1bGxQbGF0Zm9ybScpID09ICJjaHJvbWl1bS1h bmRyb2lkIjoKLSAgICAgICAgICAgIHNlbGYuc2V0Q29tbWFuZChzZWxmLmNvbW1hbmQgKyBbJy0t Y2hyb21pdW0tYW5kcm9pZCddKQotCiAgICAgICAgIHJldHVybiBzaGVsbC5TaGVsbENvbW1hbmQu c3RhcnQoc2VsZikKIAogY2xhc3MgQ2xlYW51cENocm9taXVtQ3Jhc2hMb2dzKHNoZWxsLlNoZWxs Q29tbWFuZCk6CkBAIC0xODAsMTcgKzE3Nyw4IEBAIGNsYXNzIENsZWFudXBDaHJvbWl1bUNyYXNo TG9ncyhzaGVsbC5TaGVsbENvbW1hbmQpOgogICAgIGNvbW1hbmQgPSBbInB5dGhvbiIsICIuL1Rv b2xzL0J1aWxkU2xhdmVTdXBwb3J0L2Nocm9taXVtL3JlbW92ZS1jcmFzaC1sb2dzIl0KICAgICBo YWx0T25GYWlsdXJlID0gRmFsc2UKIAotY2xhc3MgT3V0cHV0QW5kcm9pZERldmljZVN0YXR1cyhz aGVsbC5TaGVsbENvbW1hbmQpOgotICAgIG5hbWUgPSAiYW5kcm9pZCBkZXZpY2Ugc3RhdHVzIgot ICAgIGRlc2NyaXB0aW9uID0gWyJvdXRwdXR0aW5nIGFuZHJvaWQgZGV2aWNlIHN0YXR1cyJdCi0g ICAgZGVzY3JpcHRpb25Eb25lID0gWyJvdXRwdXR0ZWQgYW5kcm9pZCBkZXZpY2Ugc3RhdHVzIl0K LSAgICBjb21tYW5kID0gWyJweXRob24iLCAiLi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9jaHJv bWl1bS9vdXRwdXQtYW5kcm9pZC1kZXZpY2Utc3RhdHVzIl0KLSAgICBoYWx0T25GYWlsdXJlID0g RmFsc2UKLQogZGVmIGFwcGVuZEN1c3RvbUJ1aWxkRmxhZ3Moc3RlcCwgcGxhdGZvcm0sIGZ1bGxQ bGF0Zm9ybT0iIik6Ci0gICAgaWYgZnVsbFBsYXRmb3JtID09ICJjaHJvbWl1bS1hbmRyb2lkIjoK LSAgICAgICAgc3RlcC5zZXRDb21tYW5kKHN0ZXAuY29tbWFuZCArIFsnLS1jaHJvbWl1bS1hbmRy b2lkJ10pCi0gICAgZWxpZiBwbGF0Zm9ybSBpbiAoJ2Nocm9taXVtJywgJ2VmbCcsICdndGsnLCAn cXQnLCAnd2luY2Fpcm8nLCAnd2luY2UnLCAnd3gnKToKKyAgICBpZiBwbGF0Zm9ybSBpbiAoJ2No cm9taXVtJywgJ2VmbCcsICdndGsnLCAncXQnLCAnd2luY2Fpcm8nLCAnd2luY2UnLCAnd3gnKToK ICAgICAgICAgc3RlcC5zZXRDb21tYW5kKHN0ZXAuY29tbWFuZCArIFsnLS0nICsgcGxhdGZvcm1d KQogCiAKQEAgLTQ1Niw4ICs0NDQsNiBAQCBjbGFzcyBSdW5Vbml0VGVzdHMoVGVzdFdpdGhGYWls dXJlQ291bnQpOgogICAgICAgICAgICAgc2VsZi5zZXRDb21tYW5kKHNlbGYuY29tbWFuZCArIFsn LS1uby1idWlsZCddKQogICAgICAgICBpZiBwbGF0Zm9ybS5zdGFydHN3aXRoKCdjaHJvbWl1bScp OgogICAgICAgICAgICAgc2VsZi5zZXRDb21tYW5kKHNlbGYuY29tbWFuZCArIFsnLS1jaHJvbWl1 bSddKQotICAgICAgICBpZiBwbGF0Zm9ybSA9PSAnY2hyb21pdW0tYW5kcm9pZCc6Ci0gICAgICAg ICAgICBzZWxmLnNldENvbW1hbmQoc2VsZi5jb21tYW5kICsgWyctLWNocm9taXVtLWFuZHJvaWQn XSkKICAgICAgICAgcmV0dXJuIHNoZWxsLlRlc3Quc3RhcnQoc2VsZikKIAogICAgIGRlZiBjb3Vu dEZhaWx1cmVzKHNlbGYsIGNtZCk6CkBAIC03OTYsOCArNzgyLDYgQEAgY2xhc3MgVGVzdEZhY3Rv cnkoRmFjdG9yeSk6CiAgICAgICAgIEZhY3RvcnkuX19pbml0X18oc2VsZiwgcGxhdGZvcm0sIGNv bmZpZ3VyYXRpb24sIGFyY2hpdGVjdHVyZXMsIEZhbHNlLCBTVk5NaXJyb3IpCiAgICAgICAgIGlm IHBsYXRmb3JtLnN0YXJ0c3dpdGgoImNocm9taXVtIik6CiAgICAgICAgICAgICBzZWxmLmFkZFN0 ZXAoQ2xlYW51cENocm9taXVtQ3Jhc2hMb2dzKCkpCi0gICAgICAgIGlmIHBsYXRmb3JtID09ICJj aHJvbWl1bS1hbmRyb2lkIjoKLSAgICAgICAgICAgIHNlbGYuYWRkU3RlcChPdXRwdXRBbmRyb2lk RGV2aWNlU3RhdHVzKCkpCiAgICAgICAgIHNlbGYuYWRkU3RlcChEb3dubG9hZEJ1aWx0UHJvZHVj dCgpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoRXh0cmFjdEJ1aWx0UHJvZHVjdCgpKQogICAgICAg ICBpZiBub3QgcGxhdGZvcm0uc3RhcnRzd2l0aCgiY2hyb21pdW0iKToKQEAgLTkwMCw4ICs4ODQs NiBAQCBjbGFzcyBEb3dubG9hZEFuZFBlcmZUZXN0RmFjdG9yeShGYWN0b3J5KToKICAgICAgICAg RmFjdG9yeS5fX2luaXRfXyhzZWxmLCBwbGF0Zm9ybSwgY29uZmlndXJhdGlvbiwgYXJjaGl0ZWN0 dXJlcywgRmFsc2UsIFNWTk1pcnJvciwgKiprd2FyZ3MpCiAgICAgICAgIHNlbGYuYWRkU3RlcChE b3dubG9hZEJ1aWx0UHJvZHVjdCgpKQogICAgICAgICBzZWxmLmFkZFN0ZXAoRXh0cmFjdEJ1aWx0 UHJvZHVjdCgpKQotICAgICAgICBpZiBwbGF0Zm9ybSA9PSAiY2hyb21pdW0tYW5kcm9pZCI6Ci0g ICAgICAgICAgICBzZWxmLmFkZFN0ZXAoT3V0cHV0QW5kcm9pZERldmljZVN0YXR1cygpKQogICAg ICAgICBzZWxmLmFkZFN0ZXAoUnVuQW5kVXBsb2FkUGVyZlRlc3RzKCkpCiAKIGNsYXNzIERvd25s b2FkQW5kUGVyZlRlc3RXZWJLaXQyRmFjdG9yeShGYWN0b3J5KToKZGlmZiAtLWdpdCBhL1Rvb2xz L0J1aWxkU2xhdmVTdXBwb3J0L2Nocm9taXVtL291dHB1dC1hbmRyb2lkLWRldmljZS1zdGF0dXMg Yi9Ub29scy9CdWlsZFNsYXZlU3VwcG9ydC9jaHJvbWl1bS9vdXRwdXQtYW5kcm9pZC1kZXZpY2Ut c3RhdHVzCmRlbGV0ZWQgZmlsZSBtb2RlIDEwMDc1NQppbmRleCBkNzE2YzAyNmI1ZTE4MDEzNzk4 YTVlNjhjYmRlYmFhZjM3YTc3NWJkLi4wMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwCi0tLSBhL1Rvb2xzL0J1aWxkU2xhdmVTdXBwb3J0L2Nocm9taXVtL291dHB1dC1hbmRy b2lkLWRldmljZS1zdGF0dXMKKysrIC9kZXYvbnVsbApAQCAtMSw4MSArMCwwIEBACi0jIS91c3Iv YmluL2VudiBweXRob24KLSMgQ29weXJpZ2h0IChDKSAyMDEyIEdvb2dsZSBJbmMuIEFsbCBSaWdo dHMgUmVzZXJ2ZWQuCi0jCi0jIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBi aW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAotIyBtb2RpZmljYXRpb24sIGFyZSBwZXJtaXR0 ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRpdGlvbnMKLSMgYXJlIG1ldDoKLSMg MS4gUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBj b3B5cmlnaHQKLSMgICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZv bGxvd2luZyBkaXNjbGFpbWVyLgotIyAyLiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0g bXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAotIyAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCi0jICAg IGRvY3VtZW50YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBk aXN0cmlidXRpb24uCi0jCi0jIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5D LiBgYEFTIElTJycgQU5EIEFOWQotIyBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5D TFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQotIyBJTVBMSUVEIFdBUlJBTlRJRVMgT0Yg TUVSQ0hBTlRBQklMSVRZIEFORCBGSVRORVNTIEZPUiBBIFBBUlRJQ1VMQVIKLSMgUFVSUE9TRSBB UkUgRElTQ0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1IKLSMgQ09OVFJJ QlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQ RUNJQUwsCi0jIEVYRU1QTEFSWSwgT1IgQ09OU0VRVUVOVElBTCBEQU1BR0VTIChJTkNMVURJTkcs IEJVVCBOT1QgTElNSVRFRCBUTywKLSMgUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBP UiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCi0jIFBST0ZJVFM7IE9SIEJVU0lORVNT IElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKLSMgT0YgTElB QklMSVRZLCBXSEVUSEVSIElOIENPTlRSQUNULCBTVFJJQ1QgTElBQklMSVRZLCBPUiBUT1JUCi0j IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRQotIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhF IFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgotCi1pbXBvcnQgcmUKLWltcG9ydCBzdWJwcm9j ZXNzCi1pbXBvcnQgc3lzCi0KLWRlZiBHZXRBdHRhY2hlZERldmljZXMoKToKLSAgICByZV9kZXZp Y2UgPSByZS5jb21waWxlKCdeKFthLXpBLVowLTlfOi4tXSspXHRkZXZpY2UkJywgcmUuTVVMVElM SU5FKQotICAgIHByb2Nlc3MgPSBzdWJwcm9jZXNzLlBvcGVuKFsnYWRiJywgJ2RldmljZXMnXSwg c3Rkb3V0PXN1YnByb2Nlc3MuUElQRSkKLSAgICByZXR1cm4gcmVfZGV2aWNlLmZpbmRhbGwocHJv Y2Vzcy5jb21tdW5pY2F0ZSgpWzBdKQotCi0KLWNsYXNzIEFuZHJvaWREZXZpY2VTdGF0dXMob2Jq ZWN0KToKLSAgICBkZWYgX19pbml0X18oc2VsZiwgZGV2aWNlX3NlcmlhbCk6Ci0gICAgICAgIHNl bGYuX2RldmljZV9zZXJpYWwgPSBkZXZpY2Vfc2VyaWFsCi0KLSAgICBkZWYgX3J1bl9hZGJfY29t bWFuZChzZWxmLCBjb21tYW5kKToKLSAgICAgICAgZnVsbF9jb21tYW5kID0gWydhZGInLCAnLXMn LCBzZWxmLl9kZXZpY2Vfc2VyaWFsXSArIGNvbW1hbmQKLSAgICAgICAgc3Rkb3V0LCBfID0gc3Vi cHJvY2Vzcy5Qb3BlbihmdWxsX2NvbW1hbmQsIHN0ZG91dD1zdWJwcm9jZXNzLlBJUEUpLmNvbW11 bmljYXRlKCkKLSAgICAgICAgcmV0dXJuIHN0ZG91dC5zdHJpcCgpCi0KLSAgICBkZWYgZGV2aWNl X3R5cGUoc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9ydW5fYWRiX2NvbW1hbmQoWydzaGVs bCcsICdnZXRwcm9wJywgJ3JvLmJ1aWxkLnByb2R1Y3QnXSkKLQotICAgIGRlZiBkZXZpY2VfYnVp bGQoc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9ydW5fYWRiX2NvbW1hbmQoWydzaGVsbCcs ICdnZXRwcm9wJywgJ3JvLmJ1aWxkLmlkJ10pCi0KLSAgICBkZWYgZGV2aWNlX2ZpbmdlcnByaW50 KHNlbGYpOgotICAgICAgICByZXR1cm4gc2VsZi5fcnVuX2FkYl9jb21tYW5kKFsnc2hlbGwnLCAn Z2V0cHJvcCcsICdyby5idWlsZC5maW5nZXJwcmludCddKQotCi0gICAgZGVmIGJhdHRlcnlfbGV2 ZWwoc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9ydW5fYWRiX2NvbW1hbmQoWydzaGVsbCcs ICdjYXQnLCAnL3N5cy9jbGFzcy9wb3dlcl9zdXBwbHkvYmF0dGVyeS9jYXBhY2l0eSddKQotCi0g ICAgZGVmIGJhdHRlcnlfdGVtcGVyYXR1cmUoc2VsZik6Ci0gICAgICAgIHRlbXBlcmF0dXJlID0g c2VsZi5fcnVuX2FkYl9jb21tYW5kKFsnc2hlbGwnLCAnZHVtcHN5cycsICdiYXR0ZXJ5J10pCi0g ICAgICAgIHJlX3RlbXBlcmF0dXJlID0gcmUuY29tcGlsZSgndGVtcGVyYXR1cmU6XHMrKFxkKykn KQotICAgICAgICByZXR1cm4gcmVfdGVtcGVyYXR1cmUuZmluZGFsbCh0ZW1wZXJhdHVyZSlbMF0K LQotICAgIGRlZiB1c2VybmFtZShzZWxmKToKLSAgICAgICAgdXNlcm5hbWUgPSBzZWxmLl9ydW5f YWRiX2NvbW1hbmQoWydzaGVsbCcsICdpZCddKQotICAgICAgICByZV91c2VybmFtZSA9IHJlLmNv bXBpbGUoJ3VpZD1cZCtcKCguKz8pXCknKQotICAgICAgICByZXR1cm4gcmVfdXNlcm5hbWUuZmlu ZGFsbCh1c2VybmFtZSlbMF0KLQotCi1kZWYgbWFpbigpOgotICAgIGRldmljZXMgPSBHZXRBdHRh Y2hlZERldmljZXMoKQotICAgIGZvciBkZXZpY2Vfc2VyaWFsIGluIGRldmljZXM6Ci0gICAgICAg IGRldmljZV9zdGF0dXMgPSBBbmRyb2lkRGV2aWNlU3RhdHVzKGRldmljZV9zZXJpYWwpCi0KLSAg ICAgICAgcHJpbnQgJ0RldmljZSAlcyAoJXMpJyAlIChkZXZpY2Vfc2VyaWFsLCBkZXZpY2Vfc3Rh dHVzLmRldmljZV90eXBlKCkpCi0gICAgICAgIHByaW50ICcgIEJ1aWxkOiAlcyAoJXMpJyAlIChk ZXZpY2Vfc3RhdHVzLmRldmljZV9idWlsZCgpLCBkZXZpY2Vfc3RhdHVzLmRldmljZV9maW5nZXJw cmludCgpKQotICAgICAgICBwcmludCAnICBCYXR0ZXJ5OiAlcyUlJyAlIGRldmljZV9zdGF0dXMu YmF0dGVyeV9sZXZlbCgpCi0gICAgICAgIHByaW50ICcgIEJhdHRlcnkgdGVtcDogJXMnICUgZGV2 aWNlX3N0YXR1cy5iYXR0ZXJ5X3RlbXBlcmF0dXJlKCkKLSAgICAgICAgcHJpbnQgJyAgVXNlcm5h bWU6ICVzJyAlIGRldmljZV9zdGF0dXMudXNlcm5hbWUoKQotICAgICAgICBwcmludCAnJwotCi0K LWlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6Ci0gICAgc3lzLmV4aXQobWFpbigpKQpkaWZmIC0t Z2l0IGEvVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvY29uZmlnL3F1ZXVlcy5weSBiL1Rvb2xzL1F1 ZXVlU3RhdHVzU2VydmVyL2NvbmZpZy9xdWV1ZXMucHkKaW5kZXggOTliZjM0ZmJjZWE1YjQxMTc4 NTAxMjdlODE3Y2FkOWNjZDllZGI2Ni4uYzFlNmMwOTc3MmI1ZDhmZmVmZGZiYTYwMDFiZTFkNWVm ZjhiMzcwYiAxMDA2NDQKLS0tIGEvVG9vbHMvUXVldWVTdGF0dXNTZXJ2ZXIvY29uZmlnL3F1ZXVl cy5weQorKysgYi9Ub29scy9RdWV1ZVN0YXR1c1NlcnZlci9jb25maWcvcXVldWVzLnB5CkBAIC0z Miw3ICszMiw2IEBAIGFsbF9xdWV1ZV9uYW1lcyA9IFsKICAgICAic3R5bGUtcXVldWUiLAogICAg ICJjaHJvbWl1bS1ld3MiLCAgIyBha2EgY3ItbGludXgtZXdzCiAgICAgImNyLWxpbnV4LWRlYnVn LWV3cyIsCi0gICAgImNyLWFuZHJvaWQtZXdzIiwKICAgICAicXQtZXdzIiwKICAgICAicXQtd2sy LWV3cyIsCiAgICAgImd0ay1ld3MiLApkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRw eS90b29sL2NvbW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbS5weSBiL1Rvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvdG9vbC9jb21tYW5kcy9lYXJseXdhcm5pbmdzeXN0ZW0ucHkKaW5kZXggMDQ0MDhmMzQw NzZjNDU5MDE0MjA3YWY3ZTI1YjNlY2I3YmJmOTY1NS4uYzc4NjhkODQ0MWM5MmZjMTM0ODkwN2Mw YWE2YzA4NTk3OTBkZTI1OSAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS90b29s L2NvbW1hbmRzL2Vhcmx5d2FybmluZ3N5c3RlbS5weQorKysgYi9Ub29scy9TY3JpcHRzL3dlYmtp dHB5L3Rvb2wvY29tbWFuZHMvZWFybHl3YXJuaW5nc3lzdGVtLnB5CkBAIC0yMDAsMTQgKzIwMCw2 IEBAIGNsYXNzIENocm9taXVtV2luZG93c0VXUyhBYnN0cmFjdENocm9taXVtRVdTKToKICAgICBu YW1lID0gImNyLXdpbi1ld3MiCiAKIAotY2xhc3MgQ2hyb21pdW1BbmRyb2lkRVdTKEFic3RyYWN0 Q2hyb21pdW1FV1MpOgotICAgIG5hbWUgPSAiY3ItYW5kcm9pZC1ld3MiCi0gICAgcG9ydF9uYW1l ID0gImNocm9taXVtLWFuZHJvaWQiCi0gICAgd2F0Y2hlcnMgPSBBYnN0cmFjdENocm9taXVtRVdT LndhdGNoZXJzICsgWwotICAgICAgICAicGV0ZXIrZXdzQGNocm9taXVtLm9yZyIsCi0gICAgXQot Ci0KIGNsYXNzIE1hY0VXUyhBYnN0cmFjdEVhcmx5V2FybmluZ1N5c3RlbSk6CiAgICAgbmFtZSA9 ICJtYWMtZXdzIgogICAgIHBvcnRfbmFtZSA9ICJtYWMiCg==