StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
89,050 Commits 1 Branch 0 Tags
b83c3c55ff55fa8539bc3d0cdfc255d94296da9c
Commit Graph

34524 Commits

Author SHA1 Message Date
Daniel Zheng
4d63271885 Merge "Removing --apply-vbmeta for vbmeta_system" am: d97f8505ae am: a5b20d6ef1 am: 85c879e407 
Original change: https://android-review.googlesource.com/c/platform/build/+/2620094

Change-Id: Id657b97c854006235222a00bf4a44008e54c8fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 18:09:23 +00:00
Jiakai Zhang
46a512bc18 Merge "Avoid using soong_zip's "-e" flag for boot.zip." am: 9448754144 am: 6883343237 
Original change: https://android-review.googlesource.com/c/platform/build/+/2622109

Change-Id: I211867b71c95b20ec6ea06c29d8f69e739a7b7d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 17:23:02 +00:00
Daniel Zheng
85c879e407 Merge "Removing --apply-vbmeta for vbmeta_system" am: d97f8505ae am: a5b20d6ef1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2620094

Change-Id: I7239d9617644eca2f41148e778b544901d8b3e1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 17:22:12 +00:00
Daniel Zheng
8ad23cf151 Add dt partition in fastboot-info 
Adding dt partition in fastboot-info in case device uses it.

Test: m fastboot_info
Change-Id: Id5b3a70064f5ac6da8303f74c73e4d5f395a2c51
 2023-06-12 09:57:54 -07:00
Jiakai Zhang
6883343237 Merge "Avoid using soong_zip's "-e" flag for boot.zip." am: 9448754144 
Original change: https://android-review.googlesource.com/c/platform/build/+/2622109

Change-Id: I5c9717244b629ef275e0f81cc707fd11d52823de
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 16:39:53 +00:00
Daniel Zheng
a5b20d6ef1 Merge "Removing --apply-vbmeta for vbmeta_system" am: d97f8505ae 
Original change: https://android-review.googlesource.com/c/platform/build/+/2620094

Change-Id: Iba958ede3dc516a08c9a532ef37f566220e870b8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 16:39:29 +00:00
Jiakai Zhang
c63a2b36d7 Avoid using soong_zip's "-e" flag for boot.zip. 
aosp/23658853 changes boot.zip, which need to be cherry-picked to UDC.
It uses soong_zip's "-e" flag to specify the filename to use in boot.zip
for METADATA.txt. However, the "-e" flag doesn't exist on UDC. This
change uses an alternative approach to avoid using the "-e" flag.

Before this change, the contents were written to
out/dist/boot.zip.METADATA.txt and then passed to soong_zip with "-e" to
rename to file to "METADATA.txt".

After this change, the contents are written to
out/dist/boot_zip/METADATA.txt and then passed to soong_zip with "-j" to
remove the directory name.

