StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
79,053 Commits 1 Branch 0 Tags
335a11d79ce2ec8e45d60d7ec7ad6a4f26979cc2
Commit Graph

79053 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Julien Desprez
335a11d79c Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618 am: ef94a26990 am: 28893e555e am: b3e982fc10 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150

Change-Id: I2ccf5c714ce18825d79a80f85d99d10fd4469a3d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 02:14:07 +00:00
Julien Desprez
63c3099dc8 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 am: 50d29f770b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: Ia8228324a2ef9ad69aaefc6352e22113dd24ce58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 02:13:57 +00:00
Julien Desprez
b3e982fc10 Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618 am: ef94a26990 am: 28893e555e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150

Change-Id: I48f51283793c87fb2a2dd2f1aa760fca9be83d39
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 01:33:53 +00:00
Julien Desprez
50d29f770b Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 am: cd608825a3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I660d33b843ad09e5bf51ee326e6dd2250f782148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 01:33:44 +00:00
Julien Desprez
28893e555e Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618 am: ef94a26990 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150

Change-Id: If69d8abad0afb1a0da969447dd82ea1b7ae8b7b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 00:59:05 +00:00
Julien Desprez
cd608825a3 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev am: 48c10589c6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754151

Change-Id: I7082e28688912f848f0be54fbd445319029d80fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 00:58:49 +00:00
Julien Desprez
ef94a26990 Merge "Remove tradefed-no-fwk from suites" into sc-dev am: df75dca618 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150

Change-Id: I2b8124ebb03c67542241240aa196743d0eb06d3f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-22 00:55:52 +00:00
Julien Desprez
48c10589c6 Merge changes from topic "presubmit-am-47a13f40ada54c9497aaa1d5e38a931a" into sc-qpr1-dev 
* changes:
  [automerge] Remove tradefed-no-fwk from suites 2p: ca46df5783
  Remove tradefed-no-fwk from suites
 2023-03-22 00:32:22 +00:00
Julien Desprez
df75dca618 Merge "Remove tradefed-no-fwk from suites" into sc-dev 2023-03-22 00:32:22 +00:00
Steve Berbary
b77d990efa [automerger skipped] Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 am: 07c703d53d am: 2c4dad8ca3 -s ours am: f60d4fdf67 -s ours am: 4c14c3f28d -s ours 
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 2130534b73 is already in history

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

Change-Id: I01a359a0cbd8f5e2e35f3f45c60010a8bcd6ca52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 20:23:42 +00:00
Steve Berbary
4c14c3f28d [automerger skipped] Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 am: 07c703d53d am: 2c4dad8ca3 -s ours am: f60d4fdf67 -s ours 
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 2130534b73 is already in history

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

Change-Id: I0d7ce6bc3900bdaeedef719e4f14ff8e2e3b0262
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 19:42:19 +00:00
Steve Berbary
f60d4fdf67 [automerger skipped] Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 am: 07c703d53d am: 2c4dad8ca3 -s ours 
am skip reason: Merged-In Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9 with SHA-1 2130534b73 is already in history

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

Change-Id: Ifffb57e6dcab29f0c18dd9d82254dd0938774e08
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 19:05:09 +00:00
Steve Berbary
2c4dad8ca3 Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 am: 07c703d53d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: I3094f5ac3fdabb17f8083a4fff9addb4f043ba11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 18:23:46 +00:00
Steve Berbary
07c703d53d Update Security String to 2023-05-01 am: 6a3344db86 am: eaaa30b619 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: Ia798666364797ccfdf9eb95ff70a6bd8c8e7f972
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 17:44:19 +00:00
Steve Berbary
eaaa30b619 Update Security String to 2023-05-01 am: 6a3344db86 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21959029

Change-Id: I1f32dc8fc18928417073ec419dd968841f2412d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 17:09:15 +00:00
Steve Berbary
877ca9f537 Update Security String to 2023-05-01 am: 2130534b73 am: 24272b1f7e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115

Change-Id: I9a6f1a6d9be4978dd534f4e409fa864d4b68b48a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 04:30:17 +00:00
Steve Berbary
24272b1f7e Update Security String to 2023-05-01 am: 2130534b73 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21960115

Change-Id: If0001148ac378f7433dc325320d20e4456c056c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-03-14 03:50:29 +00:00
Steve Berbary
6a3344db86 Update Security String to 2023-05-01 
Bug: 272844037

Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
Merged-In: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
 2023-03-11 02:52:03 +00:00
Steve Berbary
2130534b73 Update Security String to 2023-05-01 
Bug: 272844037

Change-Id: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
Merged-In: Ie855a8ad67670fbe18f509e1ae5a348889f5bcb9
 2023-03-11 02:50:50 +00:00
