Commit Graph

73533 Commits

Author SHA1 Message Date
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
58588768aa Merge "Enable io_uring feature for virtual A/B OTA" 2022-02-10 07:35:42 +00:00
Kelvin Zhang
b69bcdec29 Merge "Support relative key path in VerifiedBootVersion2VerityImageBuilder" 2022-02-10 04:42:35 +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
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
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
bcb81e74fe Merge "Add support for a product name as well as title." 2022-02-09 02:06:05 +00:00
Treehugger Robot
a95befe008 Merge "Pass --makefile_list to rbc board configuration" 2022-02-08 20:06:45 +00:00
Akilesh Kailash
f72860ce18 Enable io_uring feature for virtual A/B OTA
snapuserd: Use io_uring READ/WRITE opcodes for snapshot merge.
Specifically, it is used only for readahead and ordered ops
code path.

    Snapshot merge perf:

    ===========================================================

    Incremental OTA of 300M between two git_master branches on Pixel 6:

    ===========================================================

    On Android S (with dm-snapshot): ~15 minutes:

    update_engine: [INFO:cleanup_previous_update_action.cc(330)] Merge finished with state MergeCompleted.
    update_engine: [INFO:cleanup_previous_update_action.cc(130)] Stopping/suspending/completing CleanupPreviousUpdateAction
    update_engine: [INFO:cleanup_previous_update_action.cc(501)] Reporting merge stats: MergeCompleted in 926508ms (resumed 0 times), using 0 bytes of COW image.

    ===========================================================

    On Android T (with io_uring: ~38 seconds):

    update_engine: [INFO:cleanup_previous_update_action.cc(330)] Merge finished with state MergeCompleted.
    update_engine: [INFO:cleanup_previous_update_action.cc(130)] Stopping/suspending/completing CleanupPreviousUpdateAction
    update_engine: [INFO:cleanup_previous_update_action.cc(501)] Reporting merge stats: MergeCompleted in 38868ms (resumed 0 times), using 0 bytes of COW image.

    ===========================================================

Bug: 202784286
Test: Full/Incremental OTA
Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: Ia6efff32898cdc6b683ca49c233ef45e8cd732e7
2022-02-08 20:00:39 +00:00
Treehugger Robot
ab26e67abc Merge "Merge SQ1A.220205.002" 2022-02-08 18:52:08 +00:00
Jooyung Han
3a61599999 Merge "A custom APEX signing tool with --signing_args" 2022-02-08 11:23:24 +00:00
Anton Hansson
de88a91b43 Merge "Fix typos in telephony_vendor product makefile" 2022-02-08 09:43:31 +00:00
Xin Li
849ad3ba72 Merge SQ1A.220205.002
Bug: 213904741
Merged-In: Ifcc54fbdb18bb480e73c2f52ebefd968b52a1e27
Change-Id: I880096a3272bb9ae5b95e7f9b507b464b5aec856
2022-02-07 23:16:55 -08:00
Treehugger Robot
2624cfa2dc Merge "Update default system Proguard config rules" 2022-02-08 05:35:04 +00:00
Pirama Arumuga Nainar
9335286372 Merge "Add GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE to third-party code" 2022-02-08 05:01:59 +00:00
Treehugger Robot
c438d9aaca Merge "Update APK parser to be compatible with new signer output" 2022-02-08 04:25:02 +00:00
Treehugger Robot
f6cd3a1ddd Merge "Fix small misuse of pass" 2022-02-08 03:42:12 +00:00
Kelvin Zhang
846f285d55 Update APK parser to be compatible with new signer output
Test: th
Bug: 218304082
Change-Id: If79ffdb1e4cec192ef796a39dd0ed5b38bc430e0
2022-02-07 16:38:09 -08:00
Kelvin Zhang
9d021e996b Fix small misuse of pass
The intention is to skip current iteration of for loop, so 'continue'
should be used instead of 'pass'

Test: th
Change-Id: Ic955beeaef74100981b351e2e7807c7fde538783
2022-02-07 16:38:09 -08:00
Cole Faust
1bcdd24ad9 Pass --makefile_list to rbc board configuration
So that mk2rbc will just read from the file instead
of searching the source tree for makefiles.

