Commit graph

80285 commits

Author SHA1 Message Date
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
LaMont Jones
054b2a8333 Merge "move orchestrator/ to its own project." 2022-08-05 23:48:00 +00:00
LaMont Jones
4bcca6d8d3 move orchestrator/ to its own project.
Bug: 240497793
Test: manual
Change-Id: I8eafae946fbf5113b1d4ff4ebbd19aeb14cc2970
2022-08-04 21:23:20 +00:00
LaMont Jones
d2655af162 Merge "orchestrator: inner-tree path can be a list." am: ef1d2f06c6
Original change: https://android-review.googlesource.com/c/platform/build/+/2138856

Change-Id: I75c88dcbbac1caf69727a08c400679909aa7c968
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 17:05:53 +00:00
LaMont Jones
ef1d2f06c6 Merge "orchestrator: inner-tree path can be a list." 2022-08-04 16:44:22 +00:00
Treehugger Robot
8b3e144aac Merge "Disable OMX for 64b_only devices." am: ffa1f0fff0
Original change: https://android-review.googlesource.com/c/platform/build/+/2174762

Change-Id: I342fbb265e234878b3b444fce135ac75ff1cf0e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-04 01:54:26 +00:00
Treehugger Robot
ffa1f0fff0 Merge "Disable OMX for 64b_only devices." 2022-08-04 01:25:36 +00:00
TreeHugger Robot
d6aa292d7a Merge "DO NOT MERGE - Skip TP1A.220624.014" into stage-aosp-master 2022-08-04 01:01:04 +00:00
Xin Li
bbe5167ead DO NOT MERGE - Skip TP1A.220624.014
Merged-In: Idbff6d854ddb9df5b5936a45a822d63a7445deee
Change-Id: Iabc20d61c093bd2af4084c7ab9e9136c1f66d984
2022-08-03 16:08:33 -07:00
Jooyung Han
be6142cf10 Merge "Add WIFI_ variables into soong config" am: 6ef204ea4e
Original change: https://android-review.googlesource.com/c/platform/build/+/2173508

Change-Id: I217bacf1dee0b34ac043ef4d7d388b27e85e1858
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-03 23:02:01 +00:00
Jooyung Han
6ef204ea4e Merge "Add WIFI_ variables into soong config" 2022-08-03 22:41:01 +00:00
Arun Johnson
628d5665b1 Disable OMX for 64b_only devices.
bug: 239224744
Change-Id: I14364de9ef7fa3fcd6ce035eb596ac507be3e641
2022-08-03 21:36:41 +00:00
LaMont Jones
c39e502774 orchestrator: inner-tree path can be a list.
Shared trees are supported by specifying the inner-tree as a list in the
mcombo file.  This change enables that work.

Bug: None
Test: manual, unittests pass

Change-Id: I161d707d0aada66d134b49b158bf538f0e2a2572
2022-08-03 20:51:04 +00:00
Jared Duke
97a9903c3e Refine VisibleForTesting proguard rules
Both androidx (Jetpack) and com.google.common (Guava) define
@VisibleForTesting annotations. These are used within these libraries
for test purposes, but have also been adopted throughout the platform
for platform-specific test code. Consequently, the current keep
rules end up keeping not only platform test code, but also library test
code that isn't actually needed.

Refine these rules by restricting VisibleForTesting-annotated keep
rules to include code *outside* of Jetpack/Guava. A longer term
solution will involve migrating away from these annotations toward
the platform-defined @TestApi and internal @VisibleForTesting variants.
Note that platform code using the androidx* and c.g.common*-defined
@VisibleForTesting annotations will still be kept.

This saves about ~11MB of dex code from platform apps/services.

Bug: 239961360
Test: m + validate dex changes for shrunk packages (SystemUI/Launcher)
Change-Id: Icd70090e615b72a2cfb9ce8c43edb17cb46e05e2
2022-08-03 08:35:45 -07:00
Jooyung Han
0140dfa4b3 Add WIFI_ variables into soong config
To migrate libwifi-hal module from make to soong, WIFI_ make variables
are added to soong config variables in `wifi` namespace.