Presubmit Automerger Backend
fddbfae052 [automerge] Remove tradefed-no-fwk from suites 2p: ca46df5783 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20754150
Ignore-AOSP-First: Cherry pick
Bug: 262597958
Change-Id: I60b254a6fcfff396b88c80c58a17037817bb5bb7
 2023-03-09 23:13:53 +00:00
Julien Desprez
ca46df5783 Remove tradefed-no-fwk from suites 
Test: presubmit
Ignore-AOSP-First: Cherry pick
Bug: 262597958
Change-Id: I672533c475362f4438b5aefc108749be4cfc97df
(cherry picked from commit 917acd67c7)
 2023-03-08 18:32:09 +00:00
Steve Berbary
4fa3bcc635 [automerger skipped] Update Security String to 2023-04-01 am: 641c8e9c6b am: ac6cd2c238 am: af858ede19 am: 0f43799a5a -s ours am: 80621a1664 -s ours am: c587339106 -s ours 
am skip reason: Merged-In I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075 with SHA-1 baf6b726c4 is already in history

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

Change-Id: I527ca473af0a8a4aa9c4b515758b9a41e29aefaa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-11 05:43:37 +00:00
Steve Berbary
c587339106 [automerger skipped] Update Security String to 2023-04-01 am: 641c8e9c6b am: ac6cd2c238 am: af858ede19 am: 0f43799a5a -s ours am: 80621a1664 -s ours 
am skip reason: Merged-In I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075 with SHA-1 baf6b726c4 is already in history

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

Change-Id: I399c3f750e43bf9bdd9a0725cb79a8d7b99459a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-11 04:34:02 +00:00
Steve Berbary
80621a1664 [automerger skipped] Update Security String to 2023-04-01 am: 641c8e9c6b am: ac6cd2c238 am: af858ede19 am: 0f43799a5a -s ours 
am skip reason: Merged-In I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075 with SHA-1 baf6b726c4 is already in history

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

Change-Id: I5e8f4ef73feb47d5faa0408ac275ae2ac548ede0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-11 03:44:36 +00:00
TreeHugger Robot
73214a06a4 Merge "Support SHA minSdkVersion in APK in APEX" into tm-dev am: 240c63fba3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21337794

Change-Id: I3945028027cf284fc22b1c24bce02cbd8d06665d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-11 02:59:23 +00:00
TreeHugger Robot
240c63fba3 Merge "Support SHA minSdkVersion in APK in APEX" into tm-dev 2023-02-11 02:21:48 +00:00
Steve Berbary
0f43799a5a Update Security String to 2023-04-01 am: 641c8e9c6b am: ac6cd2c238 am: af858ede19 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21359394

Change-Id: Idee22c817ab2e2e047ce765e5a06a63cf290c811
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-11 01:57:50 +00:00
Steve Berbary
af858ede19 Update Security String to 2023-04-01 am: 641c8e9c6b am: ac6cd2c238 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21359394

Change-Id: I86a0cbbb0d37c3170cab80ff9e12fcee345f1ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-11 00:00:19 +00:00
Steve Berbary
9220c7a744 Update Security String to 2023-04-01 am: baf6b726c4 am: 2b6ea18ce1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21359393

Change-Id: I0ef159ba430f7f91b97019abd25319c6cdf30a28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-10 23:21:16 +00:00
Steve Berbary
ac6cd2c238 Update Security String to 2023-04-01 am: 641c8e9c6b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21359394

Change-Id: Iaafdec728f0c42bea952f400f873d1987dd52561
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-02-10 23:05:44 +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
641c8e9c6b Update Security String to 2023-04-01 
Bug: 268558932

Change-Id: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
Merged-In: I5e3d5a90a927f9f4ddd6708c3bbadc89c8821075
 2023-02-10 03:26:16 +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
1718fef0b9 Merge "Include JDK with STS SDK like the other *TS suites." into sc-dev am: f318e46c60 am: f535a00c39 am: a5fa887289 am: 57e2bd728a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/20950851

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

Change-Id: I2e3b230bd9933ce98c289711d4125884aed70161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-20 11:16:54 +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
f318e46c60 Merge "Include JDK with STS SDK like the other *TS suites." into sc-dev 2023-01-20 08:44:30 +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
Bassem Khalife
639511b495 [automerge] Add owners for version_defaults.mk 2p: 34ec5ba13e am: dfcbebca82 am: a60de98947 am: 7097a23780 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/21040380

Change-Id: I6146ceae61559787362d48778ec28bc3f4fce7a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-01-19 07:20:11 +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