StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
91,771 Commits 1 Branch 0 Tags
4cb15ae345c05a0862a6c0cb6ae7a669f6dc6b64
Commit Graph

91771 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Treehugger Robot
e3c42a48ee Merge "Convert gsi_skip_mount.cfg to soong" into main am: 551570a073 am: b93e3b021e am: 11b0e7a152 am: 3292fc24df 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768739

Change-Id: I6ed60bf4467d02851efcd48e09c8dc5dcd062ce9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 05:24:08 +00:00
Treehugger Robot
3292fc24df Merge "Convert gsi_skip_mount.cfg to soong" into main am: 551570a073 am: b93e3b021e am: 11b0e7a152 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768739

Change-Id: I39c8baa7870da68a5850fc437e6b495c750b6e0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:52:02 +00:00
Treehugger Robot
11b0e7a152 Merge "Convert gsi_skip_mount.cfg to soong" into main am: 551570a073 am: b93e3b021e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768739

Change-Id: I4921fc52dffaa7b333e334d929b3c6487d887cbf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 04:16:31 +00:00
Treehugger Robot
b93e3b021e Merge "Convert gsi_skip_mount.cfg to soong" into main am: 551570a073 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768739

Change-Id: I306f5cc077588f0036726a3c5da9ce5acaeffacd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-03 03:44:40 +00:00
Treehugger Robot
551570a073 Merge "Convert gsi_skip_mount.cfg to soong" into main 2023-10-03 03:06:44 +00:00
Dennis Song
6e5e44df72 Minor refactor tools/releasetools/common.py 
- Sort the import modules in alphabetical order.
- Define module variables for avbtool arguments name.

Test: atest releasetools_test
Bug: 300604688
Change-Id: I7990b94cfc1d7b3e977ceb0a3dc2317689891229
 2023-10-03 02:46:51 +00:00
Jihoon Kang
00328e40be Revert^2 "Add soong config variable Release_expose_flagged_api" 
This reverts commit 453d74ba48.

Change-Id: Ic5cc83ebe396ccf05b51b8306b79a61dbb689807
 2023-10-03 01:02:07 +00:00
Cole Faust
36e089a6cc Convert gsi_skip_mount.cfg to soong 
The LOCAL_POST_INSTALL_CMD is problematic for m installclean-less
builds.

Bug: 205632228
Test: presubmits
Change-Id: Id4eb2fd5fbd4f080aec89fa90583ac2ec97c5e1c
 2023-10-02 17:28:59 -07:00
Zhi Dou
b095acbc57 aconfig: change Map.of to Map.ofEntries in FakeFeatureFlagsImp 
Map.of can only take 10 entries. Map.ofEntries uses variable arguments.

Bug: 303045451
Test: atest AconfigJavaHostTest
Change-Id: I26a3fa0b8a731f9203934d4a800a5c695cfc730f
 2023-10-02 23:57:10 +00:00
Kousik Kumar
88094882cc Merge "Copy reclient binaries into the out directory itself" into main am: 0d9b3a99ef am: ff198d2787 am: 0dbcad3be5 am: ffc3fb008b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2766225

Change-Id: I93784275d285e9d6e2cd635d0b8396060ab35e7d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-01 06:23:23 +00:00
Kousik Kumar
ffc3fb008b Merge "Copy reclient binaries into the out directory itself" into main am: 0d9b3a99ef am: ff198d2787 am: 0dbcad3be5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2766225

Change-Id: Iaba2fbb9c2ed8d9d4d76f55d5ebcabb3269a77a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-01 05:36:57 +00:00
Kousik Kumar
0dbcad3be5 Merge "Copy reclient binaries into the out directory itself" into main am: 0d9b3a99ef am: ff198d2787 
Original change: https://android-review.googlesource.com/c/platform/build/+/2766225

Change-Id: I65b827fab26310dc320070e3def63c0c8eca0148
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-01 04:31:51 +00:00
Kousik Kumar
ff198d2787 Merge "Copy reclient binaries into the out directory itself" into main am: 0d9b3a99ef 
Original change: https://android-review.googlesource.com/c/platform/build/+/2766225

Change-Id: I75e52169c7ebe0d67bd2054e03f4a964656d7e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-10-01 03:22:41 +00:00
Kousik Kumar
0d9b3a99ef Merge "Copy reclient binaries into the out directory itself" into main 2023-10-01 02:27:03 +00:00
Treehugger Robot
0da0f0a2ec Merge "Delete staging directory after creating module package zip" into main am: 517308b890 am: 5a5685a6a9 am: 4ed24d84ed am: 8191024e42 
Original change: https://android-review.googlesource.com/c/platform/build/+/2767637

