Commit graph

80388 commits

Author SHA1 Message Date
Treehugger Robot
9261a656ca Merge "Move some OTA signing functions to a separte file" 2022-08-23 02:25:59 +00:00
Frederick Mayle
e59a87946f envsetup.sh: partly fix syswrite
The grep doesn't work because "Reboot" is capitalized in the
enable-verity output. Now, syswrite gets farther, but fails before the
final remount.

    $ syswrite
    adbd is already running as root
    Successfully disabled verity
    Enabled overlayfs
    rebooting
    restarting adbd as root
    error: closed

Test: ran syswrite on freshly flashed device
Change-Id: I26aaa6278d76dcab56fd4bde3d70ac7841ae2a3b
2022-08-22 22:40:23 +00:00
Kelvin Zhang
059bf6e50d Move some OTA signing functions to a separte file
This makes it easier for other otatools to re-use these logic without
having to pull in lots of dependencies.

Test: th
Bug: 227848550

Change-Id: I81ed01c5cea4b934a074650731b6f89752221de9
2022-08-22 18:20:14 +00:00
Kelvin Zhang
15b12d099a Merge "set up the salt for partitions without build.prop" 2022-08-22 17:10:12 +00:00
Zhenhuang Wang
415ee12c76 Export test_options.tags to module-info
The test_options.tags attribute modifies execution behavior when running
tests in ATest Bazel mode. Exporting the value to module-info enables
ATest to add them to the corresponding Bazel target.

Bug: 240928948
Test: manually add `test_options.tags` attribute and run:
    $ refreshmod && \
      cat out/target/product/generic/module-info.json |\
      grep <tags>
Change-Id: I1a70d5c66703ed6a5a250459a80e8bca71d659b6
2022-08-22 20:59:54 +08:00
Hung-Wei Chen
8dec280fec Merge "Remove VB related code" 2022-08-22 05:25:07 +00:00
Treehugger Robot
a0827dcb0e Merge "Add project specific definitions.mk files" 2022-08-19 16:06:55 +00:00
hungweichen
49447913f6 Remove unused args from common.py
We are removing support of VB from release tools. This change aims to
remove args that no longer be used.

Bug: 242672222
Test: atest under build/make
Change-Id: I347447ebf1e589f8d3c4c8254f2940911c0be7f1
2022-08-19 06:04:06 +00:00
hungweichen
17c064d1e2 Clean up unused code for VB in verity_utils.py
We are removeing support of VB from release tools. This change aims to
remove code that are unreachable after removeing Version1ImageBuilder.

Bug: 242672222
Test: atest under build/make
Change-Id: Iaae39e4c49045f6c34351140cd43087dabd63e9c
2022-08-19 06:00:30 +00:00
hungweichen
65ba375a8e Remove verity related props from build_image.py
We are removing VB related functionalities from release tools. This
change remove the verity related props in build_image.py, and also
remove VB1.0 bootimage builder, which will be unreachable without these
props.

Bug: 241044073
Test: atest under build/make
Change-Id: Ib3f1c100c2c6c9e63a64f49269619b76074a27fd
2022-08-19 05:57:56 +00:00
Cole Faust
a68f5166fa Move the --config flag in the b command earlier
Having the --config flag at the end of a bazel command
will make it get passed to the command you're running
with b run instead of bazel.

Fixes: 242759256
Test: Manually
Change-Id: I6d23a0b022fdee5f822a873c1578674d1eab39c0
2022-08-18 19:41:43 -07:00
Yong Ma
253b106f95 set up the salt for partitions without build.prop
BUG:242954151

Test: make target-files-package, then check the two sha1 are same:
      1. sha1 of IMAGES/boot.img
      2. expected sha1 of boot in VENDOR/bin/install-recovery.sh

