StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
78,875 Commits 1 Branch 0 Tags
240c63fba3d5f34b37cfea5b1a29a5ee466985c8
Commit Graph

78875 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
240c63fba3 Merge "Support SHA minSdkVersion in APK in APEX" into tm-dev 2023-02-11 02:21:48 +00:00
Steve Berbary
2b6ea18ce1 Update Security String to 2023-04-01 am: baf6b726c4 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21359393

Change-Id: Ia04dec818eced8ef204641ac224f2677c5ce67f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-10 22:12:01 +00:00
Steve Berbary
baf6b726c4 Update Security String to 2023-04-01 
Bug: 268558932

Change-Id: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
 2023-02-10 03:23:58 +00:00
Paul Duffin
a03f1265fb Support SHA minSdkVersion in APK in APEX 
Bug: 266903788
Test: rm -fr out/dist
      UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true UNBUNDLED_BUILD_TARGET_SDK_WITH_API_FINGERPRINT=true TARGET_BUILD_APPS="com.google.android.rkpd" vendor/google/build/mainline_modules_bundles.sh
      # Without this change it fails, with this change it passes at
      # which point run the following.
      mkdir contents
      cd contents
      unzip ../out/dist/dev_keys_signed/com.google.android.rkpd/com.google.android.rkpd.apks
      deapexer extract standalones/standalone-x86.apex apex-contents
      aapt2 dump badging apex-contents/priv-app/rkpdapp.google@*/rkpdapp.google.apk  | grep Version
      # The sdkVersion and targetSdkVersion should both be set to SHA
      # versions.
Change-Id: I9ca54affd30f0a6cf561f1274b991d39e7cf1bce
(cherry picked from commit 730d0c437a)
Merged-In: I9ca54affd30f0a6cf561f1274b991d39e7cf1bce
 2023-02-08 17:28:29 +00:00
Duy Truong
57e2bd728a Merge "Include JDK with STS SDK like the other *TS suites." into sc-dev am: f318e46c60 am: f535a00c39 am: a5fa887289 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

Change-Id: Ica02d61707b51aa3163c8f6291715b56e29d825e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-20 10:09:13 +00:00
Duy Truong
fc6aa53d53 Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e210 am: e82eda2562 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

Change-Id: I7aff25a009ee1804cc3aafe4d783937a5d12d6d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-20 10:09:01 +00:00
Duy Truong
a5fa887289 Merge "Include JDK with STS SDK like the other *TS suites." into sc-dev am: f318e46c60 am: f535a00c39 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

Change-Id: I35b162b5120202b6d84f95c5d29889fe49858a4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-20 09:39:15 +00:00
Duy Truong
e82eda2562 Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev am: dff3b7e210 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

Change-Id: Ie0baf4e2e4808b0f44225d5f4467558169127e98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-20 09:39:06 +00:00
Duy Truong
f535a00c39 Merge "Include JDK with STS SDK like the other *TS suites." into sc-dev am: f318e46c60 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

Change-Id: I003a446eb35ca0180ecdd0df6155caf600c3da9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-20 09:38:58 +00:00
Duy Truong
dff3b7e210 Merge changes from topic "presubmit-am-f711d019bdbd4e43ab4f32ee30dc96be" into sc-qpr1-dev 
* changes:
  [automerge] Include JDK with STS SDK like the other *TS suites. 2p: 3c1caa29b8
  Include JDK with STS SDK like the other *TS suites.
 2023-01-20 08:44:30 +00:00
Duy Truong
f318e46c60 Merge "Include JDK with STS SDK like the other *TS suites." into sc-dev 2023-01-20 08:44:30 +00:00
Bassem Khalife
7097a23780 [automerge] Add owners for version_defaults.mk 2p: 34ec5ba13e am: dfcbebca82 am: a60de98947 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21040380

Change-Id: I2597b801ac1137169580ae31364ef9d924bcf65c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-19 06:42:36 +00:00
Bassem Khalife
a60de98947 [automerge] Add owners for version_defaults.mk 2p: 34ec5ba13e am: dfcbebca82 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21040380

