Commit Graph

75685 Commits

Author SHA1 Message Date
Devin Moore
c3ee009f38 Merge "Get build.prop for init_boot.img from the ramdisk props" 2022-02-14 17:14:47 +00:00
Inseob Kim
cc665e54e3 Add sepolicy prebuilt API dirs to soong config
Bug: 33691272
Test: build
Change-Id: Id2ea256507cdbcdcd67751c96c911f49f5fdb3f0
2022-02-14 23:10:08 +09:00
Artur Satayev
206f023938 Merge "Introduce ro.build.version.known_codenames sysprop." am: ac87c5e13a
Original change: https://android-review.googlesource.com/c/platform/build/+/1976678

Change-Id: I8ef068c1c9df48a456af8f7fe0148438fbe2c043
2022-02-14 12:25:22 +00:00
Artur Satayev
ac87c5e13a Merge "Introduce ro.build.version.known_codenames sysprop." 2022-02-14 12:08:04 +00:00
Kelvin Zhang
21118bba67 Improve error message for GetMinSdkVersion
Bug: 219148978
Test: th
Change-Id: I72c653b6e7e159abf0b7aca394cf465869542483
2022-02-12 09:41:18 -08:00
Android Build Coastguard Worker
43eddfd0c9 Version bump to SP2A.220305.012 [core/build_id.mk]
Change-Id: I229423c7b64c715f6cd18534dba9e79d770152a1
2022-02-12 06:02:41 +00:00
Treehugger Robot
3d0b257b0a Merge "Add macros for declaring copied file licenses." am: 6d361637e3
Original change: https://android-review.googlesource.com/c/platform/build/+/1978047

Change-Id: I0896ebb23f8418c83795316a276a7872811120d0
2022-02-12 02:13:47 +00:00
Treehugger Robot
6d361637e3 Merge "Add macros for declaring copied file licenses." 2022-02-12 01:59:49 +00:00
Treehugger Robot
ba48b68251 Merge "Support multiple library names per target." am: 5796849ac8
Original change: https://android-review.googlesource.com/c/platform/build/+/1978111

Change-Id: I7f93795f7723e3ede49b8d6281fc1476d6e0489a
2022-02-11 22:31:10 +00:00
Treehugger Robot
5796849ac8 Merge "Support multiple library names per target." 2022-02-11 22:17:17 +00:00
Bob Badour
8cbb845e37 Add macros for declaring copied file licenses.
The PRODUCT_COPY_FILES is populated before definitions.mk mapping
source files to installed files that get copied unchanged.

Need to be able to declare license metadata for the copied files such
that similarly named files in different projects can have different
licenses.

Need a macro to convert target names to their corresponding license
metadata.

Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m nothing

Change-Id: Ic244b3525e72b6cd8c4c4305bf5ad430d6e24ccb
2022-02-11 14:10:06 -08:00
Devin Moore
b5195ff5fe Get build.prop for init_boot.img from the ramdisk props
boot.img and init_boot.img get their build properties from the platform
ramdisk properties.

Test: "m dist" then drop the OTA zip file into
android.github.io/analyseOTA to verify init_boot is present.
Bug: 211823573

Change-Id: I411e62bf0fc3cb49d4b12dadb52d9820fca041fa
2022-02-11 18:44:26 +00:00
satayev
2d94586cff Introduce ro.build.version.known_codenames sysprop.
It defines values for Build.VERSION.KNOWN_CODENAMES constant, and should
contain all codenames starting from Q, including current codename
for in development branches.

Bug: 211747008
Test: presubmit
Change-Id: If8995750e369ba39bfc7041580c21b2f96632a78
2022-02-11 13:20:49 +00:00
Xin Li
b3a96bd273 Merge sc-v2-dev-plus-aosp-without-vendor@8084891
Bug: 214455710
Merged-In: Ibcb32225098883b4098807da6468a539e1c41c0c
Change-Id: I408a03e95c0240420c5e5492988abdc4937a0a62
2022-02-11 07:01:21 +00:00
Treehugger Robot
8829ee1440 Merge "Export runtime dependencies in module-info" am: b52c28d026
Original change: https://android-review.googlesource.com/c/platform/build/+/1964821

Change-Id: I0d8d74d1c8945b257cf95f65ca16b3fd0c3decc9
2022-02-11 01:01:13 +00:00
Treehugger Robot
b52c28d026 Merge "Export runtime dependencies in module-info" 2022-02-11 00:56:26 +00:00
Treehugger Robot
1ca13e787e Merge "add dmesgd to base system" am: dda4576d52
Original change: https://android-review.googlesource.com/c/platform/build/+/1979646

