aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-03-06Merge Android 14 QPR2 to AOSP mainHEADmastermainXin Li
Bug: 319669529 Merged-In: Ib2f81cd63a741a25c67a6114fefbf4a47a968a91 Change-Id: Ie8964fcbe4f39e1b2db1a4766edf100852fecbaa
2024-01-17Merge Android 24Q1 Release (ab/11220357)temp_319669529Xin Li
Bug: 319669529 Merged-In: I5cb455d7ed18f13bd7a5885bd57aa29ec20fee2c Change-Id: Ib2f81cd63a741a25c67a6114fefbf4a47a968a91
2023-11-23[automerger skipped] Set defaults to align native libraries to 16k am: ↵Michael Groover
8b0c79d9ab am: 48cafd494f -s ours am: a8068a2a31 -s ours am skip reason: Merged-In I5cb455d7ed18f13bd7a5885bd57aa29ec20fee2c with SHA-1 8b0c79d9ab is already in history Original change: https://android-review.googlesource.com/c/platform/tools/apksig/+/2844353 Change-Id: Ie0a6ce1f39012273356235d6439fdd07427c5fa6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-23[automerger skipped] Set defaults to align native libraries to 16k am: ↵Michael Groover
8b0c79d9ab am: 24e3075e68 am: 02aa49ee9a -s ours am skip reason: Merged-In I5cb455d7ed18f13bd7a5885bd57aa29ec20fee2c with SHA-1 f1682abcc0 is already in history Original change: https://android-review.googlesource.com/c/platform/tools/apksig/+/2844353 Change-Id: Iae804dfbec2be2c42640c4463dccc5fb342e9ec9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-23[automerger skipped] Set defaults to align native libraries to 16k am: ↵Michael Groover
8b0c79d9ab am: 48cafd494f -s ours am skip reason: Merged-In I5cb455d7ed18f13bd7a5885bd57aa29ec20fee2c with SHA-1 8b0c79d9ab is already in history Original change: https://android-review.googlesource.com/c/platform/tools/apksig/+/2844353 Change-Id: I0abef9d8d42d3471fb90ec48c9c4a373b593fa69 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-23Set defaults to align native libraries to 16k am: 8b0c79d9ab am: 24e3075e68Michael Groover
Original change: https://android-review.googlesource.com/c/platform/tools/apksig/+/2844353 Change-Id: Id03b5684fdde12ed546a9a662658f9aef7ba763d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-23Set defaults to align native libraries to 16k am: 8b0c79d9abMichael Groover
Original change: https://android-review.googlesource.com/c/platform/tools/apksig/+/2844353 Change-Id: I6ab77d12d1943b990d47fd9d76f5b4fc5ccda51f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-23Set defaults to align native libraries to 16k am: 8b0c79d9abMichael Groover
Original change: https://android-review.googlesource.com/c/platform/tools/apksig/+/2844353 Change-Id: Idfe2a290d61cdbc24cbe87875c80ad34502fef4c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-11-22Set defaults to align native libraries to 16kMichael Groover
To support page agnostic targets, this commit changes the behavior of the apksig library and apksigner command to not preserve existing alignment for files within an APK, but instead native library files will be aligned on a 16k boundary and all other uncompressed files will use 4 bytes. APIs and command line options are provided to maintain the previous behavior by allowing the caller to specify whether native library alignment should be preserved and if not, the number of bytes to be used to page align these native library files. Bug: 299474707 Test: gradlew test (cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f1682abcc0752e3231fc65f727f94b4f821e2d05) Merged-In: I5cb455d7ed18f13bd7a5885bd57aa29ec20fee2c Change-Id: I5cb455d7ed18f13bd7a5885bd57aa29ec20fee2c
2023-11-16Merge "Set defaults to align native libraries to 16k" into mainMichael Groover
2023-11-09Set defaults to align native libraries to 16kMichael Groover
To support page agnostic targets, this commit changes the behavior of the apksig library and apksigner command to not preserve existing alignment for files within an APK, but instead native library files will be aligned on a 16k boundary and all other uncompressed files will use 4 bytes. APIs and command line options are provided to maintain the previous behavior by allowing the caller to specify whether native library alignment should be preserved and if not, the number of bytes to be used to page align these native library files. Bug: 299474707 Test: gradlew test Change-Id: I5cb455d7ed18f13bd7a5885bd57aa29ec20fee2c
2023-10-07Merge Android 14 am: acf0e6e4e1 am: 718aa93a27 am: ca565dd496 am: 8d23f6cf56 ↵Xin Li
am: a7287952fe Original change: https://android-review.googlesource.com/c/platform/tools/apksig/+/2776593 Change-Id: Ibf1feb20c02a7ac8187988ccc099b2de0f63fd40 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06Merge Android 14 am: acf0e6e4e1 am: 718aa93a27 am: ca565dd496 am: 8d23f6cf56Xin Li
Original change: https://android-review.googlesource.com/c/platform/tools/apksig/+/2776593 Change-Id: Ieec65613a3637f9f65e548f485044a09457070ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06Merge Android 14 am: acf0e6e4e1 am: 718aa93a27 am: ca565dd496Xin Li
Original change: https://android-review.googlesource.com/c/platform/tools/apksig/+/2776593 Change-Id: Id7cf4c1a04569e5975768a06a1e9c96051c0bb72 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06Merge Android 14 am: acf0e6e4e1 am: 718aa93a27Xin Li
Original change: https://android-review.googlesource.com/c/platform/tools/apksig/+/2776593 Change-Id: Iccd7f40db4f11ca38374ab77d74c7c0799ff0f3f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-06Merge Android 14 am: acf0e6e4e1Xin Li
Original change: https://android-review.googlesource.com/c/platform/tools/apksig/+/2776593 Change-Id: Idda90230140808bd4bdb8a1aa464ac72e7f4d752 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-05Merge Android 14Xin Li
Bug: 298295554 Merged-In: I77f4218599511ff4f9f3790e4942a329d5a18da4 Change-Id: I50dd82e55a627635b96fae0aba8caee39ee0a8dc
2023-09-18Add support for multiple error responses during verificationMichael Groover
Java 21 changes the behavior of certain error cases during APK signature verification. One of the existing verification tests previously failed with an Exception due to an unexpected length, but as of Java 21, the verification of this signature reports failure without an exception. This commit updates the signature verification test to support multiple expected errors to ensure these tests can run successfully on all supported versions of Java. Bug: 300311482 Test: gradlew test Change-Id: I6e6d9620caa6e0bb0e24a27154cde8c47a1ff7f5
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 8112df60ad -s ours ↵Xin Li
am: 0fa8ac889e -s ours am: e8894ce4d8 -s ours am: 2d12c1b042 -s ours am skip reason: Merged-In I2c1e0cfe06387de812d3c7f86a4ad47323ec9972 with SHA-1 9dda3541de is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/24183007 Change-Id: I5e0fa78645438738aa174ae5925c6663806056b2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 8112df60ad -s ours ↵Xin Li
am: 0fa8ac889e -s ours am: e8894ce4d8 -s ours am skip reason: Merged-In I2c1e0cfe06387de812d3c7f86a4ad47323ec9972 with SHA-1 9dda3541de is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/24183007 Change-Id: I24cc597d7e21f38a9f10ff8c57f86f71aa425987 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-29[automerger skipped] Merge Android U (ab/10368041) am: 8112df60ad -s ours ↵Xin Li
am: 0fa8ac889e -s ours am skip reason: Merged-In I2c1e0cfe06387de812d3c7f86a4ad47323ec9972 with SHA-1 9dda3541de is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/24183007 Change-Id: Ie9685e87d23136bc561e27ace168c950c6d437f8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-28[automerger skipped] Merge Android U (ab/10368041) am: 8112df60ad -s oursXin Li
am skip reason: Merged-In I2c1e0cfe06387de812d3c7f86a4ad47323ec9972 with SHA-1 9dda3541de is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/24183007 Change-Id: I902999b44eeb33f5475bae63b0ab3facd421a3a6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14Merge Android U (ab/10368041)tmp_amf_298295554Xin Li
Bug: 291102124 Merged-In: I2c1e0cfe06387de812d3c7f86a4ad47323ec9972 Change-Id: Ib0a0d1b4dd61ad5d589f73a8cc9769578d4224e5
2023-07-11Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: 1f1ca91be0 am: 2cf540e494 am: d0dbdf6ed8 am: 7152e87958 am: c84a840fa0 am: 784ae4acfe Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I224f7884e8948f84341aecda05491db5c235201d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: c7942c875e am: d8ad3823dc am: a5d9cff0b9 am: 4b14026540 am: 771cb93862 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I3716b963e78180cff8b8f955b63e503c918d5eda Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: 1f1ca91be0 am: 2cf540e494 am: 4fe4b61126 am: eab1c30f2d am: fb5820cb92 am: 162369de84 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I692d229f0d100caeb978c4ed5305020b59e3ec9e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: 1f1ca91be0 am: 2cf540e494 am: d0dbdf6ed8 am: 3aca9b93c4 am: 4f321bb251 am: df5b4fcb5c Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I22339ca829bb2ad32c470724189a6d6538486d2c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: c7942c875e am: d8ad3823dc am: a2244349a4 am: 6318e117e5 am: 829e6ad318 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I51fc9cc2526a3adfec4815e129495d44e463e6dc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: 1f1ca91be0 am: 2cf540e494 am: d0dbdf6ed8 am: 7152e87958 am: 41d24d45b7 am: d512101981 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I4534cc0a983931d70091db21f9858dd5bd3f62d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: c7942c875e am: d8ad3823dc am: a5d9cff0b9 am: 0cd06c08c1 am: 0a94715093 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: Ibeef65b9bf77ed528ddc2398e625467bda803a99 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: 1f1ca91be0 am: 2cf540e494 am: d0dbdf6ed8 am: 7152e87958 am: c84a840fa0 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: Ib9d444afd7819cb2af466a8a336dee4b2c6beb79 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: c7942c875e am: d8ad3823dc am: a5d9cff0b9 am: 4b14026540 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: Ic44e27313b1374a865f0659ccecd8f078a19120f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: 1f1ca91be0 am: 2cf540e494 am: 4fe4b61126 am: eab1c30f2d am: fb5820cb92 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I873a4c94f2e98636efc5975ff33dc723b3fdc405 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: 1f1ca91be0 am: 2cf540e494 am: d0dbdf6ed8 am: 3aca9b93c4 am: 4f321bb251 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I84bd2da9cfca7a96711fa5b78373e5f1ef16f813 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: c7942c875e am: d8ad3823dc am: a2244349a4 am: 6318e117e5 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I3aa045f7f06b0019ef294a1bc7345bdb30bef7ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: 1f1ca91be0 am: 2cf540e494 am: d0dbdf6ed8 am: 7152e87958 am: 41d24d45b7 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I57e99457884660dd6e5b460516fc3d22159ad82d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: c7942c875e am: d8ad3823dc am: a5d9cff0b9 am: 0cd06c08c1 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I77590b0f68d926d5c53e0307fd7603c0b3110c52 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: 1f1ca91be0 am: 2cf540e494 am: 4fe4b61126 am: eab1c30f2d Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I61c76d7c6f34e7bbe732f97db4b5f79ecc76791b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: 1f1ca91be0 am: 2cf540e494 am: d0dbdf6ed8 am: 3aca9b93c4 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: Id38d96228c1df60f5b724a7fabaadcda5252a39b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: 1f1ca91be0 am: 2cf540e494 am: 4fe4b61126 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I5f255b5d5ac30820531e88b4c758812659bca3c3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: 1f1ca91be0 am: 2cf540e494 am: d0dbdf6ed8 am: d962a07e7d Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: Id429fc3e272e7bccef940e1efca84f030525b9e9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: 1f1ca91be0 am: 2cf540e494 am: d0dbdf6ed8 am: 7152e87958 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I8429d9b285bf3350e2c195d9d9690b1645381514 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: c7942c875e am: d8ad3823dc am: cbbfea23a4 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: Ibfcba13425886adb96406527db21fbf983999c17 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: c7942c875e am: d8ad3823dc am: a5d9cff0b9 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: Ibf06fb11986c73adb72b068c11e0a98528674968 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: c7942c875e am: d8ad3823dc am: a2244349a4 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I8706d1173ab74e5f5709671dcf87c89cba3d512a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: 1f1ca91be0 am: 2cf540e494 am: d0dbdf6ed8 am: 7152e87958 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I5990e503a20cfe39f34aa5bf552c1e158dba6bb4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: c7942c875e am: d8ad3823dc am: a5d9cff0b9 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I2b2a2e426a676eb47371680b576329761f40f6b8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: 1f1ca91be0 am: 2cf540e494 am: d0dbdf6ed8 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I9159d3043c919a89c35eeb00d8c00a806ebe0236 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: 1f1ca91be0 am: 2cf540e494 Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: Iffbe8c6c08e2238a076931a26306fbf94075ddfc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10Add errors from signature verify result to returned result am: 0b086bdc13 ↵Michael Groover
am: c7942c875e am: d8ad3823dc Original change: https://googleplex-android-review.googlesource.com/c/platform/tools/apksig/+/23750798 Change-Id: I181122fb9cb8daabaea06f5b180c1071e8c3893f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 05:15:25 +0000