Change-Id: I118f8274d226fa39f6f36fbc85d84fca37d85869
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-19 06:11:57 +00:00
Bassem Khalife
dfcbebca82 [automerge] Add owners for version_defaults.mk 2p: 34ec5ba13e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21040380

Bug: 219813826
Change-Id: I210799217a0c686ab985f18e3b65f300c5eed438
Merged-In: I038e0c7aea6d1aefe5b847978838952fa653d11b
 2023-01-19 03:53:48 +00:00
Bassem Khalife
34ec5ba13e Add owners for version_defaults.mk 
Adding members of the RelPgM team to fast track monthly Security SPL update approval

Bug: 219813826
Change-Id: I038e0c7aea6d1aefe5b847978838952fa653d11b
(cherry picked from commit 5dc6b582be)
Merged-In: I038e0c7aea6d1aefe5b847978838952fa653d11b
 2023-01-19 03:53:34 +00:00
Presubmit Automerger Backend
6ee3acaf90 [automerge] Include JDK with STS SDK like the other *TS suites. 2p: 3c1caa29b8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

Bug: 238373261
Change-Id: Id6c008dadec007999d0e7a58f5d5d52f95749a45
 2023-01-18 23:02:39 +00:00
Duy Truong
3c1caa29b8 Include JDK with STS SDK like the other *TS suites. 
Bug: 238373261
Test: Build and run STS SDK sample
Change-Id: I7378a555393e4194917083197829201320e595b4
 2023-01-18 23:02:31 +00:00
Steve Berbary
44729d2137 [automerger skipped] Update Security String to 2023-03-01 am: 663e449fbf am: 033863be25 am: c5f2b7f189 am: 70228fd7d9 -s ours am: 023ae39968 -s ours 
am skip reason: Merged-In Ie75a94addbd7fec66397f89baf6e3c18487c72fb with SHA-1 4904a80247 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984665

Change-Id: I470d9b633e4c57f5a15c13de8062200052f18950
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-14 20:08:56 +00:00
Steve Berbary
023ae39968 [automerger skipped] Update Security String to 2023-03-01 am: 663e449fbf am: 033863be25 am: c5f2b7f189 am: 70228fd7d9 -s ours 
am skip reason: Merged-In Ie75a94addbd7fec66397f89baf6e3c18487c72fb with SHA-1 4904a80247 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984665

Change-Id: I42d06ad8fa481da6b3f6a1873cb6f3c5403f0cff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-14 19:36:57 +00:00
Steve Berbary
70228fd7d9 Update Security String to 2023-03-01 am: 663e449fbf am: 033863be25 am: c5f2b7f189 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984665

Change-Id: Idfc5ebb5c6ee90b6fe8c81d1d183e1c17b918ab1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-14 18:55:40 +00:00
Steve Berbary
c5f2b7f189 Update Security String to 2023-03-01 am: 663e449fbf am: 033863be25 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984665

Change-Id: I6d8deaaab9592f853e014210e16f8a09f5b673f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-14 18:21:20 +00:00
Steve Berbary
033863be25 Update Security String to 2023-03-01 am: 663e449fbf 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984665

Change-Id: Ic2de423da2f3efd97d10563a288c2167b270b906
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-14 17:45:06 +00:00
Steve Berbary
3c38b0556d Update Security String to 2023-03-01 am: 4904a80247 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20984651

Change-Id: I2461f2a4f302a397f9c3bc5497b60e6442c67c6c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-14 16:54:24 +00:00
Steve Berbary
663e449fbf Update Security String to 2023-03-01 
Bug: 265319238

Change-Id: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
Merged-In: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
 2023-01-13 18:22:30 +00:00
Steve Berbary
4904a80247 Update Security String to 2023-03-01 
Bug: 265319238

Change-Id: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
Merged-In: Ie75a94addbd7fec66397f89baf6e3c18487c72fb
 2023-01-13 18:20:17 +00:00
Kelvin Zhang
b7aae67a23 [automerger skipped] Fix VB 1.0 failure due to openssl output format change am: a7e7e0bbf5 am: dbab538973 am: 96c6d382fa am: 183fb0df0e am: 4bd03eda16 -s ours 
am skip reason: Merged-In Iea5b6fffed7c27855d87e35292f07a56686e4197 with SHA-1 9f0379bd60 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20931268