Change-Id: I470b693861a683e2d958b452700b02c36cf1b311
2022-02-10 21:04:30 +00:00
Treehugger Robot
dda4576d52 Merge "add dmesgd to base system" 2022-02-10 21:00:55 +00:00
Alexander Potapenko
0015b6953a add dmesgd to base system
Bug: 215095687
Test: run on a user device with injected KFENCE bugs
Change-Id: I7776d96400d46fa31bcd8f04728877402dce1162
2022-02-10 15:46:01 +01:00
Treehugger Robot
8e9b39e061 Merge "Fix signing failure when no entry to convert to store" am: ea586a8d71
Original change: https://android-review.googlesource.com/c/platform/build/+/1978755

Change-Id: I1d311e6a5c0e4bf782d20ed4d00c2b138ac9bd49
2022-02-10 13:10:17 +00:00
Treehugger Robot
ea586a8d71 Merge "Fix signing failure when no entry to convert to store" 2022-02-10 12:53:00 +00:00
Bob Badour
7fda7d3641 Merge "Greater-than zero is more idiomatic." am: 1848cef686
Original change: https://android-review.googlesource.com/c/platform/build/+/1978299

Change-Id: I06406aa42a72c5278bbbeb636c1b3d958005ac23
2022-02-10 10:07:58 +00:00
Bob Badour
1848cef686 Merge "Greater-than zero is more idiomatic." 2022-02-10 09:51:29 +00:00
Treehugger Robot
a1e8783ffd Merge "Add an misc_info.txt entry to customize VABC compression" am: 3c84e5f114
Original change: https://android-review.googlesource.com/c/platform/build/+/1978746

Change-Id: I5c8da2a83a5d55cb55843bd0fd9fc2f7e0cb0097
2022-02-10 09:31:07 +00:00
Treehugger Robot
3c84e5f114 Merge "Add an misc_info.txt entry to customize VABC compression" 2022-02-10 08:41:04 +00:00
Treehugger Robot
c9512971a9 Merge "Add missing LOCAL_ROTATION_MIN_SDK_VERSION" am: 901ee09c90
Original change: https://android-review.googlesource.com/c/platform/build/+/1977691

Change-Id: I9bad6bf57af54170623feb727d84a6728c6a3c4e
2022-02-10 08:26:01 +00:00
yangbill
fa5026c4d8 Export runtime dependencies in module-info
This change exports the list of dependencies that are required by
modules at runtime. Note that only the host case is currently
handled.

Bug: 215243373
Test: m out/target/product/vsoc_x86_64/module-info.json
Change-Id: I05199c54da311e59c7ea87595397ee4eecfab6a3
2022-02-10 08:07:13 +00:00
Treehugger Robot
901ee09c90 Merge "Add missing LOCAL_ROTATION_MIN_SDK_VERSION" 2022-02-10 08:06:01 +00:00
yangbill
10adf32047 Add missing LOCAL_ROTATION_MIN_SDK_VERSION
This definition missing will cause merge conflict which is already in
main branch.

Bug: 215243373
Test: m out/target/product/vsoc_x86_64/module-info.json
Change-Id: Ifc103268aad9d6769822ff1eae4db1cc59aee57e
Merged-In: I3b5e9bb3985c2ae83381499a44b339a7b1deb05c
2022-02-10 08:05:06 +00:00
Akilesh Kailash
6020b9e523 Merge "Enable io_uring feature for virtual A/B OTA" am: 58588768aa
Original change: https://android-review.googlesource.com/c/platform/build/+/1977406

Change-Id: I57e1bdd8cb03b5af2a369a49dd52f282f62dd1c0
2022-02-10 07:49:28 +00:00
Akilesh Kailash
58588768aa Merge "Enable io_uring feature for virtual A/B OTA" 2022-02-10 07:35:42 +00:00
Kelvin Zhang
cdd4c44b43 Merge "Support relative key path in VerifiedBootVersion2VerityImageBuilder" am: b69bcdec29
Original change: https://android-review.googlesource.com/c/platform/build/+/1976677

Change-Id: I9cb8053980392cb659e882608d8fcd92e3f4061a
2022-02-10 04:55:12 +00:00
Kelvin Zhang
b69bcdec29 Merge "Support relative key path in VerifiedBootVersion2VerityImageBuilder" 2022-02-10 04:42:35 +00:00
Android Build Coastguard Worker
d43ab16bfa Version bump to SP2A.220305.011 [core/build_id.mk]
Change-Id: Iba5046b51ebd6fa0efdf0708e670c3a5d173c9df
2022-02-10 00:42:30 +00:00
Kelvin Zhang
70876143b5 Fix signing failure when no entry to convert to store
zip -d doesn't work when no entry names specified. So if the list of
entry is empty, just skip calling zip -d.

Bug: 218438888

Test: th
Change-Id: Ie4419b9d6fdc2780255c6f12f9f4d35e5c0a7b26
2022-02-09 16:07:29 -08:00
Bob Badour
e9b38c175a Greater-than zero is more idiomatic.
Test: m all
Change-Id: I6000d937b98c84226a347b69c69b333a15beb355
2022-02-09 15:56:59 -08:00
Treehugger Robot
2e44a5303c Merge "Fix python3 errors: "TypeError: write() argument must be str, not bytes"" am: 955ee3712d
Original change: https://android-review.googlesource.com/c/platform/build/+/1977398

