Commit Graph

31955 Commits

Author SHA1 Message Date
Yike
e4a549195c Export the host_required property to module-info
Some test modules such as `android_test` use the `host_required` attribute to include additional harness dependencies. For example, `CtsLibcoreTestCases` references `cts-dalvik-host-test-runner` in the `host_required` attribute since those jars are required by Tradefed at runtime.

This information needs to present in module_info.json and exported to properly generate Bazel targets that include these runtime dependencies.

Test: m out/target/product/coral/module-info.json
Bug: 220991354
Change-Id: I8d2ab0da04c9f4aff17d290999c69ffe0534729f
2022-06-28 10:10:35 +08:00
Android Build Coastguard Worker
3aaf633e7e Version bump to TP1A.220624.004 [core/build_id.mk]
Change-Id: I5279757e5c0c64f5e9c72c3b8b1bcbb3b10787b7
2022-06-28 01:30:27 +00:00
Bob Badour
40d38b48ec Revert "Revert "Target dist files not dist goals.""
This reverts commit 9f1fad04ce.

Reason for revert: Fixed latent bug in OTA test

This change creates license texts and lists of projects to share for
individual files in dist instead of for dist goals.

If a distribution needs the license texts for part of a dist file or
for a combination of multiple files, whoever is distributing will have
to create a suitable text notice using `gen_notice{}` or `testnotice`
and include it among the dist files for the goal using `dist-for-goals`
or equivalent.

Bug: 151177513
Bug: 210912771
Bug: 235333302
Bug: 232138105
Bug: 235302632

Test: m cts dist

Test: m droid dist

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

Change-Id: I9fbcb07acfa7b14a140563cb031374160b6b23c2
Merged-in: I9fbcb07acfa7b14a140563cb031374160b6b23c2
2022-06-28 01:17:56 +00:00
Vinh Tran
836d78413a Merge "Default BuildBrokenDepfile to empty (false)" 2022-06-27 21:17:27 +00:00
Vinh Tran
3fae6fe0db Default BuildBrokenDepfile to empty (false)
Test: The builds should still pass because all depfile is cleanup in
AOSP
Bug: 179452413

Change-Id: Ifb6f5320f72c3beb44ddd6654100645e0a62e659
2022-06-27 12:05:11 -04:00
Cole Faust
7162b95f83 Deduplicate multiple $(inherit-product) calls
The makefile product inheritance code was supposed
to deduplicate inheritance calls, but there was
a bug in the uniq-word function that caused it
to not work when duplicated words were adjacent.
$(subst |||x|||,||| |||,|||x|||x|||) produces
||| |||x||| instead of ||| ||| |||.

Rewrite the uniq-word function to fix the bug.

This issue was causing a discrepency between
the makefile and starlark based product configurations,
as the starlark implementation didn't have this bug.

Bug: 237019892
Test: ./build/bazel/ci/rbc_dashboard.py --quick on an internal-only product
Change-Id: I543a80746412ffcb9743203399413a0e707111e6
2022-06-24 15:42:46 -07:00
Android Build Coastguard Worker
fbd160844d Version bump to TP1A.220624.003 [core/build_id.mk]
Change-Id: Ifd7cc158b239cd6e8b0cfb0e31e7a4ca7b3f6d4c
2022-06-24 21:10:40 +00:00
Android Build Coastguard Worker
dc356dddec Version bump to TP1A.220624.002 [core/build_id.mk]
Change-Id: Idd3688a71cf7a1cd2e2022e06f0bb39b010f1a20
2022-06-24 02:27:21 +00:00
Android Build Coastguard Worker
484c92b338 Make change and version bump to TP1A.220624.001
Change-Id: I85d4698f1b063d1fd1ecd38d004f6e67ce317600
2022-06-23 23:57:25 +00:00
Paul Duffin
1ccea0574f Do not override setting of SOONG_CONFIG_<m>_module_source_build
(cherry picked from commit dccd189954)

Previously, any setting of SOONG_CONFIG_<m>_module_source_build (where
<m> is one of wifi, uwb or bluetooth) that was made before the
core/android_soong_config_vars.mk was processed would be replaced with
false. This change will only set them to false if they have not been
previously set.