Test: make target-files-package; unzip target_files.zip IMAGES/\*`;
      `zip -d arget_files.zip IMAGES/\*`
      `add_img_to_target_files -a target_files.zip`.
      Verify that the rebuilt images are identical to the deleted ones.

Change-Id: I5906ac1696b6403674fd8330b1569aed53510945
2022-08-19 02:10:01 +00:00
Greg Kaiser
85518aceab Add project specific definitions.mk files
Just like we do with build/tasks/*.mk, we also look for project
specific definitions.mk files.

Test: TreeHugger
Bug: 243024627
Change-Id: I7f07546582eb02bba245a1f927a11efc1ddc3c6f
2022-08-18 12:22:15 -07:00
Josh Gao
8d0b576af6 Set default recovery USB vendor/product IDs.
Add system properties to let vendors customize the recovery/fastbootd
USB IDs.

Test: `adb reboot fastboot && fastboot wait-for-device && lsusb -d 18d1:`
Change-Id: I70881f27d579dd54371f59a6a76f9b1f80ce9b47
2022-08-17 15:00:48 -07:00
Steven Moreland
34570d33f4 Merge "BOARD_VNDK_VERSION always by default" 2022-08-17 18:43:37 +00:00
Alix Espino
065afd42e8 Merge "Updated Changes.md on deletion of clang property" 2022-08-17 13:42:28 +00:00
hungweichen
f1f5dd3011 Remove VB related code
Cleaning up the related references of VB in Makefile

Bug: 241044073
Change-Id: I9e0ec9d433f2e76951c4390f716cf77674174930
2022-08-17 08:52:17 +00:00
Hung-Wei Chen
a7dfb456a1 Merge changes Ifbcde7da,Icee659ff,I267da2d5
* changes:
  Remove verity.mk, verity_key, PRODUCT_VERITY_SIGNING_KEY
  Remove PRODUCT_SUPPORTS_VERITY(_FEC) reference
  Remove BOOT_SIGNER and PRODUCT_SUPPORTS_BOOT_SIGNER
2022-08-17 03:09:20 +00:00
Treehugger Robot
2dca04c64d Merge "Suppress R8 warnings for support library annotations" 2022-08-17 00:07:51 +00:00
Xin Li
c0ec8b6803 Merge "DO NOT MERGE - Merge Android 13" 2022-08-16 19:08:26 +00:00
Trevor Radcliffe
061479c528 Merge "Add note to Changes.md about sysprop changes" 2022-08-16 18:26:32 +00:00
Jared Duke
3ca564b047 Suppress R8 warnings for support library annotations
Most of these annotations are stripped at dex compile-time, and are not
necessarily present in the generated dex library's classpath. As the
classpath is used to inform R8 about `libraryjars`, this can cause
reference failures during R8 execution when warnings are enabled.

For now, suppress the reference warnings. Unrecognized runtime-visible
annotations will still be kept, and this should unblock efforts to
re-enable R8 warnings for many platform targets. A proper solution will
be to ensure the appropriate annotation libs are fed as `-libraryjars`
to R8.

Bug: 242088131
Test: m + `optimize { ignore_warnings: false }`
Change-Id: Ie92db2a9725ff520b311c6b66a50feae79463925
2022-08-16 08:49:36 -07:00
Xin Li
789597a58b DO NOT MERGE - Merge Android 13
Bug: 242648940
Merged-In: Id4aaefbc53b4250b7308701493d151f9408f47f1
Change-Id: Ibbf423b395e45fb552c9d0b993378afac28b4a25
2022-08-15 21:59:09 -07:00
Treehugger Robot
81994f0b27 Merge "Fix a bug in unsigned OTA generation" am: 2abfe5f3a3
Original change: https://android-review.googlesource.com/c/platform/build/+/2185088

Change-Id: Id6180edf4f57ccabe4ffb072a7eebaa4d6f07ccf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-16 02:55:33 +00:00
Treehugger Robot
2abfe5f3a3 Merge "Fix a bug in unsigned OTA generation" 2022-08-16 02:27:34 +00:00
Trevor Radcliffe
c9e72668a0 Add note to Changes.md about sysprop changes
Since it's no longer allowed to depend directly on a sysprop_library
module from a cc module, we should make this known to other
engineers.

Bug: 226199990
Test: N/A
Change-Id: I3a66984abc3ab7b369870c8041a08d788d66b15f
2022-08-15 21:46:07 +00:00
Yifan Hong
f19cd6f89f Merge "Support GKI with non-A/B recovery" am: e6f92d1411
Original change: https://android-review.googlesource.com/c/platform/build/+/2183837

Change-Id: Ieb4ea09d84477f3f14f02a04eac44f3cef7c2ca0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 21:30:31 +00:00
Yifan Hong
e6f92d1411 Merge "Support GKI with non-A/B recovery" 2022-08-15 20:34:10 +00:00
Alix
a9324f04b8 Updated Changes.md on deletion of clang property
Bug: 208980553
Test: None, updating documentation
Change-Id: I1acc4a5055cdc6477224fc852cb882dcd5909fa6
2022-08-15 17:18:06 +00:00
Treehugger Robot
78ca053052 Merge "Add mainline dev certificate dir to config" am: 22907b7777
Original change: https://android-review.googlesource.com/c/platform/build/+/2185338

Change-Id: I1cfbe21e29145e2e8e0d5d70db921147467b3684
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-15 11:25:19 +00:00
Treehugger Robot
22907b7777 Merge "Add mainline dev certificate dir to config" 2022-08-15 11:04:14 +00:00
Xin Li
5bd7543b98 DO NOT MERGE - Skip TP1A.220624.021.A1
Merged-In: I7c8493c902491dd966825f86f50a98e94119501e
Change-Id: I6314a9f5089b194d7c6f8af43b0b792ab7e3c02f
2022-08-12 14:11:27 -07:00
Kelvin Zhang
b9fdf2dc08 Fix a bug in unsigned OTA generation
Caller expects output_file to contain the final OTA, so we must copy
data into that location. Modifying loca variables isn't enough.

Test: make ota with --no_signing
Change-Id: Id4aaefbc53b4250b7308701493d151f9408f47f1
2022-08-12 14:07:31 -07:00
Inseob Kim
7b4d76700d Add mainline dev certificate dir to config
Bug: 33691272
Test: build
Change-Id: Iea4d96ab9c58a1be6d25aff4c0cf91cfc097470e
2022-08-12 21:35:45 +09:00
celeste wang
e3d43208d9 Support GKI with non-A/B recovery
Using BOARD_PREBUILT_BOOTIMAGE instead of TARGET_NO_KERNEL to determine prebuilt boot.img.
So kernel is not excluded from recovery.img.

Bug: 187157581
Change-Id: I4163c8093c52b01d97db3cdb4f9daf840a27c23a
Test: make target-files-package
2022-08-12 08:39:22 +00:00
Rajeev Kumar
6e706d5ef8 Merge "Add per-file OWNERS for Android Go specific files." am: 7cf297a7ed
Original change: https://android-review.googlesource.com/c/platform/build/+/2182777

Change-Id: I21ea85a4d53ae19ca5cbff4f2ef524ba9a5db9d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 18:21:03 +00:00
Rajeev Kumar
7cf297a7ed Merge "Add per-file OWNERS for Android Go specific files." 2022-08-11 18:00:07 +00:00
hungweichen
e3ca398a1e Remove verity.mk, verity_key, PRODUCT_VERITY_SIGNING_KEY
verity.mk is used to set the related variable for VB 1.0 support, but
we already removed VB 1.0. This change removes the unused code. We also
remove and block PRODUCT_VERITY_SIGNING_KEY in this change.

Bug: 241044073
Test: atest under build/make
Change-Id: Ifbcde7da27a931ef3b9d746b1c5a279d88c0ec85
2022-08-11 08:12:58 +00:00
hungweichen
bf11e34897 Remove PRODUCT_SUPPORTS_VERITY(_FEC) reference
PRODUCT_SUPPORTS_VERITY and PRODUCT_SUPPORTS_VERITY_FEC are going to be
deprecated since we removed VB 1.0 support. This change removes the
related references.

Bug: 241044073
Test: atest under build/make
Change-Id: Icee659ff0606cda1ab44e92372d86a394ddf1466
2022-08-11 08:12:58 +00:00
hungweichen
b2dd683421 Remove BOOT_SIGNER and PRODUCT_SUPPORTS_BOOT_SIGNER
These varaibles are going to be deprecated since we removed VB 1.0
support. This change removes the related references. boot.img can be
verified by a AVB 2.0 hash descriptor now.

Bug: 241044073
Test: atest under build/make
Change-Id: I267da2d591525ffc0cabf92791cf66a36ef8ff62
2022-08-11 08:12:58 +00:00
Rajeev Kumar
f852dd7fba Add per-file OWNERS for Android Go specific files.
Bug: N/A
Test: N/A
Change-Id: Idff60019629226119c42906cc832344d6004b688
2022-08-10 20:15:04 -07:00
Treehugger Robot
a5c72ff120 Merge "Add jdduke to OWNERS for global Proguard rules" am: 4b88416c81
Original change: https://android-review.googlesource.com/c/platform/build/+/2174763

Change-Id: I67eada413140bda361e73faa44496ff4337f0476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-11 00:57:03 +00:00
Treehugger Robot
4b88416c81 Merge "Add jdduke to OWNERS for global Proguard rules" 2022-08-11 00:31:46 +00:00
David Anderson
0d4df8b638 Merge "Remove dynamic partition allowlist check" am: 93ff78f3ca
Original change: https://android-review.googlesource.com/c/platform/build/+/2175686

Change-Id: If3936f5194f08919701fa7f4aa78cc1d302cf192
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 04:01:20 +00:00
David Anderson
93ff78f3ca Merge "Remove dynamic partition allowlist check" 2022-08-10 03:20:56 +00:00
Treehugger Robot
2cf5c43709 Merge "Use aapt2" am: 07c507b519
Original change: https://android-review.googlesource.com/c/platform/build/+/2178694

Change-Id: Ifbbbb693b727b44aa42e7f492a7ce55e5333f71e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-10 02:17:45 +00:00
Treehugger Robot
07c507b519 Merge "Use aapt2" 2022-08-10 01:21:11 +00:00
Cory Barker
bbf2a82ee1 Merge "Revert^2 "Updated the way we build AFL++ fuzz binaries"" am: 6a0fbc761e
Original change: https://android-review.googlesource.com/c/platform/build/+/2177768

Change-Id: I9766f0c8b3329304fd4c5273ec0a61f78977240b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 20:14:41 +00:00
Cory Barker
6a0fbc761e Merge "Revert^2 "Updated the way we build AFL++ fuzz binaries"" 2022-08-09 19:49:04 +00:00
Saeid Farivar Asanjan
0b4f8d542f Use aapt2
Replace usage of `$(AAPT)` with `$(AAPT2)`.

Bug: 236602069
Test: m nothing
Change-Id: I079bfe1eebfedda855ff585a20704f4f01c853d6
2022-08-09 16:14:38 +00:00