34166 2010-01-26 06:58:18 -0800 [Android] Android lacks V8 equivalent of JNIBridgeJSC 2010-02-01 16:36:01 -0800 1 1 1 Unclassified WebKit WebKit Misc. 528+ (Nightly build) Android Android RESOLVED FIXED P2 Normal --- 32154 1 steveblock steveblock android-webkit-unforking commit-queue eric steveblock oldest_to_newest 184581 0 steveblock 2010-01-26 06:58:18 -0800 The JSC-specific classes JavaField and JavaArray were moved from JNIBridge to JNIBridgeJSC in http://trac.webkit.org/changeset/53849 See https://bugs.webkit.org/show_bug.cgi?id=33958 Android requires a V8 version of JNIBridgeJSC for the V8 version of JavaField 185809 1 47700 steveblock 2010-01-29 03:54:42 -0800 Created attachment 47700 Patch 185812 2 47702 steveblock 2010-01-29 04:01:56 -0800 Created attachment 47702 Patch 186424 3 47702 ariya.hidayat 2010-02-01 07:50:30 -0800 Comment on attachment 47702 Patch LGTM. 186658 4 eric 2010-02-01 16:13:14 -0800 Attachment 47702 was posted by a committer and has review+, assigning to Steve Block for commit. 186676 5 47702 steveblock 2010-02-01 16:25:21 -0800 Comment on attachment 47702 Patch Will land manually 186686 6 steveblock 2010-02-01 16:36:01 -0800 Landed manually as http://trac.webkit.org/changeset/54175 Closing bug as resolved fixed. 47700 2010-01-29 03:54:42 -0800 2010-01-29 04:01:50 -0800 Patch bug-34166-20100129115440.patch text/plain 5920 steveblock SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NDA1MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjMgQEAKKzIwMTAtMDEtMjkgIFN0ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZHMgVjgtc3BlY2lmaWMgSk5JIGJyaWRnZSBjbGFzc2VzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDE2NgorCisgICAgICAgIFRoaXMgaXMgdGhl IFY4IGVxdWl2YWxlbnQgb2YgYnJpZGdlL2puaS9qc2MvSk5JQnJpZGdlSlNDLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cywgYnVpbGQgZml4IG9ubHkuCisKKyAgICAgICAgKiBBbmRyb2lkLnY4Ymlu ZGluZ3MubWs6IE1vZGlmaWVkLiBBZGRlZCBKTklCcmlkZ2VWOC5jcHAKKyAgICAgICAgKiBicmlk Z2Uvam5pL3Y4OiBBZGRlZC4KKyAgICAgICAgKiBicmlkZ2Uvam5pL3Y4L0pOSUJyaWRnZVY4LmNw cDogQWRkZWQuCisgICAgICAgIChKYXZhRmllbGQ6OkphdmFGaWVsZCk6CisgICAgICAgICogYnJp ZGdlL2puaS92OC9KTklCcmlkZ2VWOC5oOiBBZGRlZC4KKyAgICAgICAgKEpTQzo6QmluZGluZ3M6 OkphdmFGaWVsZDo6bmFtZSk6CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpKYXZhRmllbGQ6OnR5 cGUpOgorICAgICAgICAoSlNDOjpCaW5kaW5nczo6SmF2YUZpZWxkOjpnZXRKTklUeXBlKToKKwog MjAxMC0wMS0yOSAgUGF2ZWwgRmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAg ICAgICBSZXZpZXdlZCBieSBUaW1vdGh5IEhhdGNoZXIuCkluZGV4OiBXZWJDb3JlL0FuZHJvaWQu djhiaW5kaW5ncy5tawo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBXZWJDb3JlL0FuZHJvaWQudjhiaW5kaW5ncy5t awkocmV2aXNpb24gNTQwNTIpCisrKyBXZWJDb3JlL0FuZHJvaWQudjhiaW5kaW5ncy5tawkod29y a2luZyBjb3B5KQpAQCAtMTY1LDQgKzE2NSw1IEBAIExPQ0FMX1NSQ19GSUxFUyArPSBcCiAJYmlu ZGluZ3MvdjgvY3VzdG9tL1Y4WE1MSHR0cFJlcXVlc3RVcGxvYWRDdXN0b20uY3BwCiAKIExPQ0FM X1NSQ19GSUxFUyArPSBcCi0JYnJpZGdlL2puaS9KTklVdGlsaXR5LmNwcAorCWJyaWRnZS9qbmkv Sk5JVXRpbGl0eS5jcHAgXAorCWJyaWRnZS9qbmkvdjgvSk5JQnJpZGdlVjguY3BwCkluZGV4OiBX ZWJDb3JlL2JyaWRnZS9qbmkvdjgvSk5JQnJpZGdlVjguY3BwCj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNv cmUvYnJpZGdlL2puaS92OC9KTklCcmlkZ2VWOC5jcHAJKHJldmlzaW9uIDApCisrKyBXZWJDb3Jl L2JyaWRnZS9qbmkvdjgvSk5JQnJpZGdlVjguY3BwCShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDQ0 IEBACisvKgorICogQ29weXJpZ2h0IDIwMTAsIFRoZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2pl Y3QKKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZv cm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92 aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworICogYXJlIG1ldDoKKyAqICAqIFJl ZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBtdXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJp Z2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93 aW5nIGRpc2NsYWltZXIuCisgKiAgKiBSZWRpc3RyaWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVz dCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdodAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qg b2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAg ZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRp c3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZ UklHSFQgSE9MREVSUyBgYEFTIElTJycgQU5EIEFOWQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdB UlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUKKyAqIElNUExJRUQg V0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxB UgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4gIElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZ UklHSFQgT1dORVIgT1IKKyAqIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1Qs IElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFMLAorICogRVhFTVBMQVJZLCBPUiBDT05TRVFV RU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLAorICogUFJPQ1VS RU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBTRVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEs IE9SCisgKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VE IEFORCBPTiBBTlkgVEhFT1JZCisgKiBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1Qs IFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAqIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBP VEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBT T0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFH RS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgiCisjaW5jbHVkZSAiSk5JQnJpZGdlVjguaCIK KwordXNpbmcgbmFtZXNwYWNlIEpTQzo6QmluZGluZ3M7CisKK0phdmFGaWVsZDo6SmF2YUZpZWxk KEpOSUVudiogZW52LCBqb2JqZWN0IGFGaWVsZCkKK3sKKyAgICAvLyBHZXQgZmllbGQgdHlwZQor ICAgIGpvYmplY3QgZmllbGRUeXBlID0gY2FsbEpOSU1ldGhvZDxqb2JqZWN0PihhRmllbGQsICJn ZXRUeXBlIiwgIigpTGphdmEvbGFuZy9DbGFzczsiKTsKKyAgICBqc3RyaW5nIGZpZWxkVHlwZU5h bWUgPSBzdGF0aWNfY2FzdDxqc3RyaW5nPihjYWxsSk5JTWV0aG9kPGpvYmplY3Q+KGZpZWxkVHlw ZSwgImdldE5hbWUiLCAiKClMamF2YS9sYW5nL1N0cmluZzsiKSk7CisgICAgbV90eXBlID0gSmF2 YVN0cmluZyhlbnYsIGZpZWxkVHlwZU5hbWUpOworICAgIG1fSk5JVHlwZSA9IEpOSVR5cGVGcm9t Q2xhc3NOYW1lKG1fdHlwZS5VVEY4U3RyaW5nKCkpOworCisgICAgLy8gR2V0IGZpZWxkIG5hbWUK KyAgICBqc3RyaW5nIGZpZWxkTmFtZSA9IHN0YXRpY19jYXN0PGpzdHJpbmc+KGNhbGxKTklNZXRo b2Q8am9iamVjdD4oYUZpZWxkLCAiZ2V0TmFtZSIsICIoKUxqYXZhL2xhbmcvU3RyaW5nOyIpKTsK KyAgICBtX25hbWUgPSBKYXZhU3RyaW5nKGVudiwgZmllbGROYW1lKTsKKworICAgIG1fZmllbGQg PSBuZXcgSk9iamVjdFdyYXBwZXIoYUZpZWxkKTsKK30KSW5kZXg6IFdlYkNvcmUvYnJpZGdlL2pu aS92OC9KTklCcmlkZ2VWOC5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYnJpZGdlL2puaS92OC9K TklCcmlkZ2VWOC5oCShyZXZpc2lvbiAwKQorKysgV2ViQ29yZS9icmlkZ2Uvam5pL3Y4L0pOSUJy aWRnZVY4LmgJKHJldmlzaW9uIDApCkBAIC0wLDAgKzEsNTYgQEAKKy8qCisgKiBDb3B5cmlnaHQg MjAxMCwgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2UgUHJvamVjdAorICoKKyAqIFJlZGlzdHJpYnV0 aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAor ICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2lu ZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICogICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJj ZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhp cyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqICAq IFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUg Y29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUg Zm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisgKiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBv dGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRI SVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhFIENPUFlSSUdIVCBIT0xERVJTIGBgQVMgSVMn JyBBTkQgQU5ZCisgKiBFWFBSRVNTIE9SIElNUExJRUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBC VVQgTk9UIExJTUlURUQgVE8sIFRIRQorICogSU1QTElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5U QUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVND TEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgVEhFIENPUFlSSUdIVCBPV05FUiBPUgorICogQ09O VFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJUkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUws IFNQRUNJQUwsCisgKiBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVE SU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBQUk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdP T0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IKKyAqIFBST0ZJVFM7IE9SIEJV U0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBDQVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKKyAq IE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1Ig VE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBB TlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklT RUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgorICovCisKKyNpZm5kZWYgSk5J QnJpZGdlVjhfaAorI2RlZmluZSBKTklCcmlkZ2VWOF9oCisKKyNpbmNsdWRlICJKTklCcmlkZ2Uu aCIgLy8gRm9yIEphdmFTdHJpbmcKKyNpbmNsdWRlICJKYXZhSW5zdGFuY2VWOC5oIiAvLyBGb3Ig Sk9iamVjdFdyYXBwZXIKKworbmFtZXNwYWNlIEpTQyB7CisKK25hbWVzcGFjZSBCaW5kaW5ncyB7 CisKK2NsYXNzIEphdmFGaWVsZCB7CitwdWJsaWM6CisgICAgSmF2YUZpZWxkKEpOSUVudiosIGpv YmplY3QgYUZpZWxkKTsKKworICAgIGNvbnN0IEphdmFTdHJpbmcmIG5hbWUoKSBjb25zdCB7IHJl dHVybiBtX25hbWU7IH0KKyAgICBjb25zdCBjaGFyKiB0eXBlKCkgY29uc3QgeyByZXR1cm4gbV90 eXBlLlVURjhTdHJpbmcoKTsgfQorCisgICAgSk5JVHlwZSBnZXRKTklUeXBlKCkgY29uc3QgeyBy ZXR1cm4gbV9KTklUeXBlOyB9CisKK3ByaXZhdGU6CisgICAgSmF2YVN0cmluZyBtX25hbWU7Cisg ICAgSmF2YVN0cmluZyBtX3R5cGU7CisgICAgSk5JVHlwZSBtX0pOSVR5cGU7CisgICAgUmVmUHRy PEpPYmplY3RXcmFwcGVyPiBtX2ZpZWxkOworfTsKKworfSAvLyBuYW1lc3BhY2UgQmluZGluZ3MK KworfSAvLyBuYW1lc3BhY2UgSlNDCisKKyNlbmRpZiAvLyBKTklCcmlkZ2VWOF9oCg== 47702 2010-01-29 04:01:56 -0800 2010-02-01 16:25:21 -0800 Patch bug-34166-20100129120154.patch text/plain 6346 steveblock SW5kZXg6IFdlYkNvcmUvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvQ2hhbmdlTG9n CShyZXZpc2lvbiA1NDA1MykKKysrIFdlYkNvcmUvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBA IC0xLDMgKzEsMjQgQEAKKzIwMTAtMDEtMjkgIFN0ZXZlIEJsb2NrICA8c3RldmVibG9ja0Bnb29n bGUuY29tPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAg IEFkZHMgVjgtc3BlY2lmaWMgSk5JIGJyaWRnZSBjbGFzc2VzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNDE2NgorCisgICAgICAgIFRoaXMgaXMgdGhl IFY4IGVxdWl2YWxlbnQgb2YgYnJpZGdlL2puaS9qc2MvSk5JQnJpZGdlSlNDLgorCisgICAgICAg IE5vIG5ldyB0ZXN0cywgYnVpbGQgZml4IG9ubHkuCisKKyAgICAgICAgKiBBbmRyb2lkLnY4Ymlu ZGluZ3MubWs6IE1vZGlmaWVkLiBBZGRlZCBKTklCcmlkZ2UuY3BwIGFuZCBKTklCcmlkZ2VWOC5j cHAKKyAgICAgICAgKiBicmlkZ2UvQnJpZGdlLmg6IE1vZGlmaWVkLiBBZGRlZCBtaXNzaW5nIGlu Y2x1ZGUgZm9yIE5vbmNvcHlhYmxlLmgKKyAgICAgICAgKiBicmlkZ2Uvam5pL3Y4OiBBZGRlZC4K KyAgICAgICAgKiBicmlkZ2Uvam5pL3Y4L0pOSUJyaWRnZVY4LmNwcDogQWRkZWQuCisgICAgICAg IChKYXZhRmllbGQ6OkphdmFGaWVsZCk6CisgICAgICAgICogYnJpZGdlL2puaS92OC9KTklCcmlk Z2VWOC5oOiBBZGRlZC4KKyAgICAgICAgKEpTQzo6QmluZGluZ3M6OkphdmFGaWVsZDo6bmFtZSk6 CisgICAgICAgIChKU0M6OkJpbmRpbmdzOjpKYXZhRmllbGQ6OnR5cGUpOgorICAgICAgICAoSlND OjpCaW5kaW5nczo6SmF2YUZpZWxkOjpnZXRKTklUeXBlKToKKwogMjAxMC0wMS0yOSAgUGF2ZWwg RmVsZG1hbiAgPHBmZWxkbWFuQGNocm9taXVtLm9yZz4KIAogICAgICAgICBSZXZpZXdlZCBieSBU aW1vdGh5IEhhdGNoZXIuCkluZGV4OiBXZWJDb3JlL0FuZHJvaWQudjhiaW5kaW5ncy5tawo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBXZWJDb3JlL0FuZHJvaWQudjhiaW5kaW5ncy5tawkocmV2aXNpb24gNTQwNTIp CisrKyBXZWJDb3JlL0FuZHJvaWQudjhiaW5kaW5ncy5tawkod29ya2luZyBjb3B5KQpAQCAtMTY1 LDQgKzE2NSw2IEBAIExPQ0FMX1NSQ19GSUxFUyArPSBcCiAJYmluZGluZ3MvdjgvY3VzdG9tL1Y4 WE1MSHR0cFJlcXVlc3RVcGxvYWRDdXN0b20uY3BwCiAKIExPQ0FMX1NSQ19GSUxFUyArPSBcCi0J YnJpZGdlL2puaS9KTklVdGlsaXR5LmNwcAorCWJyaWRnZS9qbmkvSk5JQnJpZGdlLmNwcCBcCisJ YnJpZGdlL2puaS9KTklVdGlsaXR5LmNwcCBcCisJYnJpZGdlL2puaS92OC9KTklCcmlkZ2VWOC5j cHAKSW5kZXg6IFdlYkNvcmUvYnJpZGdlL0JyaWRnZS5oCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUv YnJpZGdlL0JyaWRnZS5oCShyZXZpc2lvbiA1NDA1MikKKysrIFdlYkNvcmUvYnJpZGdlL0JyaWRn ZS5oCSh3b3JraW5nIGNvcHkpCkBAIC0yOCw2ICsyOCw3IEBACiAjZGVmaW5lIEJyaWRnZV9oCiAK ICNpbmNsdWRlICJCcmlkZ2VKU0MuaCIKKyNpbmNsdWRlIDx3dGYvTm9uY29weWFibGUuaD4KIAog bmFtZXNwYWNlIEpTQyAgewogCkluZGV4OiBXZWJDb3JlL2JyaWRnZS9qbmkvdjgvSk5JQnJpZGdl VjguY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFdlYkNvcmUvYnJpZGdlL2puaS92OC9KTklCcmlkZ2VWOC5j cHAJKHJldmlzaW9uIDApCisrKyBXZWJDb3JlL2JyaWRnZS9qbmkvdjgvSk5JQnJpZGdlVjguY3Bw CShyZXZpc2lvbiAwKQpAQCAtMCwwICsxLDQ0IEBACisvKgorICogQ29weXJpZ2h0IDIwMTAsIFRo ZSBBbmRyb2lkIE9wZW4gU291cmNlIFByb2plY3QKKyAqCisgKiBSZWRpc3RyaWJ1dGlvbiBhbmQg dXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKKyAqIG1vZGlm aWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0 aW9ucworICogYXJlIG1ldDoKKyAqICAqIFJlZGlzdHJpYnV0aW9ucyBvZiBzb3VyY2UgY29kZSBt dXN0IHJldGFpbiB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIuCisgKiAgKiBSZWRpc3Ry aWJ1dGlvbnMgaW4gYmluYXJ5IGZvcm0gbXVzdCByZXByb2R1Y2UgdGhlIGFib3ZlIGNvcHlyaWdo dAorICogICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2lu ZyBkaXNjbGFpbWVyIGluIHRoZQorICogICAgZG9jdW1lbnRhdGlvbiBhbmQvb3Igb3RoZXIgbWF0 ZXJpYWxzIHByb3ZpZGVkIHdpdGggdGhlIGRpc3RyaWJ1dGlvbi4KKyAqCisgKiBUSElTIFNPRlRX QVJFIElTIFBST1ZJREVEIEJZIFRIRSBDT1BZUklHSFQgSE9MREVSUyBgYEFTIElTJycgQU5EIEFO WQorICogRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJBTlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBM SU1JVEVEIFRPLCBUSEUKKyAqIElNUExJRUQgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkg QU5EIEZJVE5FU1MgRk9SIEEgUEFSVElDVUxBUgorICogUFVSUE9TRSBBUkUgRElTQ0xBSU1FRC4g IElOIE5PIEVWRU5UIFNIQUxMIFRIRSBDT1BZUklHSFQgT1dORVIgT1IKKyAqIENPTlRSSUJVVE9S UyBCRSBMSUFCTEUgRk9SIEFOWSBESVJFQ1QsIElORElSRUNULCBJTkNJREVOVEFMLCBTUEVDSUFM LAorICogRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMIERBTUFHRVMgKElOQ0xVRElORywgQlVU IE5PVCBMSU1JVEVEIFRPLAorICogUFJPQ1VSRU1FTlQgT0YgU1VCU1RJVFVURSBHT09EUyBPUiBT RVJWSUNFUzsgTE9TUyBPRiBVU0UsIERBVEEsIE9SCisgKiBQUk9GSVRTOyBPUiBCVVNJTkVTUyBJ TlRFUlJVUFRJT04pIEhPV0VWRVIgQ0FVU0VEIEFORCBPTiBBTlkgVEhFT1JZCisgKiBPRiBMSUFC SUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFCSUxJVFksIE9SIFRPUlQKKyAq IChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBP VVQgT0YgVEhFIFVTRQorICogT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJU0VEIE9GIFRI RSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKyAqLworCisjaW5jbHVkZSAiY29uZmlnLmgi CisjaW5jbHVkZSAiSk5JQnJpZGdlVjguaCIKKwordXNpbmcgbmFtZXNwYWNlIEpTQzo6QmluZGlu Z3M7CisKK0phdmFGaWVsZDo6SmF2YUZpZWxkKEpOSUVudiogZW52LCBqb2JqZWN0IGFGaWVsZCkK K3sKKyAgICAvLyBHZXQgZmllbGQgdHlwZQorICAgIGpvYmplY3QgZmllbGRUeXBlID0gY2FsbEpO SU1ldGhvZDxqb2JqZWN0PihhRmllbGQsICJnZXRUeXBlIiwgIigpTGphdmEvbGFuZy9DbGFzczsi KTsKKyAgICBqc3RyaW5nIGZpZWxkVHlwZU5hbWUgPSBzdGF0aWNfY2FzdDxqc3RyaW5nPihjYWxs Sk5JTWV0aG9kPGpvYmplY3Q+KGZpZWxkVHlwZSwgImdldE5hbWUiLCAiKClMamF2YS9sYW5nL1N0 cmluZzsiKSk7CisgICAgbV90eXBlID0gSmF2YVN0cmluZyhlbnYsIGZpZWxkVHlwZU5hbWUpOwor ICAgIG1fSk5JVHlwZSA9IEpOSVR5cGVGcm9tQ2xhc3NOYW1lKG1fdHlwZS5VVEY4U3RyaW5nKCkp OworCisgICAgLy8gR2V0IGZpZWxkIG5hbWUKKyAgICBqc3RyaW5nIGZpZWxkTmFtZSA9IHN0YXRp Y19jYXN0PGpzdHJpbmc+KGNhbGxKTklNZXRob2Q8am9iamVjdD4oYUZpZWxkLCAiZ2V0TmFtZSIs ICIoKUxqYXZhL2xhbmcvU3RyaW5nOyIpKTsKKyAgICBtX25hbWUgPSBKYXZhU3RyaW5nKGVudiwg ZmllbGROYW1lKTsKKworICAgIG1fZmllbGQgPSBuZXcgSk9iamVjdFdyYXBwZXIoYUZpZWxkKTsK K30KSW5kZXg6IFdlYkNvcmUvYnJpZGdlL2puaS92OC9KTklCcmlkZ2VWOC5oCj09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0K LS0tIFdlYkNvcmUvYnJpZGdlL2puaS92OC9KTklCcmlkZ2VWOC5oCShyZXZpc2lvbiAwKQorKysg V2ViQ29yZS9icmlkZ2Uvam5pL3Y4L0pOSUJyaWRnZVY4LmgJKHJldmlzaW9uIDApCkBAIC0wLDAg KzEsNTYgQEAKKy8qCisgKiBDb3B5cmlnaHQgMjAxMCwgVGhlIEFuZHJvaWQgT3BlbiBTb3VyY2Ug UHJvamVjdAorICoKKyAqIFJlZGlzdHJpYnV0aW9uIGFuZCB1c2UgaW4gc291cmNlIGFuZCBiaW5h cnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAorICogbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVk IHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisgKiBhcmUgbWV0OgorICog ICogUmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBj b3B5cmlnaHQKKyAqICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBm b2xsb3dpbmcgZGlzY2xhaW1lci4KKyAqICAqIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9y bSBtdXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisgKiAgICBub3RpY2UsIHRoaXMg bGlzdCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisg KiAgICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0 aGUgZGlzdHJpYnV0aW9uLgorICoKKyAqIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgVEhF IENPUFlSSUdIVCBIT0xERVJTIGBgQVMgSVMnJyBBTkQgQU5ZCisgKiBFWFBSRVNTIE9SIElNUExJ RUQgV0FSUkFOVElFUywgSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFRIRQorICogSU1Q TElFRCBXQVJSQU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJU SUNVTEFSCisgKiBQVVJQT1NFIEFSRSBESVNDTEFJTUVELiAgSU4gTk8gRVZFTlQgU0hBTEwgVEhF IENPUFlSSUdIVCBPV05FUiBPUgorICogQ09OVFJJQlVUT1JTIEJFIExJQUJMRSBGT1IgQU5ZIERJ UkVDVCwgSU5ESVJFQ1QsIElOQ0lERU5UQUwsIFNQRUNJQUwsCisgKiBFWEVNUExBUlksIE9SIENP TlNFUVVFTlRJQUwgREFNQUdFUyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sCisgKiBQ Uk9DVVJFTUVOVCBPRiBTVUJTVElUVVRFIEdPT0RTIE9SIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwg REFUQSwgT1IKKyAqIFBST0ZJVFM7IE9SIEJVU0lORVNTIElOVEVSUlVQVElPTikgSE9XRVZFUiBD QVVTRUQgQU5EIE9OIEFOWSBUSEVPUlkKKyAqIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05U UkFDVCwgU1RSSUNUIExJQUJJTElUWSwgT1IgVE9SVAorICogKElOQ0xVRElORyBORUdMSUdFTkNF IE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisgKiBPRiBU SElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0gg REFNQUdFLgorICovCisKKyNpZm5kZWYgSk5JQnJpZGdlVjhfaAorI2RlZmluZSBKTklCcmlkZ2VW OF9oCisKKyNpbmNsdWRlICJKTklCcmlkZ2UuaCIgLy8gRm9yIEphdmFTdHJpbmcKKyNpbmNsdWRl ICJKYXZhSW5zdGFuY2VWOC5oIiAvLyBGb3IgSk9iamVjdFdyYXBwZXIKKworbmFtZXNwYWNlIEpT QyB7CisKK25hbWVzcGFjZSBCaW5kaW5ncyB7CisKK2NsYXNzIEphdmFGaWVsZCB7CitwdWJsaWM6 CisgICAgSmF2YUZpZWxkKEpOSUVudiosIGpvYmplY3QgYUZpZWxkKTsKKworICAgIGNvbnN0IEph dmFTdHJpbmcmIG5hbWUoKSBjb25zdCB7IHJldHVybiBtX25hbWU7IH0KKyAgICBjb25zdCBjaGFy KiB0eXBlKCkgY29uc3QgeyByZXR1cm4gbV90eXBlLlVURjhTdHJpbmcoKTsgfQorCisgICAgSk5J VHlwZSBnZXRKTklUeXBlKCkgY29uc3QgeyByZXR1cm4gbV9KTklUeXBlOyB9CisKK3ByaXZhdGU6 CisgICAgSmF2YVN0cmluZyBtX25hbWU7CisgICAgSmF2YVN0cmluZyBtX3R5cGU7CisgICAgSk5J VHlwZSBtX0pOSVR5cGU7CisgICAgUmVmUHRyPEpPYmplY3RXcmFwcGVyPiBtX2ZpZWxkOworfTsK KworfSAvLyBuYW1lc3BhY2UgQmluZGluZ3MKKworfSAvLyBuYW1lc3BhY2UgSlNDCisKKyNlbmRp ZiAvLyBKTklCcmlkZ2VWOF9oCg==