Bug: 233965247
Test: m nothing
      # After setting SOONG_CONFIG_wifi_module_source=true before this
      # code. Without this change out/soong/soong.variables uses false
      # for the wifi_module/module_source config variable. With this
      # change it uses true.
Merged-In: I1dffeb055a68250f574630d4ef5fedc51bad4a2b
Change-Id: I1dffeb055a68250f574630d4ef5fedc51bad4a2b
2022-06-23 18:09:38 +00:00
Paul Duffin
3fe93e03ae Do not override setting of SOONG_CONFIG_<m>_module_source_build am: dccd189954
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/19033310

Change-Id: If2316cd395be01e1e26ea54cb6a46af706267207
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-23 18:05:10 +00:00
Paul Duffin
dccd189954 Do not override setting of SOONG_CONFIG_<m>_module_source_build
Previously, any setting of SOONG_CONFIG_<m>_module_source_build (where
<m> is one of wifi, uwb or bluetooth) that was made before the
core/android_soong_config_vars.mk was processed would be replaced with
false. This change will only set them to false if they have not been
previously set.

Bug: 233965247
Test: m nothing
      # After setting SOONG_CONFIG_wifi_module_source=true before this
      # code. Without this change out/soong/soong.variables uses false
      # for the wifi_module/module_source config variable. With this
      # change it uses true.
Change-Id: I1dffeb055a68250f574630d4ef5fedc51bad4a2b
2022-06-23 13:19:00 +00:00
Android Build Coastguard Worker
6bae6fd354 Make change and version bump to TP1A.220623.001
Change-Id: If503be39fa66c27867ee33a97a8aa39a0d61964f
2022-06-22 23:57:06 +00:00
Jared Duke
1b9e2fc3be Merge "Enable R8 code shrinking for system_server by default" am: 88aaae3547 am: 2a86e4515f
Original change: https://android-review.googlesource.com/c/platform/build/+/2123992

Change-Id: I94dbaf93c65d0b19b9852a069f441887f3ac66ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 21:46:37 +00:00
Jared Duke
88aaae3547 Merge "Enable R8 code shrinking for system_server by default" 2022-06-22 20:55:58 +00:00
Android Build Coastguard Worker
7bd9da45b5 Make change and version bump to TP1A.220622.001
Change-Id: Ib1a090dc8abfa1dc013531b92698d2b640c885c6
2022-06-21 23:57:56 +00:00
Bob Badour
1f459d6e5b Merge "Revert "Target dist files not dist goals."" am: e900707ee0 am: fca91ffc2d
Original change: https://android-review.googlesource.com/c/platform/build/+/2132642

Change-Id: Ibf86437c5e11209ebaf0a368f1474976f5f7d961
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 23:10:33 +00:00
Bob Badour
e900707ee0 Merge "Revert "Target dist files not dist goals."" 2022-06-21 22:31:48 +00:00
Bob Badour
9f1fad04ce Revert "Target dist files not dist goals."
This reverts commit 0b907f3944.

Reason for revert: Possible cause of b/236556224

Bug: 236556224

Change-Id: I2faefbdf58202d0033bee15a2eda7a75e44a1bec
2022-06-21 22:27:59 +00:00
Jared Duke
b11b1d2437 Enable R8 code shrinking for system_server by default
Flip the setting that controls R8 shrinking for system_server from
opt-in to opt-out. This can be controlled by vendor makefiles and from
the command-line using the `SYSTEM_OPTIMIZE_JAVA` boolean build flag.

Note that this change only enables code shrinking for system_server,
and should not impact stack traces except for certain stack frames
involving synthetics.

Additional (vendor) code that is loaded dynamically into
system_server, that references system_server code, should use
system_server APIs that are expicitly annotated with
`@android.annotation.SystemApi`.

Additional (vendor) code added directly to services.jar,
which doesn't fall into existing keep patterns in the services
proguard.flags configuration and would otherwise be stripped, should be
annotated with `@com.android.internal.annotations.Keep`.

Results: services.jar (20MB -> 17MB)

Bug: 210510433
Test: atest
  CtsInstalledLoadingProgressHostTests
  CtsAutoFillServiceTestCases
  CtsAppSecurityHostTestCases
  CtsAppTestCases