Change-Id: I72181eda52f3fea5d3a55c3b6f83a223dd71040a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-30 04:58:37 +00:00
Treehugger Robot
8191024e42 Merge "Delete staging directory after creating module package zip" into main am: 517308b890 am: 5a5685a6a9 am: 4ed24d84ed 
Original change: https://android-review.googlesource.com/c/platform/build/+/2767637

Change-Id: I442e3a3bddefb0cc486e6eb1fdbab38ad0d19ae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-30 04:11:53 +00:00
Treehugger Robot
4ed24d84ed Merge "Delete staging directory after creating module package zip" into main am: 517308b890 am: 5a5685a6a9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2767637

Change-Id: I619efebd9c2181489b358d2036fee2dbef939021
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-30 03:09:48 +00:00
Treehugger Robot
5a5685a6a9 Merge "Delete staging directory after creating module package zip" into main am: 517308b890 
Original change: https://android-review.googlesource.com/c/platform/build/+/2767637

Change-Id: I560705e092b2ee8d0e0a5b5ed6786b9aa307dff8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-30 02:02:18 +00:00
Treehugger Robot
517308b890 Merge "Delete staging directory after creating module package zip" into main 2023-09-30 00:41:06 +00:00
Colin Cross
585967c08a Delete staging directory after creating module package zip 
The staging directory isn't used after the module packaging zip is
built.  Delete the staging directory to reduce disk usage without
affecting incremental build performance.

Bug: 302573555
Change-Id: I377c60714f78760d0b6c2588935c12e10a9ed224
Test: treehugger
 2023-09-30 00:37:38 +00:00
Cole Faust
62188e256c Merge "Revert^3 "Make the target_files zip reflect the recent partition change"" into main am: 985332eaca am: 1c1740fab4 am: 2dcd7616e6 am: 2971f1e5cb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768628

Change-Id: Ia57b852863485f90e5f5f49014409e180130eee2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 21:39:14 +00:00
Cole Faust
2971f1e5cb Merge "Revert^3 "Make the target_files zip reflect the recent partition change"" into main am: 985332eaca am: 1c1740fab4 am: 2dcd7616e6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768628

Change-Id: Ib78f31878efc6981eece8a056cdc97c4990d821b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 20:50:26 +00:00
Cole Faust
2dcd7616e6 Merge "Revert^3 "Make the target_files zip reflect the recent partition change"" into main am: 985332eaca am: 1c1740fab4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768628

Change-Id: I88c09eef0e9c19d5c98b3c5ad251efc384a57ffb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 19:48:48 +00:00
Cole Faust
1c1740fab4 Merge "Revert^3 "Make the target_files zip reflect the recent partition change"" into main am: 985332eaca 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768628

Change-Id: I739819707a9a5de49224ebd9bcf9b9d7bdc3a838
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 18:41:28 +00:00
Cole Faust
985332eaca Merge "Revert^3 "Make the target_files zip reflect the recent partition change"" into main 2023-09-29 18:09:39 +00:00
Mark White
0ced72aa62 Merge "Added new framework-pdf jar inside MediaProvider module" into main am: d577d60221 am: 23e70c67ad am: 032c4c62b8 am: 3f3f035f16 
Original change: https://android-review.googlesource.com/c/platform/build/+/2760467

Change-Id: Ic3c21b31de78ed719605a33ca048bce6e280827c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 16:23:17 +00:00
Mark White
3f3f035f16 Merge "Added new framework-pdf jar inside MediaProvider module" into main am: d577d60221 am: 23e70c67ad am: 032c4c62b8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2760467

Change-Id: Ied2a374bc213efcc5528e47814be4c4e04a3e8c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 15:35:03 +00:00
Mark White
032c4c62b8 Merge "Added new framework-pdf jar inside MediaProvider module" into main am: d577d60221 am: 23e70c67ad 
Original change: https://android-review.googlesource.com/c/platform/build/+/2760467

Change-Id: Ia3a0bacbe111cfa36221bff344cbefb03b146dff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 14:33:27 +00:00
Mark White
23e70c67ad Merge "Added new framework-pdf jar inside MediaProvider module" into main am: d577d60221 
Original change: https://android-review.googlesource.com/c/platform/build/+/2760467

