Commit graph

31057 commits

Author SHA1 Message Date
Alix
7a4d539e75 Default BuildBrokenClangProperty to empty (false)
Clang property is deprecated. Set up a BUILD_BROKEN_CLANG_PROPERTY
flag so partners can bypass errors from using clang.

Change-Id: I7ec19c3d11086046031108ecccba5065c38fa338
Test: m nothing & Treehugger
2022-08-26 20:05:42 +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
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
Steven Moreland
34570d33f4 Merge "BOARD_VNDK_VERSION always by default" 2022-08-17 18:43:37 +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
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
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
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
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
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
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
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
Steven Moreland
46a6081c43 BOARD_VNDK_VERSION always by default
There is a lot of pending cleanup pending on always having
the VNDK enabled. For instance, when some devices always
build with the core variant, it is impossible to have code
excluded from the system variant, since vendor code on
non-VNDK devices wouldn't be able to build.

This CL merely disables the flag. When it lands, there is a
lot of cleanup that would follow.

Bug: 122954981
Test: ¯\_(ツ)_/¯ removing untested paths
Change-Id: Ia9380fe54729ce1ab37cf0f5e8512be45cd550c7
2022-08-04 16:37:57 +00: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
Jared Duke
9f5007d512 Add jdduke to OWNERS for global Proguard rules
This should help streamline review and approval for targeted updates.

Test: n/a
Change-Id: I2fb4c129b9c10823aa68dc581a394241593dac63
2022-08-03 15:13:14 -07: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
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
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
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