Change-Id: Icc77c9451d9a4a83e02cb591693354988f8d0ec4
2022-06-21 20:34:51 +00:00
Jiyong Park
b006f84df7 Merge "Export PLATFORM_VERSION_KNOWN_CODENAMES to soong" am: 8be3eced81 am: 63a47a693e
Original change: https://android-review.googlesource.com/c/platform/build/+/2132214

Change-Id: Icceba2b3a0bc33601f4f5f5c39bbb4698846da35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 17:34:21 +00:00
Jiyong Park
8be3eced81 Merge "Export PLATFORM_VERSION_KNOWN_CODENAMES to soong" 2022-06-21 16:54:26 +00:00
Anton Hansson
ce02daa32b Merge "Fix typo" am: 0f079826a1 am: a00e17c412
Original change: https://android-review.googlesource.com/c/platform/build/+/2129256

Change-Id: I560cbea327b27a96639d1b7a49a6d149da0cad58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-21 13:46:30 +00:00
Anton Hansson
0f079826a1 Merge "Fix typo" 2022-06-21 13:14:33 +00:00
Jiyong Park
2e057215b9 Export PLATFORM_VERSION_KNOWN_CODENAMES to soong
Bug: 236602028
Test: watch TH
Change-Id: Ieb156dfb363e58ef4949cf5a340b3011f310097f
2022-06-21 10:12:24 +09:00
jiajia tang
7c8dd8c3d4 Fix typo
As title

Signed-off-by: jiajia tang <tangjiajia@xiaomi.com>
Change-Id: I40b155ceed8e88fecf25da5dd13a2fb146faf263
2022-06-21 00:21:45 +00:00
Android Build Coastguard Worker
69ab106507 Make change and version bump to TP1A.220621.001
Change-Id: I060d8b62e471ca97a838a169ba6386052bc580e2
2022-06-20 23:57:25 +00:00
Treehugger Robot
7669d15025 Merge "Merge SQ3A.220605.009" 2022-06-20 13:36:04 +00:00
Android Build Coastguard Worker
5008261ba2 Make change and version bump to TP1A.220619.001
Change-Id: Ib0c0673abc0c266c697e3ba8c90a8a776f28dac2
2022-06-18 21:57:51 +00:00
Android Build Coastguard Worker
dc66f905e0 Make change and version bump to TP1A.220618.001
Change-Id: I20627c62adeef67ab77d7a6ec74f466e4cdc5015
2022-06-18 01:57:35 +00:00
Treehugger Robot
9cdd1830b3 Merge "Target dist files not dist goals." am: 2c2f75b2c1 am: 0c3fb0a262
Original change: https://android-review.googlesource.com/c/platform/build/+/2128475

Change-Id: Ie1555a418a305de9a0ac34d451949d9c24e1f31f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-18 01:33:13 +00:00
Treehugger Robot
2c2f75b2c1 Merge "Target dist files not dist goals." 2022-06-18 00:59:56 +00:00
Bob Badour
96e20b45fd Merge "Revert "Revert "Record license text for every dist target.""" am: d9e88135ec am: 722ab4a551
Original change: https://android-review.googlesource.com/c/platform/build/+/2124808

Change-Id: Icce2421cd424d099c02f40cdd92fa5c33d739a7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:58:52 +00:00
Treehugger Robot
d385eb71cd Merge "Inline some variables that are only used in 1 place" am: a2ed2629c6 am: 8ee99853c3
Original change: https://android-review.googlesource.com/c/platform/build/+/2128120

Change-Id: I4bc925cf9dddd10e5824b8f8b16afca03338a9a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 20:32:05 +00:00
Bob Badour
d9e88135ec Merge "Revert "Revert "Record license text for every dist target.""" 2022-06-17 20:24:21 +00:00
Bob Badour
0b907f3944 Target dist files not dist goals.
It turns out dist goals do not map well to units of code distributed.
They often build a combination of files to distribute and files for
internal use only.

This change creates license texts and lists of projects to share for
individual files in dist instead of for dist goals.

