tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
89767 commits 1 branch 0 tags 119 MiB
Commit graph

89767 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
c04229bbea Merge "Merge UP1A.231005.007" into aosp-main-future 2023-09-29 06:40:54 +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
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
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
Maxim Siniavine
2af9c2423d Merge "Revert "Add soong config variable Release_expose_flagged_api"" into main am: 377cf62987 
Original change: https://android-review.googlesource.com/c/platform/build/+/2766349

Change-Id: Ia1f46a2112240fc26a90a223e903f16bf6ce3ae6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-28 01:55:21 +00:00
Maxim Siniavine
377cf62987 Merge "Revert "Add soong config variable Release_expose_flagged_api"" into main 2023-09-28 01:08:44 +00:00
Maxim Siniavine
453d74ba48 Revert "Add soong config variable Release_expose_flagged_api" 
Revert submission 2755310

Reason for revert: Broken build b/302407753

Reverted changes: /q/submissionid:2755310

Change-Id: If2b09e6609cdd4c47eea12cb2d877c3874e0560b
 2023-09-28 01:02:02 +00:00
Xin Li
5cca3caa48 Merge UP1A.231005.007 
Bug: 291102124
Merged-In: Ib9596152fe20b412bf7f5e90a19b55f3c0f5523f
Change-Id: I4a0d6dfe3a5b4642f5c4cdf257c84c1634888699
 2023-09-27 16:08:15 -07:00
Cole Faust
c874c70f45 Add extra variables to soong.variables 
Also always use BUILD_NUMBER_FROM_FILE in the BUILD_FINGERPRINT.
The build number file now always exists, even if HAS_BUILD_NUMBER is
false.

Bug: 297269187
Test: m bazel_sandwich
Change-Id: Idf745b600b167e5cec161e07139be09a037bdc13
 2023-09-27 13:44:56 -07:00
Rajeev Kumar
77b936b764 Merge "Add devicelock to the list of individually toggleable module." into main am: d7965bd12c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2763932

Change-Id: If8e176fbff2d58c3b94f9a09fb57b18446fc36d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-27 19:45:19 +00:00
Treehugger Robot
fc35a79c49 Merge "Prevent VABC from being disabled on release-key builds" into main am: ad7f4666a6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2764967

Change-Id: Ia3364f47e6b16ada034af53dc102e8fa3b11c949
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-27 19:43:49 +00:00
Rajeev Kumar
d7965bd12c Merge "Add devicelock to the list of individually toggleable module." into main 2023-09-27 19:06:11 +00:00
Treehugger Robot
ad7f4666a6 Merge "Prevent VABC from being disabled on release-key builds" into main 2023-09-27 18:33:10 +00:00
Jihoon Kang
3163daa603 Merge "Add soong config variable Release_expose_flagged_api" into main am: 19cd806de1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2763272

Change-Id: I1054493df1c337790d479531cb8d103ac917577f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-27 17:52:34 +00:00
Treehugger Robot
2edf1903d8 Merge "Fix custom image OTA generation with extracted target files" into main am: aad75f8f1b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2762658

Change-Id: I4db20eca539ab5e79c787444a9bf8d42bc61ac81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-27 17:50:25 +00:00
Jihoon Kang
19cd806de1 Merge "Add soong config variable Release_expose_flagged_api" into main 2023-09-27 17:09:27 +00:00
Treehugger Robot
aad75f8f1b Merge "Fix custom image OTA generation with extracted target files" into main 2023-09-27 16:56:17 +00:00
Kelvin Zhang
2f9a9ae64b Prevent VABC from being disabled on release-key builds 
VABC is mandated now, and plain VAB will be unsupported later.

Test: th
Change-Id: Iad19433c06b25246d4f7bffe5599035836e36076
 2023-09-27 09:35:21 -07:00
Mårten Kongstad
286ea9f8a8 Merge changes from topic "printflags-include-device-config" into main am: dd1ebe9300 
Original change: https://android-review.googlesource.com/c/platform/build/+/2763270

Change-Id: I477c1da7dd79b0156819b748d1b2ac3a39dfe84b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-27 14:22:07 +00:00
Mårten Kongstad
dd1ebe9300 Merge changes from topic "printflags-include-device-config" into main 
* changes:
  printflags: add printflags to PRODUCT_PACKAGES
  printflags: include device_config values
 2023-09-27 13:04:40 +00:00
Mårten Kongstad
583a52478b printflags: add printflags to PRODUCT_PACKAGES 
Include the printflags device tool in the system image by default.

Bug: 301547297
Test: adb shell printflags
Change-Id: I3b2d71c89742bd389f6cafff8d8ab25fb81c7b00
 2023-09-27 10:42:04 +02:00
Mårten Kongstad
3bb7988492 printflags: include device_config values 
Amend the default flag values read from
/<partition>/etc/aconfig_flags.pb with the currently used values as
stored in device_config.

Bug: 301547297
Test: atest printflags.test
Test: adb shell printflags
Change-Id: Ic11702a0ae093d2e9dc3ff543b5ca0684b67e0dc
 2023-09-27 10:42:04 +02:00
Justin Yun
cd7c0300b5 Remove PRODUCT_PRODUCT_VNDK_VERSION from soong_config 
We can remove PRODUCT_PRODUCT_VNDK_VERSION safely as soong does not
read it.