Bug: 239984067
Test: m libwifi-hal
Merged-In: If60f5909619af887be8e0086a8dfef65dc97cce0
Change-Id: If60f5909619af887be8e0086a8dfef65dc97cce0
(cherry picked from commit 4abb3d43b4baf74cf7b17fee380d5b4c77a2bc9d)
2022-08-03 17:46:07 +09:00
Alexander Smundak
a77df0c808 Merge "Fix go.mod for tools/canoninja" am: 5cf8217978
Original change: https://android-review.googlesource.com/c/platform/build/+/2171782

Change-Id: I3cad683736ec403fbcb1fc0899ee6898480e372e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 23:02:55 +00:00
Alexander Smundak
5cf8217978 Merge "Fix go.mod for tools/canoninja" 2022-08-02 22:55:16 +00:00
Treehugger Robot
81421fe772 Merge "Revert "Revert "Fix missing notices.""" am: e2325f0ef6
Original change: https://android-review.googlesource.com/c/platform/build/+/2172708

Change-Id: I85f7975e53db2fa982d0baae50fb26bc6ac3d543
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 22:55:01 +00:00
Treehugger Robot
e2325f0ef6 Merge "Revert "Revert "Fix missing notices.""" 2022-08-02 22:31:57 +00:00
Bob Badour
56e0de5784 Revert "Revert "Fix missing notices.""
This reverts commit 18f8049da1.

Reason for revert: Roll forward with fix

Fix missing notices.

Move ALL_DEFAULT_INSTALLED_MODULES assignments back into Makefile

Fix typos DLMK -> DLKM

Bug: 240582127

Test: m droid dist

Test: tapas google-tradefed-all && m dist

Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_x86 TARGET_BUILD_VARIANT=eng droid dist checkbuild

Test: build/soong/soong_ui.bash --make-mode TARGET_PRODUCT=aosp_x86_64 TARGET_BUILD_VARIANT=userdebug droid dist checkbuild

Change-Id: If780669602c459c337585e9d2c4915b28844e2bb
Merged-in: If780669602c459c337585e9d2c4915b28844e2bb
2022-08-02 13:11:20 -07:00
Kelvin Zhang
e50bb51fa9 Add flags to override all apex/apk keys
Currently, if we want to override all apex/apk key, we must specify all apk/apex names exhaustively. This causes CLI arguments to be very long and sometimes exceeds OS's limit.

Test: run signing test locally on build 8862875 on git_master
Bug: 239991438
Change-Id: Idbd3b7eef9b2a27236f4ca7a27449fcdf0d2dd3f
2022-08-02 18:32:38 +00:00
Bob Badour
8ddadca927 Merge "Revert "Fix missing notices."" am: 7ec578b20a
Original change: https://android-review.googlesource.com/c/platform/build/+/2172705

Change-Id: Ib5e76e016f7cc4263dc3efd807e115f22003ea70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 17:47:48 +00:00
Treehugger Robot
79e45e727a Merge "Append built and installed when copying metadata." am: 3fe9459268
Original change: https://android-review.googlesource.com/c/platform/build/+/2169434

Change-Id: Ib2e6411981a213d7e477e105d8efd6783c346f07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 17:47:13 +00:00
Treehugger Robot
53d7adcba3 Merge "Tune R8 shrinking defaults for system_server" am: 08a46cda1b
Original change: https://android-review.googlesource.com/c/platform/build/+/2169486

Change-Id: I6095b857e17f2142dc99b7d90291b84ea1bbae4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-08-02 17:45:45 +00:00
Bob Badour
7ec578b20a Merge "Revert "Fix missing notices."" 2022-08-02 17:38:39 +00:00
Treehugger Robot
3fe9459268 Merge "Append built and installed when copying metadata." 2022-08-02 17:25:58 +00:00
Treehugger Robot
08a46cda1b Merge "Tune R8 shrinking defaults for system_server" 2022-08-02 17:21:18 +00:00
Henri Chataing
18f8049da1 Revert "Fix missing notices."
This reverts commit 8ef21add49.

Reason for revert: Potential build breakage aosp_x86_64-userdebug, aosp_x86-eng

Bug: 241113403

Change-Id: Ia10a6d43528feb00f874fe80b8aa9ab1aa4ebff2
2022-08-02 17:03:43 +00:00
Treehugger Robot
b192a54ab7 Merge "Fix missing notices." am: d7e72a7e0d
Original change: https://android-review.googlesource.com/c/platform/build/+/2171783

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