Change-Id: Ibbfbb4bef8452d94e09bc5524d554a99d3be3093
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 04:34:00 +00:00
Kelvin Zhang
4bd03eda16 Fix VB 1.0 failure due to openssl output format change am: a7e7e0bbf5 am: dbab538973 am: 96c6d382fa am: 183fb0df0e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20931268

Change-Id: Icf2c64b5d8a233639f70e64680b4e775de123fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 04:02:37 +00:00
Kelvin Zhang
183fb0df0e Fix VB 1.0 failure due to openssl output format change am: a7e7e0bbf5 am: dbab538973 am: 96c6d382fa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20931268

Change-Id: I5f1c46bd7949131c6eda48ec75a2cf8b1cb3ef56
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 03:22:14 +00:00
Kelvin Zhang
96c6d382fa Fix VB 1.0 failure due to openssl output format change am: a7e7e0bbf5 am: dbab538973 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20931268

Change-Id: I3d7757afff5bd23b2f4b075505b0b7bb292eacf6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 02:45:05 +00:00
Kelvin Zhang
dbab538973 Fix VB 1.0 failure due to openssl output format change am: a7e7e0bbf5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20931268

Change-Id: I3245bc7f6f23334f5efeeef2fcedd106919747b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-11 01:51:19 +00:00
Kelvin Zhang
a7e7e0bbf5 Fix VB 1.0 failure due to openssl output format change 
Openssl changed output format, the 'keyid:' prefix is removed, hence old
regex is unable to extract key id.

Bug: 262902909
Change-Id: Iea5b6fffed7c27855d87e35292f07a56686e4197
Merged-In: Iea5b6fffed7c27855d87e35292f07a56686e4197
Merged-In: I446a0b16e482c43542a1c0e41b24e80eb9fbc8e6
(cherry picked from commit b7d70a2cb1)
 2023-01-10 20:03:05 +00:00
Kelvin Zhang
9f0379bd60 Fix VB 1.0 failure due to openssl output format change 
Openssl changed output format, the 'keyid:' prefix is removed, hence old
regex is unable to extract key id.

Bug: 262902909
Change-Id: Iea5b6fffed7c27855d87e35292f07a56686e4197
Merged-In: I446a0b16e482c43542a1c0e41b24e80eb9fbc8e6
Merged-In: Iea5b6fffed7c27855d87e35292f07a56686e4197
(cherry picked from commit b7d70a2cb1)
 2023-01-05 12:02:13 +00:00
Steve Berbary
561c85919c [automerger skipped] Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147 am: 6b05071cb3 am: 23dae41cbc am: 4af84f8cf1 am: e5bd30dd33 -s ours am: 6a991a76ce -s ours 
am skip reason: Merged-In Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f with SHA-1 d0a709ffca is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: Ied5a3e5d9625be31c285cefb6a0039dafb44067e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-10 03:11:54 +00:00
Steve Berbary
6a991a76ce [automerger skipped] Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147 am: 6b05071cb3 am: 23dae41cbc am: 4af84f8cf1 am: e5bd30dd33 -s ours 
am skip reason: Merged-In Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f with SHA-1 d0a709ffca is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: I191008fd08d7a37a64aa8f76fef401e742755c9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-10 02:39:01 +00:00
Steve Berbary
e5bd30dd33 Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147 am: 6b05071cb3 am: 23dae41cbc am: 4af84f8cf1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: I106595aa928c539025299d229d193869eb77fbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-10 01:27:25 +00:00
Steve Berbary
4af84f8cf1 Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147 am: 6b05071cb3 am: 23dae41cbc 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: I980866984561c3daa4d31ffa91d743ccb6abae13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-10 00:11:02 +00:00
Steve Berbary
23dae41cbc Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147 am: 6b05071cb3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: I4fe31036b0ecebb5a6cfb8b4080e692e54e36068
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-09 22:58:04 +00:00
Steve Berbary
6b05071cb3 Update Security String to 2023-02-01 am: b601ce96db am: 445dfdc147 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: I7e967462a1110696405c7ebd69d2faf624b5ef7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-09 21:51:48 +00:00
Steve Berbary
445dfdc147 Update Security String to 2023-02-01 am: b601ce96db 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20665910

