Commit graph

80323 commits

Author SHA1 Message Date
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
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
Treehugger Robot
b65c6a88e9 Merge "Refine VisibleForTesting proguard rules" am: 6666f206e0
Original change: https://android-review.googlesource.com/c/platform/build/+/2173044

Change-Id: I770230e18f614de77054a5f884223dc475af1fd8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 14:39:52 +00:00
Treehugger Robot
6666f206e0 Merge "Refine VisibleForTesting proguard rules" 2022-08-09 14:21:54 +00:00
Yi-yo Chiang
5ea7a5fe86 Merge "Move 'remount' back into 'adbd_system_api'" am: db8b58b2bc
Original change: https://android-review.googlesource.com/c/platform/build/+/2175132

Change-Id: Ib6d66459b16b75285a6be1f08106419616e1a654
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-09 13:05:00 +00:00
Yi-yo Chiang
db8b58b2bc Merge "Move 'remount' back into 'adbd_system_api'" 2022-08-09 12:47:36 +00:00
Cory Barker
eda150c3eb Revert^2 "Updated the way we build AFL++ fuzz binaries"
f3486b1020

Change-Id: Ib81aa706f5f9984b44ffaee7ccafba1728b55e6d
2022-08-08 19:12:02 +00:00
Cory Barker
325d0f806c Merge "Revert "Updated the way we build AFL++ fuzz binaries"" am: 85125778f5
Original change: https://android-review.googlesource.com/c/platform/build/+/2177927

Change-Id: Ic04e4d777791a31253c8ddd257c9e59fb45b4aa6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 16:56:06 +00:00
Cory Barker
85125778f5 Merge "Revert "Updated the way we build AFL++ fuzz binaries"" 2022-08-08 16:37:28 +00:00
Cory Barker
f3486b1020 Revert "Updated the way we build AFL++ fuzz binaries"
Revert "Updated the way we build AFL++ fuzz binaries"

Revert "Updated the way we build AFL++ fuzz binaries"

Revert "Updated the way we build AFL++ fuzz binaries"

Revert submission 2164482-Build AFL from Command line option

Reason for revert: Unit test fails on MAC builds
Reverted Changes:
Ia7a822462:Updated the way we build AFL++ fuzz binaries
I994bde63b:Updated the way we build AFL++ fuzz binaries
Ie863853b4:Updated the way we build AFL++ fuzz binaries
I577d6ae7b:Updated the way we build AFL++ fuzz binaries
Ic4fd34f8d:Updated the way we build AFL++ fuzz binaries

Change-Id: I33a39001d6387fc67bb1d7b5551762d2f145a68d
2022-08-08 15:55:12 +00:00
Cory Barker
5cce2c9570 Merge "Updated the way we build AFL++ fuzz binaries" am: af569e28c5
Original change: https://android-review.googlesource.com/c/platform/build/+/2163803

Change-Id: I1a8ee4506dbc3632d069cfac8b8fe07df1b6977a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-08 14:47:01 +00:00
Cory Barker
af569e28c5 Merge "Updated the way we build AFL++ fuzz binaries" 2022-08-08 14:24:16 +00:00
Changho Shin
040af27bb7 Remove dynamic partition allowlist check
If OEM's custom partitions directly apply to AVB-enabled A/B AOSP-defined partitions, and if those AOSP partitions are configured to be dynamic, that custom partitions should be dynamic as same as the others to catch up with AOSP partitions' changes when product is updated through OTA.
Remove valid dynamic partitions' list since that is no more necessary.

Bug: 238968263
Change-Id: Ic69f4ba58304110932b70d325cbb61ca8a5afee0
2022-08-08 01:30:42 +00:00
Yi-Yo Chiang
0cb64f00f7 Move 'remount' back into 'adbd_system_api'
It was inlined in base_system.mk during the adbd apex bring up phase,
because adbd apex was thought to have broken "required:" dependency.
Now that we have 'adb_system_api' to track the dependencies of adbd, we
can move 'remount' into the phony module.

Bug: 241688845
Test: m adbd_system_api w/ user & userdebug build
Change-Id: I5d7c66c517d5e7022601cc4705a447d5a4ba1be4
2022-08-07 15:52:13 +00:00
Treehugger Robot
2e30eed994 Merge "Add flags to override all apex/apk keys" am: c7cd55bf17
Original change: https://android-review.googlesource.com/c/platform/build/+/2171705

Change-Id: I6c3556e51fa839c078e1eea6f6daa2dd8d6e4024
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-06 04:53:55 +00:00
Treehugger Robot
c7cd55bf17 Merge "Add flags to override all apex/apk keys" 2022-08-06 04:32:53 +00:00
LaMont Jones
1d43c900c4 Merge "move orchestrator/ to its own project." am: 054b2a8333
Original change: https://android-review.googlesource.com/c/platform/build/+/2176164

Change-Id: I87676c9a3c90fd92d9e83de2397f4956d2146b81
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-06 02:16:23 +00:00