If a distribution needs the license texts for part of a dist file or
for a combination of multiple files, whoever is distributing will have
to create a suitable text notice using `gen_notice{}` or `testnotice`
and include it among the dist files for the goal using `dist-for-goals`
or equivalent.

Bug: 151177513
Bug: 210912771
Bug: 235333302
Bug: 232138105
Bug: 235302632

Test: m cts dist

Test: m droid dist

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

Change-Id: Id78f032575a2ac1a3cc70643b3ae4d2e6c32da04
2022-06-17 13:11:22 -07:00
Anton Hansson
670fed3df4 Merge "Don't exclude docs build from using prebuilts" 2022-06-17 16:56:32 +00:00
Android Build Coastguard Worker
39675fb7f3 Version bump to TP1A.220617.003 [core/build_id.mk]
Change-Id: I6ad181f68a4027aa023f4ae9b9e9ef27cfbde00f
2022-06-17 14:47:11 +00:00
Android Build Coastguard Worker
ee6b08e1a2 Version bump to TP1A.220617.002 [core/build_id.mk]
Change-Id: I40d6f95886baf91e954c38460e6227f7997432a3
2022-06-17 06:29:23 +00:00
Xin Li
26a43c5e24 Merge SQ3A.220605.009
Bug: 236045730
Merged-In: Iac5d1f2b0c48bf5ff7dc89d00d49944e764cec5c
Change-Id: Ibb3c3083d8d57179f37dd12547b036fa2af6c46d
2022-06-16 22:36:08 -07:00
Treehugger Robot
a2ed2629c6 Merge "Inline some variables that are only used in 1 place" 2022-06-17 04:54:43 +00:00
Bassem Khalife
455ec3075a Update Security String to 2022-08-05 am: 9f2be867c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18911707

Change-Id: I11c9815c01461fb331e068ca55b2eca4c160a06d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-17 00:07:04 +00:00
Android Build Coastguard Worker
97c82ef1ac Make change and version bump to TP1A.220617.001
Change-Id: Ie915740eb8585047c3f572cf0a96f0b9383dff4b
2022-06-17 00:06:40 +00:00
Android Build Coastguard Worker
67599aa5f3 Make change and version bump to TP1A.220616.001
Change-Id: If2d02ef246a80ca94af9440a9d997294301fcf50
2022-06-15 23:57:36 +00:00
Cole Faust
8fc7befdbb Inline some variables that are only used in 1 place
Test: Presubmits
Change-Id: Ic72fdb6c401f345ecfcaacb0179a9a3cd6a13e9d
2022-06-15 16:10:49 -07:00
Bassem Khalife
9f2be867c4 Update Security String to 2022-08-05
Bug: 232157623
Change-Id: Ief202c2f8b37d686397560df599d2143d763ba65
2022-06-15 21:58:56 +00:00
Bob Badour
dce80abbe3 Revert "Revert "Record license text for every dist target.""
This reverts commit 1e27f4fff9.

Reason for revert: Rolling forward again without 'all' target.

Bug: 151177513
Bug: 210912771
Bug: 235333302
Bug: 232138105

Test: m droid dist reportmissinglicenses

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

Change-Id: I392047ec50ac6e74b9accf260c62e77aef1640d5
2022-06-15 13:06:18 -07:00
Anton Hansson
18f349b4fc Merge "Don't exclude docs build from using prebuilts" into tm-dev am: 29ae21ebb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/18886329

Change-Id: I29f6b344b3edf6b7740f6cfd10b304cd1ea6a786
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 18:19:23 +00:00
Anton Hansson
c9a5d76f32 Don't exclude docs build from using prebuilts
Even though it doesn't have google modules in PRODUCT_PACKAGES,
the docs build wants to use prebuilts when the rest of the branch
does.

Bug: 230478310
Test: m docs (inspect MODULE_BUILD_FROM_SOURCE)
Merged-In: I1d67f4099e9fdc5fbaeeb0bf0fce80aa91c05eb5
Change-Id: I1d67f4099e9fdc5fbaeeb0bf0fce80aa91c05eb5
2022-06-15 17:59:49 +00:00
Anton Hansson
29ae21ebb7 Merge "Don't exclude docs build from using prebuilts" into tm-dev 2022-06-15 17:59:25 +00:00