Change-Id: I6c7e02dbe20d457e5f63a2304665bca400879f31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 13:26:48 +00:00
Mark White
d577d60221 Merge "Added new framework-pdf jar inside MediaProvider module" into main 2023-09-29 12:21:33 +00:00
Xin Li
6a1a98dc95 [automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: c04229bbea -s ours am: aadaa3b03d -s ours am: b755322c1a -s ours 
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: I4972934d53e17efee7a55a0be1a529ce1a26d575
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 09:05:01 +00:00
Xin Li
fc33c48870 [automerger skipped] Merge UP1A.231005.007 am: 5cca3caa48 -s ours am: 2afbcab49a -s ours am: 9eac088e7f -s ours 
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: I67fcd3b2ab52a36104bcf677c1fc6874ce8501e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 09:04:32 +00:00
Xin Li
b755322c1a [automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: c04229bbea -s ours am: aadaa3b03d -s ours 
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: If7c064fa3f6165635f8aa057073864fbca5ee269
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 08:16:59 +00:00
Xin Li
9eac088e7f [automerger skipped] Merge UP1A.231005.007 am: 5cca3caa48 -s ours am: 2afbcab49a -s ours 
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: Id3aadaa3376468763c74967c3d6f1fedaf80fe52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 08:16:29 +00:00
Xin Li
aadaa3b03d [automerger skipped] Merge "Merge UP1A.231005.007" into aosp-main-future am: c04229bbea -s ours 
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: I066ca38bc62a257af344cafadc6cee14651b01ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 07:16:02 +00:00
Xin Li
2afbcab49a [automerger skipped] Merge UP1A.231005.007 am: 5cca3caa48 -s ours 
am skip reason: Merged-In Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f with SHA-1 bb28383f49 is already in history

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

Change-Id: I7000c7a65d74a3798c4819062bcebeee54420a0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 07:15:39 +00:00
Xin Li
c04229bbea Merge "Merge UP1A.231005.007" into aosp-main-future 2023-09-29 06:40:54 +00:00
Cole Faust
bcd9963c8c Merge "Remove other partition's AVB properties" into main am: 06223362d7 am: dce3a9d66c am: c517d2faf7 am: ed40dfd144 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768106

Change-Id: I46b1ccfc70314ed3faf60c551c5ef881f1a783fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 02:44:48 +00:00
Cole Faust
ed40dfd144 Merge "Remove other partition's AVB properties" into main am: 06223362d7 am: dce3a9d66c am: c517d2faf7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768106

Change-Id: I6224b975f4c4fa63c974b6517a28125e3fa3f5ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 01:59:16 +00:00
Cole Faust
c517d2faf7 Merge "Remove other partition's AVB properties" into main am: 06223362d7 am: dce3a9d66c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768106

Change-Id: I2000ed49ecf8a97054e4ed6c8425d8f5f6177633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-29 00:54:17 +00:00
Cole Faust
83fe17e0a4 Revert^3 "Make the target_files zip reflect the recent partition change" 
This reverts commit cb63de55b7.

Reason for revert: Still more broken devices

Change-Id: Ic55ba78dd9c2e34dc96549ac8aba65fdbefd379b
 2023-09-29 00:22:27 +00:00
Cole Faust
dce3a9d66c Merge "Remove other partition's AVB properties" into main am: 06223362d7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2768106

Change-Id: I027f479e7cb807eec39a09dd23c5f37107246c4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 23:48:44 +00:00
Cole Faust
06223362d7 Merge "Remove other partition's AVB properties" into main 2023-09-28 22:56:30 +00:00
Cole Faust
6cb722433c Merge "Add extra variables to soong.variables" into main am: b78b334041 am: 2b24df300d am: 8e6660f733 am: 8e2e2ec44e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2765709

Change-Id: I7451f146351875cc557ee309a19ba32f6e2857de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 20:30:38 +00:00
Cole Faust
8e2e2ec44e Merge "Add extra variables to soong.variables" into main am: b78b334041 am: 2b24df300d am: 8e6660f733 
Original change: https://android-review.googlesource.com/c/platform/build/+/2765709

Change-Id: I4952eeb5dd75955cb572c285861e5657abb88070
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 19:44:27 +00:00
Cole Faust
13d374ab41 Remove other partition's AVB properties 
This is to ensure a partition doesn't need to be aware of the other
partitions in order to be built.

Also sort the image info file so it's easier to compare with bazel.

Bug: 297269187
Test: m && emulator on sdk_phone_x86_64-userdebug
Change-Id: I8e4b2049f602c8db109bf53e1359751a9ed9dd7a
 2023-09-28 12:04:56 -07:00
Cole Faust
8e6660f733 Merge "Add extra variables to soong.variables" into main am: b78b334041 am: 2b24df300d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2765709

Change-Id: I53ddc0c3d6ed256a4673a4fea2aeaa35bf40c33d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 18:28:22 +00:00
Kousik Kumar
798080b0f3 Copy reclient binaries into the out directory itself 
This is to avoid the problem of multiple source commands / builds run in parallel overwriting the binaries in the reclient dir.

TESTED=ran concurrent builds, ensured binaries weren't being overwritten.

Bug: b/302378775

NOTE FOR REVIEWERS - original patch and result patch are not identical.
PLEASE REVIEW CAREFULLY.
Diffs between the patches:
 fi
+  local RECLIENT_VERSION=`readlink prebuilts/remoteexecution-client/live`
+
+  local NONCOG_RECLIENT_BIN_DIR_BASE="${OUT_DIR}/.reclient"
+  local NONCOG_RECLIENT_BIN_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/${RECLIENT_VERSION}"
+  if [ -d "${NONCOG_RECLIENT_BIN_DIR}" ]; then
+    if [ `ls ${NONCOG_RECLIENT_BIN_DIR} | wc -l` -gt 1 ] ; then
+      # binaries already exist, only update the symlink to ensure correct
+      # reclient version is set.
+      ln -sf ${RECLIENT_VERSION} ${NONCOG_RECLIENT_BIN_DIR_BASE}/live
+      return
+    fi
+  # Create the non cog directory and copy binaries into it.
+  mkdir -p ${NONCOG_RECLIENT_BIN_DIR}
-
-  # Copy the binaries out of live.
-  cp $TOP/prebuilts/remoteexecution-client/live/* $NONCOG_RECLIENT_BIN_DIR
+  cp ${TOP}/prebuilts/remoteexecution-client/live/* ${NONCOG_RECLIENT_BIN_DIR}
+  ln -sf ${RECLIENT_VERSION} ${NONCOG_RECLIENT_BIN_DIR_BASE}/live
-  export RBE_DIR=$NONCOG_RECLIENT_BIN_DIR
+  export RBE_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/live"

Original patch:
 diff a/cogsetup.sh b/cogsetup.sh
--- a/cogsetup.sh
+++ b/cogsetup.sh
@@ -39,22 +39,30 @@
 # non-cog part of the overall filesystem.  This is to workaround the problem
 # described in b/289391270.
 function _copy_reclient_binaries_from_cog() {
-  local NONCOG_RECLIENT_BIN_DIR="${HOME}/.cog/reclient/bin"
-  if [ ! -d "$NONCOG_RECLIENT_BIN_DIR" ]; then
-    # Create the non cog directory if it doesn't exist.
-    mkdir -p ${NONCOG_RECLIENT_BIN_DIR}
-  else
-    # Clear out the non cog directory if it does exist.
-    rm -f ${NONCOG_RECLIENT_BIN_DIR}/*
+  if [[ "${OUT_DIR}" == "" ]]; then
+    OUT_DIR="out"
   fi
+  local RECLIENT_VERSION=`readlink prebuilts/remoteexecution-client/live`
 
-  local TOP=$(gettop)
+  local NONCOG_RECLIENT_BIN_DIR_BASE="${OUT_DIR}/.reclient"
+  local NONCOG_RECLIENT_BIN_DIR="${NONCOG_RECLIENT_BIN_DIR_BASE}/${RECLIENT_VERSION}"
+  if [ -d "${NONCOG_RECLIENT_BIN_DIR}" ]; then
+    if [ `ls ${NONCOG_RECLIENT_BIN_DIR} | wc -l` -gt 1 ] ; then
+      # binaries already exist, only update t

Change-Id: Ia6cb7faae6366ee7491fcf91777318b772a3ba88
 2023-09-28 17:46:59 +00:00
Cole Faust
2b24df300d Merge "Add extra variables to soong.variables" into main am: b78b334041 
Original change: https://android-review.googlesource.com/c/platform/build/+/2765709

Change-Id: I51944fa8d61be1f2ba4a3ab3732ad77d9103245f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 17:23:44 +00:00
Cole Faust
b78b334041 Merge "Add extra variables to soong.variables" into main 2023-09-28 16:38:28 +00:00