Change-Id: I524f6521a7aa06e1cb27b5217486ab3141d2978b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-09 20:41:42 +00:00
Steve Berbary
3b0b33502f Update Security String to 2023-02-01 am: d0a709ffca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20679823

Change-Id: I7037e652ebab3d41bae6dcfa780d2348884f1e09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-12-09 20:39:42 +00:00
Steve Berbary
d0a709ffca Update Security String to 2023-02-01 
Bug: 261738635

Change-Id: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
Merged-In: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
 2022-12-08 18:37:49 +00:00
Steve Berbary
b601ce96db Update Security String to 2023-02-01 
Bug: 261738635

Change-Id: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
Merged-In: Ifcca8fadc558099b223a39e8b2f98bcb8db40c6f
 2022-12-07 19:21:42 +00:00
Hongguang Chen
425f7d1cb3 Support chained init_boot partition signing 
Bug: 256048561
Bug: 256237041
Test: sign_target_files_apks -d certs --avb_init_boot_algorithm \
        SHA256_RSA4096 --avb_init_boot_key init_boot_rsa4096.pem \
	xxx.zip signed.zip (Check signed.zip/META/misc_info.txt)
Change-Id: I65fc7913089ae318d90df55a533d3e2ebd93b029
(cherry picked from commit 0d6b727e03)
Merged-In: I65fc7913089ae318d90df55a533d3e2ebd93b029
(cherry picked from commit acf1b3afe2)
 2022-11-15 22:30:54 +00:00
Steve Berbary
2acb9f7049 [automerger skipped] Update Security String to 2023-01-01 am: 31bb5f4be2 am: 404ee70ff1 am: a436638431 am: f1cdafb8f3 am: 6ed124904e am: 0d0b75bcf2 -s ours am: 149efcc09a -s ours 
am skip reason: Merged-In Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1 with SHA-1 26c214ebb8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265

Change-Id: I1cfb6b99f09e11860ba8b2f11296b9c5673a726a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 22:20:57 +00:00
Steve Berbary
149efcc09a [automerger skipped] Update Security String to 2023-01-01 am: 31bb5f4be2 am: 404ee70ff1 am: a436638431 am: f1cdafb8f3 am: 6ed124904e am: 0d0b75bcf2 -s ours 
am skip reason: Merged-In Ib180e17a864c5fea9801c43db7bbafc27dd1c5d1 with SHA-1 26c214ebb8 is already in history

Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265

Change-Id: Iece135709b1ebef6311749ed0d4b986cdf72e0bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 21:40:31 +00:00
Steve Berbary
0d0b75bcf2 Update Security String to 2023-01-01 am: 31bb5f4be2 am: 404ee70ff1 am: a436638431 am: f1cdafb8f3 am: 6ed124904e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265

Change-Id: Ib0e3df96717b5079645139ef7ab5e816cc6a3a39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 21:07:51 +00:00
Steve Berbary
6ed124904e Update Security String to 2023-01-01 am: 31bb5f4be2 am: 404ee70ff1 am: a436638431 am: f1cdafb8f3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265

Change-Id: I2a952f5842e16551e171eabf2f51082805e7383b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 20:37:22 +00:00
Steve Berbary
f1cdafb8f3 Update Security String to 2023-01-01 am: 31bb5f4be2 am: 404ee70ff1 am: a436638431 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265

Change-Id: Id358b18b9f7324af0e5a434f9f8f304e1ac09da4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 20:04:56 +00:00
Steve Berbary
a436638431 Update Security String to 2023-01-01 am: 31bb5f4be2 am: 404ee70ff1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265

Change-Id: Ib124bfdfa12cf7a84d20828271443f64cf339e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 19:35:17 +00:00
Steve Berbary
404ee70ff1 Update Security String to 2023-01-01 am: 31bb5f4be2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20453265

Change-Id: Id370b73b62a02712ebecddc0c64f84010b877831
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2022-11-14 19:07:53 +00:00