Bug: 302255959
Test: m
Change-Id: I1d4080b8e6f8b04c0c1333bcd9bf055d329fdd71
 2023-09-27 16:38:13 +09:00
Rajeev Kumar
e71b6333c4 Add devicelock to the list of individually toggleable module. 
Bug: 300099037
Test: Builds successfully
Change-Id: I4231021982819cf227f3f1298c376635e160ab72
 2023-09-26 20:16:57 -07:00
Kelvin Zhang
0fda62973b Fix custom image OTA generation with extracted target files 
Bug: 301909132
Test: ota_from_target_files --custom_image vendor=vendor.img
target_files.zip ota.zip

Change-Id: I9db6e21d47174670e23f461b6107068cbfa35d0f
 2023-09-26 16:08:17 -07:00
Treehugger Robot
cd4c262258 Merge "Remove architecture name from names of HOST_*.mk files." into main am: 1741facdbf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2694564

Change-Id: I588d140258ed188b1393aa4fa5180629a8b74358
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 22:38:01 +00:00
Jihoon Kang
ccebab160e Add soong config variable Release_expose_flagged_api 
The variable is a release config variable which will be used to
determine whether if the api marked @FlaggedApi is exposed or not.

Test: m nothing
Bug: 299570421
Change-Id: Iad902b5ceb2e6d6e9f8fc3b81d54ce3d1896f9eb
 2023-09-26 22:32:37 +00:00
Treehugger Robot
1741facdbf Merge "Remove architecture name from names of HOST_*.mk files." into main 2023-09-26 21:15:42 +00:00
Jihoon Kang
452241468c Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main am: 596d514744 
Original change: https://android-review.googlesource.com/c/platform/build/+/2756249

Change-Id: I1ca8eeb8b673300129ac45cba722f8d97cbfcf17
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 18:20:33 +00:00
Jihoon Kang
596d514744 Merge "Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets" into main 2023-09-26 17:49:25 +00:00
Jiyong Park
a0d2642141 Merge "Export BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI to soong" into main am: 343fabb483 
Original change: https://android-review.googlesource.com/c/platform/build/+/2759039

Change-Id: I14b2daadbf7b0b3f4bd6a1ee7c8bbc44eb8235a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 13:15:00 +00:00
Jiyong Park
343fabb483 Merge "Export BINDER_DEATH_RECIPIENT_WEAK_FROM_JNI to soong" into main 2023-09-26 12:02:49 +00:00
Kiyoung Kim
230d729bec Merge "Do not compare KEEP_VNDK with false" into main am: 65aa4c8429 
Original change: https://android-review.googlesource.com/c/platform/build/+/2759034

Change-Id: I1ca24eec0a4d6544d5e65a6d4c2f38bf6e483adf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 06:49:47 +00:00
Kiyoung Kim
65aa4c8429 Merge "Do not compare KEEP_VNDK with false" into main 2023-09-26 06:08:05 +00:00
Treehugger Robot
6ec1c0e15d Merge "Use symlinks instead of hard links" into main am: 3d0567ca4c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2760171

Change-Id: I5c4a45a77cda0b96b10b64f0d53446e83f7d7eae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-26 00:31:32 +00:00
Treehugger Robot
3d0567ca4c Merge "Use symlinks instead of hard links" into main 2023-09-25 23:26:56 +00:00
Kelvin Zhang
e14f2a59a3 Use symlinks instead of hard links 
Test: th
Bug: 283172692
Change-Id: Idb91448677d94370e052755842a396cc0e1eb588
 2023-09-25 15:24:20 -07:00
Cole Faust
a2cd1601df Merge "Revert^2 "Make the target_files zip reflect the recent partition change"" into main am: 00bf14b0f3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2758437

Change-Id: Icd045c1f6a439be7d31c07cf13a62e1a1a3f511a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 21:49:58 +00:00
Cole Faust
00bf14b0f3 Merge "Revert^2 "Make the target_files zip reflect the recent partition change"" into main 2023-09-25 21:07:57 +00:00
Cole Faust
cb63de55b7 Revert^2 "Make the target_files zip reflect the recent partition change" 
This reverts commit 612b362ca3.

Reason for revert: Excluding the failing product in ag/24856527

Change-Id: I28664302a7fd98ce9bd88e6ce9679b53846b1859
 2023-09-25 19:41:25 +00:00
Cole Faust
0e107dc3dd Merge "Add partition-related variables to soong_config.mk" into main am: 252e5a39fe 
Original change: https://android-review.googlesource.com/c/platform/build/+/2758047

Change-Id: I54361f5122d4d2bcbe9d678cbdefd7d60949c66c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-09-25 18:09:20 +00:00
Cole Faust
252e5a39fe Merge "Add partition-related variables to soong_config.mk" into main 2023-09-25 17:08:34 +00:00
Alyssa Ketpreechasawat
a6292d3fde Add RELEASE_DEFAULT_MODULE_BUILD_FROM_SOURCE in config. 
Bug: 301871981
Test: m (build from prebuilts)
Change-Id: Ic654cbc18992310e24a7d9334fcad4449d5c34f2
 2023-09-25 15:26:13 +00:00