StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
84,911 Commits 1 Branch 0 Tags
514a12d7afd62f68fe32fb231feca89f8df4468c
Commit Graph

84911 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Justin Yun
514a12d7af Merge "Use map_file_generator only for the supported file systems" am: cf92cdff7c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627751

Change-Id: I968de85f8e094ec73d7247275ad9c374ddda009b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-16 00:31:08 +00:00
Justin Yun
cf92cdff7c Merge "Use map_file_generator only for the supported file systems" 2023-06-15 23:54:29 +00:00
Treehugger Robot
8ac8ce2b16 Merge changes I9c1a5346,I0a9d2c58 am: 5c73eb33db 
Original change: https://android-review.googlesource.com/c/platform/build/+/2627031

Change-Id: Ied665b5cbd2d1b207c184458eef0ef49259df129
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 16:36:23 +00:00
Treehugger Robot
5c73eb33db Merge changes I9c1a5346,I0a9d2c58 
* changes:
  Fix python3.11's support for zip64
  Search for partition maps in IMAGES dir as well
 2023-06-15 15:56:57 +00:00
Justin Yun
a8a5a3ff62 Use map_file_generator only for the supported file systems 
map_file_generator can generate map files from erofs and ext# file
systems. Check the file system type and copy images and generate map
files if supported. Otherwise skip these steps.
If the image files are not copied, add_img_to_target_files will
generate the image files and map files.

Bug: 286870582
Test: lunch bertha_x86_64-userdebug && m dist
Change-Id: Ib92dd989cf61b1e376107a507eae9222ceb1d0d4
 2023-06-16 00:10:33 +09:00
Treehugger Robot
bb4fddb723 Merge "Update LLNDK list" am: 1cda03b44b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2623809

Change-Id: I66514a5e139d4686e4f7127a42b1c75c11b529af
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-15 06:31:39 +00:00
Treehugger Robot
1cda03b44b Merge "Update LLNDK list" 2023-06-15 04:26:43 +00:00
Kelvin Zhang
38d0c373ac Fix python3.11's support for zip64 
Bug: 283033491
Test: check_target_files_signatures -v -l
Change-Id: I9c1a5346e3a5f3920242dc9a5268d999f50a4937
 2023-06-14 12:54:57 -07:00
Treehugger Robot
8e448f3c53 Merge "Allow map_file_generator to use host tools" am: 4b47e8a2f3 
Original change: https://android-review.googlesource.com/c/platform/build/+/2624300

Change-Id: Ic68b479538759e5ab5a6de21ced4e9cc5537669e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 17:01:39 +00:00
Kelvin Zhang
b789e84499 Search for partition maps in IMAGES dir as well 
Partition images are allowed to be in either IMAGES/ or RADIO/ dir of a
target_files zip, so when searching for .map files we should look in
both dirs.

Test: th
Bug: 227848550
Change-Id: I0a9d2c582d8f5d570237434902fac012513c9aad
 2023-06-14 10:01:21 -07:00
Treehugger Robot
4b47e8a2f3 Merge "Allow map_file_generator to use host tools" 2023-06-14 16:25:26 +00:00
Zhi Dou
678166cbdb Merge "aconfig: Java codegen iteration 1" am: 06377d79ab 
Original change: https://android-review.googlesource.com/c/platform/build/+/2619534

Change-Id: I3ef56bcda7625dcaf70abb937b1b6503b4e7333d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 14:02:19 +00:00
Zhi Dou
06377d79ab Merge "aconfig: Java codegen iteration 1" 2023-06-14 13:21:16 +00:00
Treehugger Robot
ec810624c2 Merge "Move MTE mode settings to a product variable." am: c37e824f56 
Original change: https://android-review.googlesource.com/c/platform/build/+/2622658

Change-Id: I8dbb33a6f23421e43f27cb54aa88f39f4dab8e36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-14 02:33:07 +00:00
Treehugger Robot
c37e824f56 Merge "Move MTE mode settings to a product variable." 2023-06-14 01:42:22 +00:00
Kelvin Zhang
0eba102f19 Allow map_file_generator to use host tools 
map_file_generator need to invoke binaries such as `unsquashfs` .
These binaries are built from android source tree, so add host binary
output directory to PATH variable so that map_file_generator can use
these binaries.

Test: th
Bug: 286870582
Change-Id: I56634293ee885fc4612627578a22cdf57bc13bfc
 2023-06-13 18:24:15 -07:00
Treehugger Robot
e6d7954914 Merge "aconfig: reject consecutive underscores in identifiers" am: c01b9a2877 
Original change: https://android-review.googlesource.com/c/platform/build/+/2624469

Change-Id: I08a32db9a755df12a8a6744a8843dacc9dc74607
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 22:40:50 +00:00
Treehugger Robot
c01b9a2877 Merge "aconfig: reject consecutive underscores in identifiers" 2023-06-13 22:05:56 +00:00
Evgenii Stepanov
80b53b8c77 Move MTE mode settings to a product variable. 
Allow product configuration of memtag target list by
moving the current set into a product variable instead of the various
.bp files.