Change-Id: I07d7bcfa7191408bdc23c4c893aae0c7e932d7cf
2022-02-09 23:51:39 +00:00
Treehugger Robot
955ee3712d Merge "Fix python3 errors: "TypeError: write() argument must be str, not bytes"" 2022-02-09 23:35:22 +00:00
Kelvin Zhang
fa91e98985 Add an misc_info.txt entry to customize VABC compression
Products can define PRODUCT_VIRTUAL_AB_COMPRESSION_METHOD
to specify the compression algorithm they prefer, or "none"
for no compression at all.

Test: th
Change-Id: I4fa27bd2c87b8f46c51023168d079e9b47ce2924
2022-02-09 14:23:16 -08:00
Bob Badour
5028abccb5 Support multiple library names per target.
The prior interface to make supported only a single package name per
target; although, a target might have multiple licenses each with its
own package name.

Bug: 151177513
Bug: 210912771

Test: m all dist
Test: flash; About Phone -> Legal Information -> Third-party licenses
Change-Id: I5cf1964ec18af91ec7e258a1c6722527e3596cf3
2022-02-09 11:56:58 -08:00
Will Burr
0b828a50c7 Merge "envsetup.sh: Update text in lunch menu for clarity" am: 44adfa7f8c
Original change: https://android-review.googlesource.com/c/platform/build/+/1974422

Change-Id: I5ed00a05afc69c1defa6e6c699ad74cef89934d4
2022-02-09 19:46:19 +00:00
Will Burr
44adfa7f8c Merge "envsetup.sh: Update text in lunch menu for clarity" 2022-02-09 19:29:06 +00:00
Oleksiy Avramchenko
166d819fe4 Support relative key path in VerifiedBootVersion2VerityImageBuilder
Otatools archive can be unpacked to an arbitrary directory together
with bundled external/avb/test/data keys. Calling add_img_to_target_files
from a different directory fails to build an image which has
avb_{}_key_path pointing to the bundled key since add_hash_footer
can't find the key file.

Fix this by applying the same logic as in common.AppendAVBSigningArgs.

Steps to reproduce:
$ . build/envsetup.sh && lunch aosp_cf_arm64_phone-userdebug && make dist
$ cd out/dist && rm -rf otatools && unzip otatools.zip -d otatools
$ zip -d aosp_cf_arm64_phone-*target_files*.zip IMAGES/system_other.img
$ otatools/bin/add_img_to_target_files -a -v -p otatools \
    aosp_cf_arm64_phone-target_files-*.zip

Bug: 218531463
Test: manual, see "steps to reproduce" above
Change-Id: Id3f7cf2678e998ef1beda2b6741944c6455c2404
2022-02-09 19:47:18 +01:00
Iavor-Valentin Iftime
756b56125a Fix python3 errors: "TypeError: write() argument must be str, not bytes"
Bug: 186097910

Change-Id: I191c3230596026ee327c1403a6c72fbfa6fdb2d9
2022-02-09 16:02:33 +00:00
Will Burr
404012020f envsetup.sh: Update text in lunch menu for clarity
Updates the lunch menu text to make it clearer that the choices in lunch
menu are not fully comprehensive. As the list comes from common lunch
choices the text now refers to 'common combinations' and informs that
you can 'specify your own'. This should help developers who are unsure
why they cannot find their desired lunch target in the list.

Change-Id: Ib9d55ee46b7037c30a8f4b43fdd552ea66e887e8
Test: source build/envsetup.sh && lunch
2022-02-09 15:25:17 +00:00
Treehugger Robot
08b63fb8fb Merge "system_dlkm: add to the non AB ota" am: 6daac9c78d
Original change: https://android-review.googlesource.com/c/platform/build/+/1978046

Change-Id: Idc556765f087c0a7146df23a8039cde7c407cc69
2022-02-09 06:32:45 +00:00
Treehugger Robot
6daac9c78d Merge "system_dlkm: add to the non AB ota" 2022-02-09 06:18:43 +00:00
Ramji Jiyani
7ecb0ec9f8 system_dlkm: add to the non AB ota
Test: TH
Bug: 200082547
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: Ib43ff411c17a96656a677e3a437e834884a0372f
2022-02-09 02:53:07 +00:00
Bob Badour
f3dce12e6b Merge "Add support for a product name as well as title." am: bcb81e74fe
Original change: https://android-review.googlesource.com/c/platform/build/+/1973030

Change-Id: Ib30928db3aa1d7d4d84a4d79c07c6756cd04aa1d
2022-02-09 02:23:49 +00:00
Bob Badour
bcb81e74fe Merge "Add support for a product name as well as title." 2022-02-09 02:06:05 +00:00