Bug: 213508006
Test: m RBC_BOARD_CONFIG=1 nothing
Change-Id: I6b7e2aa000ad9861173c58cc06f6d49c9c11a0a7
2022-02-07 15:17:55 -08:00
Kelvin Zhang
691f8b93c7 Merge "Store EROFS images uncompressed" 2022-02-07 20:55:51 +00:00
Jared Duke
df60c0bb14 Update default system Proguard config rules
Use the `includedescriptorclasses` modifier with the native keep rules
to ensure native method signatures remain preserved. This matches
common native Proguard rules used elsewhere.

Bug: 196084106
Test: m + presubmit
Change-Id: Ie413459ad0f65ce6b8cd6eb34318494c12568c5e
2022-02-07 10:54:51 -08:00
DarkJoker360
db4e956dc1 Fix typos in telephony_vendor product makefile
- Remove blank PRODUCT_COPY_FILES

Change-Id: I4c8a19565dc09a802e630d3b057522b3a3ee1cbd
2022-02-07 19:14:23 +01:00
Jordan Demeulenaere
d183371cda Merge "Revert "Add a core configuration that disables the zygote."" 2022-02-07 14:53:40 +00:00
Jordan Demeulenaere
fe3d2e672a Revert "Add a core configuration that disables the zygote."
Revert submission 1964759-master-I4f918502e611e950fa039e4e2ed817c97b928ba2

Reason for revert: b/217993447
Reverted Changes:
I4f918502e:Add a core configuration that disables the zygote....
I4f918502e:Add a core configuration that disables the zygote....
I4f918502e:Add a core configuration that disables the zygote....

Change-Id: I5d51a021fea89a0ab6c73349d93117d60cfc9350
2022-02-07 09:05:29 +00:00
Jooyung Han
39259ec1a4 A custom APEX signing tool with --signing_args
apex_utils.SignApex() has `signing_args` argument which is supposed to
be passed to avbtool to set `--signing_helper` or
`--signing_helper_with_files`.

A custom APEX signing tool which relies on avbtool's signing should pass
the same arguments when signing_args is set.

This change passes signing_args verbatim to the custom APEX signing tool
via --signing_args argument.

Bug: 216971834
Test: tbd
Change-Id: I8aaec9440c4536e11e1e4a1dd4ae5f4fe32d4f23
2022-02-07 15:56:53 +09:00
Pirama Arumuga Nainar
d6b0a87ed7 Add GLOBAL_CLANG_EXTERNAL_CFLAGS_NO_OVERRIDE to third-party code
Bug: http://b/215753485

This allows enabling a new warning from the compiler update for
first-party code.  This is less precise than the check in build/soong
(also overrides for vendor/google, for e.g.) because of being written in
Make.

Test: With new clang, verify the following:
    lunch oriole;
    m out/target/product/oriole/obj_arm/SHARED_LIBRARIES/libexynosdisplay_intermediates/libresource/ExynosMPP.o
Change-Id: I13080fec71e282c4b528a6d01b967b1c0c4aef02
2022-02-05 13:50:41 -08:00
Treehugger Robot
fb9ec40e65 Merge "Add a core configuration that disables the zygote." 2022-02-04 23:52:33 +00:00
Bob Badour
49dd4f75ff Add support for a product name as well as title.
Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m all
Test: m systemlicense
Test: m htmlnotice; out/soong/host/linux-x85/htmlnotice ...
Test: m textnotice; out/soong/host/linux-x85/textnotice ...
Test: m xmlnotice; out/soong/host/linux-x85/xmlnotice ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: Id5b2ebe3752081e3a89bba1d717cf103f7846043
2022-02-04 14:50:59 -08:00
Bob Badour
339edb60d2 Merge "Regularize command-line flags." 2022-02-03 03:29:20 +00:00
Kelvin Zhang
3b72e28421 Merge "Add zhangkelvin@ as owner for release tools scripts" 2022-02-03 03:05:34 +00:00
Bob Badour
a822469f2a Merge "license metadata xml notice files" 2022-02-03 03:04:50 +00:00
Bob Badour
682e1bae57 Regularize command-line flags.
All the notice binaries have -title

All the binaries that can -stripPrefix can strip multiple.

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

