summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2017-03-22Mark MultiDexTestRunner as deprecated am: 93728d8ae0 am: 668b6077deandroid-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-security-8.0.0_r54android-security-8.0.0_r53android-security-8.0.0_r52android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r26android-cts-8.0_r25android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r51android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-devoreo-cts-releaseYohann Roussel
am: 5ccdd930f0 Change-Id: I1352525730454a258b6cd5a51c2577c7db665944
2017-03-22Mark MultiDexTestRunner as deprecated am: 93728d8ae0Yohann Roussel
am: 668b6077de Change-Id: Ic9a989e69350b0e8414537aeb2003ba1847a6dec
2017-03-22Mark MultiDexTestRunner as deprecatedYohann Roussel
am: 93728d8ae0 Change-Id: I1415b75446e18bfd1bf19a5646cad40adde040db
2017-03-10Clean up multidex gradle build, bump version to 1.0.2 for releaseAlan Viverette
Bug: 36122649 Test: ./gradlew dist test connectedAndroidTest Change-Id: I79578f683146a3ea16521cd090d113698a14c5f5
2017-02-27Mark MultiDexTestRunner as deprecatedYohann Roussel
Bug: 35796382 Test: N/A Change-Id: I7a36e9223b010a04a1d2ea28914d0b502dd7f61e
2017-01-23Check crc and time of secondary dex files am: 9958145a97 am: 20f0cdc308 am: ↵Yohann Roussel
2422a2eb3d am: 4a2df94e21 Change-Id: Id89f28382eb25d81dce26edcc2e3a12fe6e0238d
2017-01-23Check crc and time of secondary dex files am: 9958145a97 am: 20f0cdc308Yohann Roussel
am: 2422a2eb3d Change-Id: Ied383048c8cc3b94d0fe33628cb39ff9eb71b4ed
2017-01-23Check crc and time of secondary dex files am: 9958145a97Yohann Roussel
am: 20f0cdc308 Change-Id: I7d84966360e8283d7b24c6009f5fd79ed2dbc5b5
2017-01-23Check crc and time of secondary dex filesYohann Roussel
am: 9958145a97 Change-Id: Iac3e4fef6a30d8085ab29609df92e0cca1800da0
2017-01-23Check extracted dex only once per usage am: fe10f9fd25 am: 8c46dd3b3f am: ↵Yohann Roussel
221296887a am: d3f4428cfd Change-Id: Idc5e7387402151453f3a4ea75300e9c9c892e9b3
2017-01-23Check extracted dex only once per usage am: fe10f9fd25 am: 8c46dd3b3fYohann Roussel
am: 221296887a Change-Id: Ica275e0ae0c3dd2d3efa9ca3f75fd5b95f220ccd
2017-01-23Check extracted dex only once per usage am: fe10f9fd25Yohann Roussel
am: 8c46dd3b3f Change-Id: I914ec257f75aa6b6b84984659fc24445c6d8fe60
2017-01-23Check extracted dex only once per usageYohann Roussel
am: fe10f9fd25 Change-Id: I529bc3ae057f9fef4cb7c64c3e490a773e1ec0c2
2017-01-23Check crc and time of secondary dex filesandroid-o-preview-1android-n-mr2-preview-2o-previewYohann Roussel
Protect extracted dex files from modifications by checking their crc and modification time. In case of change, proceed to a new extraction. Those checks are replacing the check of the zip integrity by opening it with a ZipFile. Test: SupportMultidexHostTest (from tradefed) Bug: 32159214 Change-Id: I09aa01550782f5f550bee6fc91709455e82c1057
2017-01-20Mark extracted dex files as read only am: f5832474eb am: 45e77758d4 am: ↵Yohann Roussel
4207787110 am: 1aad735e08 Change-Id: I4d6975d40e63b713e23ad143f3b2462a98fecb14
2017-01-20Mark extracted dex files as read only am: f5832474eb am: 45e77758d4Yohann Roussel
am: 4207787110 Change-Id: I7a7c3174d6264a8b788e2a08eacf378b78abd24b
2017-01-20Mark extracted dex files as read only am: f5832474ebYohann Roussel
am: 45e77758d4 Change-Id: I5eaa02b87dfbd14ab11d1c9be18b8768e8e5523f
2017-01-20Mark extracted dex files as read onlyYohann Roussel
am: f5832474eb Change-Id: I16b9a24cec6cde11714f4df2032324045996cd39
2017-01-20Check extracted dex only once per usageYohann Roussel
The check is unnecessary in MultiDex.install because it was already done by MultiDexExtractor.load. The retry on bad extraction is also included in MultiDexExtractor.load so it was redundant too. Test: SupportMultidexHostTest (from tradefed) Change-Id: I877a99db0e0c562ac47a7c5c87d7f3e1d70884e6
2017-01-20Mark extracted dex files as read onlyYohann Roussel
This is a poor protection from some attack against application that would be made to overwrite their extracted secondary dex files. The protection is poor because marking the dex files read only will protect only some applications depending on their implementation. Test: MultiDexLegacyVersionedTestApp Bug: 32159214 Change-Id: I88c6fc72284f4e0b832dc4d840c9c636a1234638
2017-01-13Merge "Prefix temp files to ensure they are cleaned up" am: b504c8f1b2 am: ↵Justin Morey
d288c44654 am: 0b80313260 am: 708a59cce4 Change-Id: I5360a7f9e03f4eb47c288bd19a62c315973f6398
2017-01-13Use context.getApplicationInfo() am: 87738871b5 am: b703c32e27 am: 7bf8f6f48fJon Noack
am: 5504711f87 Change-Id: Ib530e83309aae0a0a0c054dc2e8879c0ca7c22f3
2017-01-13Merge "Prefix temp files to ensure they are cleaned up" am: b504c8f1b2 am: ↵Justin Morey
d288c44654 am: 0b80313260 Change-Id: I0d5772c4ce26e9f1b3c7b8d517ed962345cfcf02
2017-01-13Use context.getApplicationInfo() am: 87738871b5 am: b703c32e27Jon Noack
am: 7bf8f6f48f Change-Id: I05979b27ded1989f5f8cef3e8a9f503e590d1c72
2017-01-13Merge "Prefix temp files to ensure they are cleaned up" am: b504c8f1b2Justin Morey
am: d288c44654 Change-Id: If625dc1bae06d2f8fc0e8203c984df1db2f537e7
2017-01-13Use context.getApplicationInfo() am: 87738871b5Jon Noack
am: b703c32e27 Change-Id: I480aed8ab0808015d14ef114f20eb0004bc35ada
2017-01-13Merge "Prefix temp files to ensure they are cleaned up"Justin Morey
am: b504c8f1b2 Change-Id: I97e7c14ab15cf0af6e61410ea26164447300297b
2017-01-13Use context.getApplicationInfo()Jon Noack
am: 87738871b5 Change-Id: Ia0fe8f8b038b38cb58906727a4f79b8a32ec5298
2017-01-13Merge "Prefix temp files to ensure they are cleaned up"Justin Morey
2017-01-13Use context.getApplicationInfo()Jon Noack
Due to package install races it is possible for a process to be started from an old apk even though that apk has been replaced. Querying for ApplicationInfo by package name may return information for the new apk, leading to a runtime with the old main dex file and new secondary dex files. This leads to various problems like ClassNotFoundExceptions. Using context.getApplicationInfo() should result in the process having a consistent view of the world (even if it is of the old world). The package install races are eventually resolved and old processes are killed. Test: Passes Google Play services tests Change-Id: I95257d851eb678c55a19e731183f7add2b540615
2017-01-13Prefix temp files to ensure they are cleaned upJon Noack
Temp files are removed unconditionally in a finally block following extraction. However, if the process is killed during extraction this finally block will not run. Because temp files started with extractedFilePrefix, they wouldn't be cleaned up in prepareDexDir(). This change ensures that prepareDexDir() will remove any existing temp files before extraction begins. Bug: 27769642 Bug: 33718827 Test: Passes Google Play services tests Change-Id: I803ba2c7234801551d36cbbe2941eeaa986d31f8
2017-01-12Use context.getApplicationInfo()Jon Noack
Due to package install races it is possible for a process to be started from an old apk even though that apk has been replaced. Querying for ApplicationInfo by package name may return information for the new apk, leading to a runtime with the old main dex file and new secondary dex files. This leads to various problems like ClassNotFoundExceptions. Using context.getApplicationInfo() should result in the process having a consistent view of the world (even if it is of the old world). The package install races are eventually resolved and old processes are killed. Test: Passes Google Play services tests Change-Id: I95257d851eb678c55a19e731183f7add2b540615
2017-01-12Prefix temp files to ensure they are cleaned upJon Noack
Temp files are removed unconditionally in a finally block following extraction. However, if the process is killed during extraction this finally block will not run. Because temp files started with extractedFilePrefix, they wouldn't be cleaned up in prepareDexDir(). This change ensures that prepareDexDir() will remove any existing temp files before extraction begins. Bug: 27769642 Bug: 33718827 Test: Passes Google Play services tests Change-Id: I803ba2c7234801551d36cbbe2941eeaa986d31f8
2016-12-22Change multidex version file am: 07bca8fb7f am: 8e58f1bef2 am: 91ff19c89bYohann Roussel
am: 282eaa7b17 Change-Id: If88c07584b9bc2f2878504c4622f8233bf64099b
2016-12-22Change multidex version file am: 07bca8fb7f am: 8e58f1bef2Yohann Roussel
am: 91ff19c89b Change-Id: I3fae80ab5ddf1cb2666037216a26498ce81e1c62
2016-12-22Change multidex version file am: 07bca8fb7fYohann Roussel
am: 8e58f1bef2 Change-Id: I532d31d12968688c81426e175ef986d18e96a42c
2016-12-22Change multidex version fileYohann Roussel
am: 07bca8fb7f Change-Id: I33264c4389947c816e20b1dfea1d65478280dcd3
2016-12-21Change multidex version fileandroid-n-mr2-preview-1Yohann Roussel
- Stop collecting build id and version to allow better behavior with incremental builds. - Make it resistant to git errors. Test: mm Change-Id: I03b1e36048f92f50227cfc0e370454438bee31cf
2016-09-21Add missing dependency to jack-meta content am: a2e21e7861 am: c23db7187e ↵Yohann Roussel
am: 3fdcf1a004 am: 6b14ba2339 Change-Id: Id143f90c549aaca030ad6a1eb7dddba9742aede3
2016-09-21Add missing dependency to jack-meta content am: a2e21e7861 am: c23db7187eYohann Roussel
am: 3fdcf1a004 Change-Id: I76d7bf999e161459484eb4f576342aab2f4101c7
2016-09-21Add missing dependency to jack-meta content am: a2e21e7861Yohann Roussel
am: c23db7187e Change-Id: I333a9f99220cdb2f13d6cd767dfa18e99d5890d5
2016-09-21Add missing dependency to jack-meta contentYohann Roussel
am: a2e21e7861 Change-Id: I1096b62319c363d240984bab5b0895e1c9eec823
2016-09-20Add missing dependency to jack-meta contentandroid-n-mr1-preview-2android-n-mr1-preview-1Yohann Roussel
Test: mm Change-Id: I70c50b5b9fe7f06b0adde5616590aec24b6d0dff
2016-07-26Prevent concurrent extractions am: d89431ead3 am: c094a2de01Andrew Johnson
am: 1d40f0ca24 Change-Id: I0af420be82ad7eb5ad5db742e5317d1e2cdd0fe3
2016-07-26Prevent concurrent extractions am: d89431ead3Andrew Johnson
am: c094a2de01 Change-Id: I7806402f71a51749321a655ddef98b1bfc34ac12
2016-07-26Prevent concurrent extractionsandroid-cts_7.1_r1android-cts-7.1_r9android-cts-7.1_r8android-cts-7.1_r7android-cts-7.1_r6android-cts-7.1_r5android-cts-7.1_r4android-cts-7.1_r3android-cts-7.1_r29android-cts-7.1_r28android-cts-7.1_r27android-cts-7.1_r26android-cts-7.1_r25android-cts-7.1_r24android-cts-7.1_r23android-cts-7.1_r22android-cts-7.1_r21android-cts-7.1_r20android-cts-7.1_r2android-cts-7.1_r19android-cts-7.1_r18android-cts-7.1_r17android-cts-7.1_r16android-cts-7.1_r15android-cts-7.1_r14android-cts-7.1_r13android-cts-7.1_r12android-cts-7.1_r11android-cts-7.1_r10android-cts-7.1_r1android-7.1.2_r9android-7.1.2_r8android-7.1.2_r6android-7.1.2_r5android-7.1.2_r4android-7.1.2_r39android-7.1.2_r38android-7.1.2_r37android-7.1.2_r36android-7.1.2_r33android-7.1.2_r32android-7.1.2_r30android-7.1.2_r3android-7.1.2_r29android-7.1.2_r28android-7.1.2_r27android-7.1.2_r25android-7.1.2_r24android-7.1.2_r23android-7.1.2_r2android-7.1.2_r19android-7.1.2_r18android-7.1.2_r17android-7.1.2_r16android-7.1.2_r15android-7.1.2_r14android-7.1.2_r13android-7.1.2_r12android-7.1.2_r11android-7.1.2_r10android-7.1.2_r1android-7.1.1_r9android-7.1.1_r8android-7.1.1_r7android-7.1.1_r61android-7.1.1_r60android-7.1.1_r6android-7.1.1_r59android-7.1.1_r58android-7.1.1_r57android-7.1.1_r56android-7.1.1_r55android-7.1.1_r54android-7.1.1_r53android-7.1.1_r52android-7.1.1_r51android-7.1.1_r50android-7.1.1_r49android-7.1.1_r48android-7.1.1_r47android-7.1.1_r46android-7.1.1_r45android-7.1.1_r44android-7.1.1_r43android-7.1.1_r42android-7.1.1_r41android-7.1.1_r40android-7.1.1_r4android-7.1.1_r39android-7.1.1_r38android-7.1.1_r35android-7.1.1_r33android-7.1.1_r32android-7.1.1_r31android-7.1.1_r3android-7.1.1_r28android-7.1.1_r27android-7.1.1_r26android-7.1.1_r25android-7.1.1_r24android-7.1.1_r23android-7.1.1_r22android-7.1.1_r21android-7.1.1_r20android-7.1.1_r2android-7.1.1_r17android-7.1.1_r16android-7.1.1_r15android-7.1.1_r14android-7.1.1_r13android-7.1.1_r12android-7.1.1_r11android-7.1.1_r10android-7.1.1_r1android-7.1.0_r7android-7.1.0_r6android-7.1.0_r5android-7.1.0_r4android-7.1.0_r3android-7.1.0_r2android-7.1.0_r1nougat-mr2.3-releasenougat-mr2.2-releasenougat-mr2.1-releasenougat-mr2-security-releasenougat-mr2-releasenougat-mr2-pixel-releasenougat-mr2-devnougat-mr1.8-releasenougat-mr1.7-releasenougat-mr1.6-releasenougat-mr1.5-releasenougat-mr1.4-releasenougat-mr1.3-releasenougat-mr1.2-releasenougat-mr1.1-releasenougat-mr1-volantis-releasenougat-mr1-security-releasenougat-mr1-releasenougat-mr1-flounder-releasenougat-mr1-devnougat-mr1-cts-releasenougat-dr1-releaseAndrew Johnson
am: d89431ead3 Change-Id: I8fe1f1aeb0d814aca58dbc9d35089377d8af0a9a
2016-07-25Prevent concurrent extractionsAndrew Johnson
This prevernt multiple processes of the same application from simultaneously caching the same secondary dex files. Bug: 27263431 (cherry picked from commit 048fbf7ccf53782a265c277df38c273d43e5450e) Change-Id: Iacd9cb1ab2084a66285f120fb313b578a2f5e14b
2016-07-12Fix typo in javadoc am: 9ee9a9bd9dSebastien Hertz
am: de484f5684 Change-Id: I6c85494e56ed0d25b4834d02c5c325fbe32be7fe
2016-07-12Fix typo in javadocSebastien Hertz
am: 9ee9a9bd9d Change-Id: I53f00a7b26263027a80631d072004f2104b9e141
2016-07-12Fix typo in javadocSebastien Hertz
Bug: 30076851 (cherry picked from commit 8be7c7a5a6377745054dcd3f1176a7f4cb96b153) Change-Id: Ie00f5fa2d38a79e387be9ef567bf49282852c2ad