The default list of memtag targets can be found in
  build/make/target/product/memtag-common.mk

This is NFC as all targets in the list already have "memtag_heap: true"
in the build files.

Bug: 280343521
Test: no functional change
Change-Id: I5954fde05256e00a8e01c114ad522f50ed0cfa9f
 2023-06-13 13:11:52 -07:00
Daniel Zheng
190f8ca236 Merge "Add dt partition in fastboot-info" am: 0fd9651321 
Original change: https://android-review.googlesource.com/c/platform/build/+/2621218

Change-Id: Ia413512fa21562bc3ed72f608bd58826b7b21044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 18:27:16 +00:00
Daniel Zheng
0fd9651321 Merge "Add dt partition in fastboot-info" 2023-06-13 17:35:59 +00:00
Joe Onorato
caee07b951 Merge "Allow and merge multiple release configs with the same name" am: ac57d98b87 
Original change: https://android-review.googlesource.com/c/platform/build/+/2622584

Change-Id: I4375335402a88f191ffdc47d3acd96ca2baab161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 15:57:25 +00:00
Joe Onorato
ac57d98b87 Merge "Allow and merge multiple release configs with the same name" 2023-06-13 15:13:04 +00:00
Zhi Dou
4655c967e1 aconfig: Java codegen iteration 1 
This change includes
    - refactor generated java code to generate
        - Flags.java to support the static API
	- FeatureFlagsImpl.java to support injection API
	- FeatureFlags.java interface

Bug: 279483816
Test: atest aconfig.test aconfig.test.java
Change-Id: If0d4baf317b9174635cd0fff3832ab7091ee52ed
 2023-06-13 14:45:53 +00:00
Mårten Kongstad
d18c978f31 aconfig: reject consecutive underscores in identifiers 
The Java codegen may translate flag names (snake_case) to Java
camelCase, dropping the underscores. The flags a_b and a__b will
translate to the same camelCase form, which is ambiguous.

Circumvent this problem by disallowing consecutive underscores in flag
names, flag namespaces, and packages.

Bug: 284252015
Test: atest aconfig.test
Change-Id: I2586a38160723c06265a140193da8178655553e4
 2023-06-13 13:30:58 +02:00
Treehugger Robot
48c52a56be Merge "Use Z_BEST_COMPRESSION for compress-package" am: 913c41caf5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2554371

Change-Id: Ie1b1d6d032981821925e047215a13b9e358595ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-13 10:42:00 +00:00
Treehugger Robot
913c41caf5 Merge "Use Z_BEST_COMPRESSION for compress-package" 2023-06-13 10:09:54 +00:00
Joe Onorato
1f6555151e Allow and merge multiple release configs with the same name 
For now (to prevent build breakages when this is submitted), duplicate
flag values are allowed, but that will be disallowed once this change
automerges everywhere.

Bug: 286689485
Test: Treehugger
Change-Id: I723340ff9751b61d33c4108b0cc2f90702a116c9
 2023-06-12 23:29:25 -07:00
Jooyung Han
bd7a9fafe2 Update LLNDK list 
Bug: 271488212
Test: m
Change-Id: I46e1770130be203bfefef0bd5fdf4cec34027d6e
 2023-06-13 13:20:23 +09: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
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
Dennis Shen
d57d4fed31 Merge "aconfig: update cpp codegen to use static methods" am: f1cd83bece 
Original change: https://android-review.googlesource.com/c/platform/build/+/2620871

Change-Id: I614fac778dd96a3da711ea9cbd78ee8656725cea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-12 13:43:38 +00:00
Dennis Shen
f1cd83bece Merge "aconfig: update cpp codegen to use static methods" 2023-06-12 12:57:57 +00:00
Dennis Shen
4f78f10015 aconfig: update cpp codegen to use static methods 
Update c++ codegen to static methods interface.

Bug: b/279483801
Test: atest aconfig.test
Change-Id: I78da3bbca6240bee660c692807930d00f2242b0a
 2023-06-12 12:57:38 +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
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
d5eb7a6d28 Merge changes from topic "aosp_starlark_release_config" 
* changes:
  Make RELEASE_PLATFORM_VERSION a release config flag to set platform version.
  Clean up the API for release config in starlark
 2023-06-12 02:27:16 +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
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
Florian Mayer
34ed46e626 Merge "Add aosp_arm64_fullmte target" am: 9066ab5240 
Original change: https://android-review.googlesource.com/c/platform/build/+/2617516

Change-Id: Id57d362e61bb4df8a5f8e7c70f3cb990db3c6524
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-06-10 00:34:38 +00:00
Florian Mayer
9066ab5240 Merge "Add aosp_arm64_fullmte target" 2023-06-09 23:59:52 +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