Bug: 286381070
Test: m dist out/dist/boot.zip (on udc-dev)
(cherry picked from https://android-review.googlesource.com/q/commit:34914f620bcc0339104ef0360f6a30492f407409)
Merged-In: I769de5194b5716f05e5352f4efd635a70ba0b891
Change-Id: I769de5194b5716f05e5352f4efd635a70ba0b891
 2023-06-12 16:28:51 +00:00
Jiakai Zhang
dac9d66a75 Add mainline extension and METADATA.txt to boot.zip. 
Contents of METADATA.txt:

booclasspath = dex_bootjars_input/core-oj.jar:dex_bootjars_input/core-libart.jar:dex_bootjars_input/okhttp.jar:dex_bootjars_input/bouncycastle.jar:dex_bootjars_input/apache-xml.jar:dex_bootjars_input/framework.jar:dex_bootjars_input/framework-graphics.jar:dex_bootjars_input/ext.jar:dex_bootjars_input/telephony-common.jar:dex_bootjars_input/voip-common.jar:dex_bootjars_input/ims-common.jar:dex_bootjars_input/core-icu4j.jar:apex_bootjars/framework-adservices.jar:apex_bootjars/framework-sdksandbox.jar:apex_bootjars/framework-appsearch.jar:apex_bootjars/framework-bluetooth.jar:apex_bootjars/conscrypt.jar:apex_bootjars/android.net.ipsec.ike.jar:apex_bootjars/updatable-media.jar:apex_bootjars/framework-mediaprovider.jar:apex_bootjars/framework-ondevicepersonalization.jar:apex_bootjars/framework-statsd.jar:apex_bootjars/framework-permission.jar:apex_bootjars/framework-permission-s.jar:apex_bootjars/framework-scheduling.jar:apex_bootjars/framework-sdkextensions.jar:apex_bootjars/framework-connectivity.jar:apex_bootjars/framework-connectivity-t.jar:apex_bootjars/framework-tethering.jar:apex_bootjars/framework-uwb.jar:apex_bootjars/framework-virtualization.jar:apex_bootjars/framework-wifi.jar
booclasspath-locations = /apex/com.android.art/javalib/core-oj.jar:/apex/com.android.art/javalib/core-libart.jar:/apex/com.android.art/javalib/okhttp.jar:/apex/com.android.art/javalib/bouncycastle.jar:/apex/com.android.art/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/framework-graphics.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/apex/com.android.i18n/javalib/core-icu4j.jar:/apex/com.android.adservices/javalib/framework-adservices.jar:/apex/com.android.adservices/javalib/framework-sdksandbox.jar:/apex/com.android.appsearch/javalib/framework-appsearch.jar:/apex/com.android.btservices/javalib/framework-bluetooth.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.ipsec/javalib/android.net.ipsec.ike.jar:/apex/com.android.media/javalib/updatable-media.jar:/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar:/apex/com.android.ondevicepersonalization/javalib/framework-ondevicepersonalization.jar:/apex/com.android.os.statsd/javalib/framework-statsd.jar:/apex/com.android.permission/javalib/framework-permission.jar:/apex/com.android.permission/javalib/framework-permission-s.jar:/apex/com.android.scheduling/javalib/framework-scheduling.jar:/apex/com.android.sdkext/javalib/framework-sdkextensions.jar:/apex/com.android.tethering/javalib/framework-connectivity.jar:/apex/com.android.tethering/javalib/framework-connectivity-t.jar:/apex/com.android.tethering/javalib/framework-tethering.jar:/apex/com.android.uwb/javalib/framework-uwb.jar:/apex/com.android.virt/javalib/framework-virtualization.jar:/apex/com.android.wifi/javalib/framework-wifi.jar
boot-image = system/framework/boot.art:system/framework/boot-framework-adservices.art

Bug: 286381070
Test: m dist out/dist/boot.zip
(cherry picked from https://android-review.googlesource.com/q/commit:a5551c5d91ce236e775bfc61fb3d6b7cdeb07b50)
Merged-In: I258479ffbdf199091290b074329ff1b43db2e669
Change-Id: I258479ffbdf199091290b074329ff1b43db2e669
 2023-06-12 16:28:18 +00:00
Jiakai Zhang
9448754144 Merge "Avoid using soong_zip's "-e" flag for boot.zip." 2023-06-12 16:22:39 +00:00
Daniel Zheng
d97f8505ae Merge "Removing --apply-vbmeta for vbmeta_system" 2023-06-12 15:42:16 +00:00
Jiakai Zhang
9eac919a46 Merge "Add mainline extension and METADATA.txt to boot.zip." am: 3d58caa11b am: 75b75c9b8a am: e3dd105d56 
Original change: https://android-review.googlesource.com/c/platform/build/+/2619633

Change-Id: I8e303ea63b77a0f682fc1e19e7d9939f1b1f7be0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 11:18:14 +00:00
Jiakai Zhang
e3dd105d56 Merge "Add mainline extension and METADATA.txt to boot.zip." am: 3d58caa11b am: 75b75c9b8a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2619633

Change-Id: I0ec1f3e3dfac07e12245ab622791a02b97139b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 10:32:16 +00:00
Jiakai Zhang
34914f620b Avoid using soong_zip's "-e" flag for boot.zip. 
aosp/23658853 changes boot.zip, which need to be cherry-picked to UDC.
It uses soong_zip's "-e" flag to specify the filename to use in boot.zip
for METADATA.txt. However, the "-e" flag doesn't exist on UDC. This
change uses an alternative approach to avoid using the "-e" flag.

Before this change, the contents were written to
out/dist/boot.zip.METADATA.txt and then passed to soong_zip with "-e" to
rename to file to "METADATA.txt".

After this change, the contents are written to
out/dist/boot_zip/METADATA.txt and then passed to soong_zip with "-j" to
remove the directory name.

Bug: 286381070
Test: m dist out/dist/boot.zip (on udc-dev)
Change-Id: I769de5194b5716f05e5352f4efd635a70ba0b891
 2023-06-12 11:27:46 +01:00
Jiakai Zhang
75b75c9b8a Merge "Add mainline extension and METADATA.txt to boot.zip." am: 3d58caa11b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2619633

Change-Id: Id44f3ce4e9037360d3acc683195904acabfd4c83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 09:52:41 +00:00
Jiakai Zhang
3d58caa11b Merge "Add mainline extension and METADATA.txt to boot.zip." 2023-06-12 09:02:46 +00:00
Joe Onorato
ed951095cd Merge changes from topic "aosp_starlark_release_config" am: d5eb7a6d28 am: 4792be7660 am: 283db3fb83 
Original change: https://android-review.googlesource.com/c/platform/build/+/2621452

Change-Id: I59742ac2ffa309d7cfd9a236546bba545124c89e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 04:31:00 +00:00
Joe Onorato
c861e3411d Clean up the API for release config in starlark am: d6df20a058 am: 874b245c67 am: a21e6d940c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2621451

Change-Id: Iee047c18582af3e35d8096a967196f68d2c0f474
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 04:30:54 +00:00
Joe Onorato
283db3fb83 Merge changes from topic "aosp_starlark_release_config" am: d5eb7a6d28 am: 4792be7660 
Original change: https://android-review.googlesource.com/c/platform/build/+/2621452

Change-Id: I8176e3f2a6557aabb750166008138a48612d5282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 03:44:49 +00:00
Joe Onorato
a21e6d940c Clean up the API for release config in starlark am: d6df20a058 am: 874b245c67 
Original change: https://android-review.googlesource.com/c/platform/build/+/2621451

Change-Id: I0e5fd2d4eb78e63927da160cf4f1377717311de1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 03:44:46 +00:00
Joe Onorato
4792be7660 Merge changes from topic "aosp_starlark_release_config" am: d5eb7a6d28 
Original change: https://android-review.googlesource.com/c/platform/build/+/2621452

Change-Id: I6428f2094cc9c14fdcc964997730d469038c38b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 03:06:16 +00:00
Joe Onorato
874b245c67 Clean up the API for release config in starlark am: d6df20a058 
Original change: https://android-review.googlesource.com/c/platform/build/+/2621451

Change-Id: I6273dac677c9f4bb283c7e98454ad779fa593119
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 03:06:15 +00:00
Joe Onorato
6d7afa00e3 Make RELEASE_PLATFORM_VERSION a release config flag to set platform version. 
Bug: 282838389
Test: Treehugger
Merged-In: Ic6dacbdee7d2408aa8b25b4df59bf9bbc566d747
Change-Id: Ie61a7d986c2b8fe2c16117f6678b9e5a71711647
 2023-06-11 09:17:43 -07:00
Joe Onorato
d6df20a058 Clean up the API for release config in starlark 
Also gets the json summaries working again.

Bug: 283477392
Test: Manual
Merged-In: Iaeb840e96bd7fef2fa1492cb55d9688f7ca75858
Change-Id: I05d9b816ad7ad30c1d238d01df811426d9aeddcb
 2023-06-11 07:58:22 -07:00
Joe Onorato
0bbfa29e0c Merge "Define release flags in starlark instead of make" am: 593bef7150 am: 11a113676a am: 0cd220797b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617915

Change-Id: Iea431abef7ea5a3704eab684b056ed9cf303a702
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 05:13:42 +00:00
Joe Onorato
0cd220797b Merge "Define release flags in starlark instead of make" am: 593bef7150 am: 11a113676a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617915

Change-Id: Iac2fa3e830d6031b9936bab76c7122cb762768a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 04:27:15 +00:00
Joe Onorato
11a113676a Merge "Define release flags in starlark instead of make" am: 593bef7150 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617915

Change-Id: I97dc13cec1e261baa7efe56d5a8b880f262956a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 03:49:13 +00:00
Joe Onorato
593bef7150 Merge "Define release flags in starlark instead of make" 2023-06-10 03:21:22 +00:00
Treehugger Robot
01b91475bb Merge "Copy built images to generate target_files.zip" am: 54066e8ddf am: a69a5741df am: 7ade48d463 
Original change: https://android-review.googlesource.com/c/platform/build/+/2606565

Change-Id: I6b358e1490dc81b156a437896debe14d87f14640
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 00:57:51 +00:00
Treehugger Robot
7ade48d463 Merge "Copy built images to generate target_files.zip" am: 54066e8ddf am: a69a5741df 
Original change: https://android-review.googlesource.com/c/platform/build/+/2606565

Change-Id: I616e412027181e8a6d8622b42e53feb4310e160e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 00:08:17 +00:00
Treehugger Robot
a69a5741df Merge "Copy built images to generate target_files.zip" am: 54066e8ddf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2606565

Change-Id: I9e2fa67d4702a3243942a7116f96b0804da8640f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 23:26:35 +00:00
Treehugger Robot
54066e8ddf Merge "Copy built images to generate target_files.zip" 2023-06-09 22:32:40 +00:00
Cole Faust
386b3746ce Define release flags in starlark instead of make 
So that we have a more restricted enviornment for this new configuration
axis that can also be imported into other tools more easily.

Test: Manually (this time also tested setting OUT_DIR outside of the tree)
Change-Id: I01d90e06e45cba756156af16f63e04f575877263
 2023-06-09 13:10:05 -07:00
Jiakai Zhang
a5551c5d91 Add mainline extension and METADATA.txt to boot.zip. 
Contents of METADATA.txt:

booclasspath = dex_bootjars_input/core-oj.jar:dex_bootjars_input/core-libart.jar:dex_bootjars_input/okhttp.jar:dex_bootjars_input/bouncycastle.jar:dex_bootjars_input/apache-xml.jar:dex_bootjars_input/framework.jar:dex_bootjars_input/framework-graphics.jar:dex_bootjars_input/ext.jar:dex_bootjars_input/telephony-common.jar:dex_bootjars_input/voip-common.jar:dex_bootjars_input/ims-common.jar:dex_bootjars_input/core-icu4j.jar:apex_bootjars/framework-adservices.jar:apex_bootjars/framework-sdksandbox.jar:apex_bootjars/framework-appsearch.jar:apex_bootjars/framework-bluetooth.jar:apex_bootjars/conscrypt.jar:apex_bootjars/android.net.ipsec.ike.jar:apex_bootjars/updatable-media.jar:apex_bootjars/framework-mediaprovider.jar:apex_bootjars/framework-ondevicepersonalization.jar:apex_bootjars/framework-statsd.jar:apex_bootjars/framework-permission.jar:apex_bootjars/framework-permission-s.jar:apex_bootjars/framework-scheduling.jar:apex_bootjars/framework-sdkextensions.jar:apex_bootjars/framework-connectivity.jar:apex_bootjars/framework-connectivity-t.jar:apex_bootjars/framework-tethering.jar:apex_bootjars/framework-uwb.jar:apex_bootjars/framework-virtualization.jar:apex_bootjars/framework-wifi.jar
booclasspath-locations = /apex/com.android.art/javalib/core-oj.jar:/apex/com.android.art/javalib/core-libart.jar:/apex/com.android.art/javalib/okhttp.jar:/apex/com.android.art/javalib/bouncycastle.jar:/apex/com.android.art/javalib/apache-xml.jar:/system/framework/framework.jar:/system/framework/framework-graphics.jar:/system/framework/ext.jar:/system/framework/telephony-common.jar:/system/framework/voip-common.jar:/system/framework/ims-common.jar:/apex/com.android.i18n/javalib/core-icu4j.jar:/apex/com.android.adservices/javalib/framework-adservices.jar:/apex/com.android.adservices/javalib/framework-sdksandbox.jar:/apex/com.android.appsearch/javalib/framework-appsearch.jar:/apex/com.android.btservices/javalib/framework-bluetooth.jar:/apex/com.android.conscrypt/javalib/conscrypt.jar:/apex/com.android.ipsec/javalib/android.net.ipsec.ike.jar:/apex/com.android.media/javalib/updatable-media.jar:/apex/com.android.mediaprovider/javalib/framework-mediaprovider.jar:/apex/com.android.ondevicepersonalization/javalib/framework-ondevicepersonalization.jar:/apex/com.android.os.statsd/javalib/framework-statsd.jar:/apex/com.android.permission/javalib/framework-permission.jar:/apex/com.android.permission/javalib/framework-permission-s.jar:/apex/com.android.scheduling/javalib/framework-scheduling.jar:/apex/com.android.sdkext/javalib/framework-sdkextensions.jar:/apex/com.android.tethering/javalib/framework-connectivity.jar:/apex/com.android.tethering/javalib/framework-connectivity-t.jar:/apex/com.android.tethering/javalib/framework-tethering.jar:/apex/com.android.uwb/javalib/framework-uwb.jar:/apex/com.android.virt/javalib/framework-virtualization.jar:/apex/com.android.wifi/javalib/framework-wifi.jar
boot-image = system/framework/boot.art:system/framework/boot-framework-adservices.art

Bug: 286381070
Test: m dist out/dist/boot.zip
Change-Id: I258479ffbdf199091290b074329ff1b43db2e669
 2023-06-09 17:56:31 +01:00
Treehugger Robot
9dc04e4f10 Merge "BF_BUILD_NUMBER should have BUILD_NUMBER" am: c07ff752aa am: 306ce5c2bd am: b036449605 
Original change: https://android-review.googlesource.com/c/platform/build/+/2620172

Change-Id: Icd8095d0882007c019f6aa9f3bfffa4351971150
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 09:50:56 +00:00
Treehugger Robot
b036449605 Merge "BF_BUILD_NUMBER should have BUILD_NUMBER" am: c07ff752aa am: 306ce5c2bd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2620172

Change-Id: Ic327692a817e374935350ec3bffa09aadb7f5832
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 09:04:57 +00:00
Treehugger Robot
306ce5c2bd Merge "BF_BUILD_NUMBER should have BUILD_NUMBER" am: c07ff752aa 
Original change: https://android-review.googlesource.com/c/platform/build/+/2620172

Change-Id: I06a4c8b1835077ded5ca332fcccf906a2f555238
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 08:22:14 +00:00
Jeongik Cha
8a64fb1663 BF_BUILD_NUMBER should have BUILD_NUMBER 
BF_BUILD_NUMBER has hostname by mistake during refactoring.

Bug: 286453356
Test: build with BUILD_NUMBER
Change-Id: Id3fd7975057dfd70dfb7c02650672e670c6d5984
 2023-06-09 11:51:18 +09:00
Treehugger Robot
e80e8b4c5c Merge "BOARD_VNDK_VERSION must be set first pass" am: a85c8a863a am: 7613afc5ae am: 1b805513cc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2613792

Change-Id: I4dad5a6ab484b68f53f1636634a7d98ea6073963
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-09 00:47:10 +00:00
Treehugger Robot
1b805513cc Merge "BOARD_VNDK_VERSION must be set first pass" am: a85c8a863a am: 7613afc5ae 
Original change: https://android-review.googlesource.com/c/platform/build/+/2613792

Change-Id: I61572beef64f4d4b7be08f392f15dc639708d250
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 23:55:10 +00:00
Treehugger Robot
7613afc5ae Merge "BOARD_VNDK_VERSION must be set first pass" am: a85c8a863a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2613792

Change-Id: I62ffc6c79b1b472e3a25c3b80f88ef26f3507ea7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 23:32:09 +00:00
Treehugger Robot
a85c8a863a Merge "BOARD_VNDK_VERSION must be set first pass" 2023-06-08 23:19:34 +00:00
Daniel Zheng
9456228807 Removing --apply-vbmeta for vbmeta_system 
Removing since vbmeta rewrite is only needed for root vbmeta

Test: m fastboot_info
Change-Id: Idd07629104b48db0b75b43d73cd59564583819a4
 2023-06-08 11:14:58 -07:00
Florian Mayer
4c2f81bba9 Merge "Fix bug when memtag_heap in diag but not sanitizers" am: a0c6f31ef7 am: 9fa9bee104 am: ebfb0e4e42 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617517

Change-Id: I2bc27623660a5db03fbb96e8adbbb6dcdcb79430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 17:40:11 +00:00
Florian Mayer
ebfb0e4e42 Merge "Fix bug when memtag_heap in diag but not sanitizers" am: a0c6f31ef7 am: 9fa9bee104 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617517

Change-Id: I229cc2681ceca236561a44723d2f5f0d3880717a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 16:53:27 +00:00
Florian Mayer
9fa9bee104 Merge "Fix bug when memtag_heap in diag but not sanitizers" am: a0c6f31ef7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617517

Change-Id: I4f3bc6070ac1aeced4abdb523d7438cf00cb68a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 16:14:15 +00:00
Florian Mayer
a0c6f31ef7 Merge "Fix bug when memtag_heap in diag but not sanitizers" 2023-06-08 16:04:08 +00:00
Nikita Ioffe
ec608119c4 Merge "Add PRODUCT_AVF_KERNEL_MODULES_ENABLED" am: fe22cc38da am: b459a56564 am: 124c1536b6 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617272

Change-Id: I5161fe7b5e50e45f0d83de154f0ec074fe3618a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 01:37:56 +00:00
Nikita Ioffe
124c1536b6 Merge "Add PRODUCT_AVF_KERNEL_MODULES_ENABLED" am: fe22cc38da am: b459a56564 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617272

Change-Id: I1773f5b9f12809b71979249f481ac01c09029a45
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 00:50:46 +00:00
Nikita Ioffe
b459a56564 Merge "Add PRODUCT_AVF_KERNEL_MODULES_ENABLED" am: fe22cc38da 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617272

Change-Id: I472a3ffc66c23ae7b69c5babd6e7ae414c8efffc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-08 00:07:43 +00:00
Nikita Ioffe
fe22cc38da Merge "Add PRODUCT_AVF_KERNEL_MODULES_ENABLED" 2023-06-07 23:36:20 +00:00