Test: m all
Test: m systemlicense
Test: m bom; out/soong/host/linux-x85/bom ...
Test: m dumpgraph; out/soong/host/linux-x85/dumpgraph ...
Test: m dumpresolutions; out/soong/host/linux-x85/dumpresolutions ...
Test: m htmlnotice; out/soong/host/linux-x85/htmlnotice ...
Test: m rtrace; out/soong/host/linux-x85/rtrace ...
Test: m textnotice; out/soong/host/linux-x85/textnotice ...
Test: m xmlnotice; out/soong/host/linux-x85/xmlnotice ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: I08357bf1adb048abba6563cf3cea6ee6d60405e0
2022-02-02 15:32:50 -08:00
Bob Badour
f87922450e license metadata xml notice files
Introduce the below command-line tool:

xmlnotice outputs a NOTICE.xml file constructed from the license
texts of the transitive closure of dependencies.

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

Test: m all
Test: m systemlicense
Test: m xmlnotice; out/soong/host/linux-x85/xmlnotice ...

where ... is the path to the .meta_lic file for the system image. In my
case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: I267effd3a1c1b981bcdc5e058dce561a2d4a7948
2022-02-02 15:32:50 -08:00
Kelvin Zhang
834f5d458f Store EROFS images uncompressed
Test: th
Change-Id: I53005bee139079afe25da231ca1d42f03fa010a5
2022-02-02 12:52:34 -08:00
Kelvin Zhang
4f8f972a5b Add zhangkelvin@ as owner for release tools scripts
Change-Id: Ic861bc11d6a7d80c0d22a05ce35998753bb60752
2022-02-02 12:52:34 -08:00
Treehugger Robot
ef25de413e Merge "core & tools: system_dlkm: add dynamic partition" 2022-02-02 06:04:07 +00:00
Treehugger Robot
91e4f9db50 Merge "Add support for gzipping html output." 2022-02-02 04:32:05 +00:00
Bob Badour
608bdff0a7 Add support for gzipping html output.
Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m all
Test: m systemlicense
Test: m htmlnotice; out/soong/host/linux-x85/htmlnotice ...

where ... is -o=html.gz followed by the path to the .meta_lic file for
the system image. In my case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

the rest of ... can be expressed as:

${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: I7a42d5186876609a401956754e3dcff64211fb15
2022-02-01 15:35:40 -08:00
Baligh Uddin
1a95fc381c Merge "Move pvmfw.img to PREBUILT_IMAGES temporarily" 2022-02-01 19:49:15 +00:00
Baligh Uddin
ed1041b8a2 Merge "Rename BUILT_PVMFWIMAGE_TARGET to PREBUILT_..." 2022-02-01 19:48:53 +00:00
Pierre-Clément Tosi
4bbb8dd86d Move pvmfw.img to PREBUILT_IMAGES temporarily
Move the image to PREBUILT_IMAGES to avoid breaking release key signing.

Bug: 216975821
Test: -
Change-Id: I686c6fec73a8383c10b17ab2af90767311cbae78
2022-02-01 15:06:26 +01:00
Pierre-Clément Tosi
37aa7e48c2 Rename BUILT_PVMFWIMAGE_TARGET to PREBUILT_...
Avoid the name as it is currently confusing given that we're not
actually building the image.

Bug: 216975821
Test: -
Change-Id: Ifac7047e72f590d6acb3997efa20f5f348e39491
2022-02-01 15:06:19 +01:00
Treehugger Robot
6ebf02914c Merge changes I40a05866,Id3d6e701
* changes:
  license metadata reverse trace
  Fix copy+paste error.
2022-02-01 01:25:59 +00:00
Treehugger Robot
133e2651a5 Merge "Track dependencies when reading notice files" 2022-01-31 23:34:59 +00:00
Bob Badour
c817845ea5 license metadata reverse trace
Introduce the below command-line tool:

rtrace outputs a list of targets and conditions causing one or more
projects or target nodes to require sharing to resolve a restricted
condition.

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

Test: m all
Test: m systemlicense
Test: m rtrace; out/soong/host/linux-x85/rtrace -rtrace=...

where ... is a project or license metadata file followed by the path to
the .meta_lic file for the system image. In my case if

$ export PRODUCT=$(realpath $ANDROID_PRODUCT_OUT --relative-to=$PWD)

... can be expressed as:

system/core ${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic
or
${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic ${PRODUCT}/gen/META/lic_intermediates/${PRODUCT}/system.img.meta_lic

Change-Id: I40a0586699d9b8a8dd2bd4ba26756c9649ebf964
2022-01-31 14:16:23 -08:00