Commit graph

76632 commits

Author SHA1 Message Date
Håkan Kvist
3db1ef61de Only enable zucchini if configuration file exists
Only enable zucchini if configuration file zucchini_config.txt exits
in target files and version in source and target is the same.

Without this patch zucchini would be enabled if configuration file
was missing from both target files.

Bug: 231204699
Test: Run ota package generation with zucchini_config.txt missing from
      both source and target zips. Confirm that zucchini is disabled.
Change-Id: Ia34998fd911d5860b38fe49fa5a88056a22d661e
2022-05-03 13:00:32 +02:00
Treehugger Robot
fbfd46e545 Merge "Expose GetRamdiskFormat and use in ota_utils.py" am: 98050a4e97
Original change: https://android-review.googlesource.com/c/platform/build/+/2084045

Change-Id: Idef4053429bbabd96047a2e0624b77d4a3d80f70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 09:09:11 +00:00
Treehugger Robot
98050a4e97 Merge "Expose GetRamdiskFormat and use in ota_utils.py" 2022-05-03 08:27:35 +00:00
Treehugger Robot
77bd852ff0 Merge "Merge identical key/val pairs in dynamic partition info" am: d9e0788ee7
Original change: https://android-review.googlesource.com/c/platform/build/+/2084183

Change-Id: Ibfe4ca77324e5240340ccb17e0877f792c85d4e5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 05:05:07 +00:00
Treehugger Robot
d9e0788ee7 Merge "Merge identical key/val pairs in dynamic partition info" 2022-05-03 02:37:34 +00:00
Treehugger Robot
911a63c0ff Merge "Add 33.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" am: 7a79a27356
Original change: https://android-review.googlesource.com/c/platform/build/+/2082702

Change-Id: I61a443f962f39d1163a8f01b5e239b68580fd92c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-03 02:21:49 +00:00
Jeongik Cha
9c376b4ec8 Adding -j1 for aidl-freeze-api
bpmodify isn't safe for multi processes env because it doesn't use any
lock mechanism even with -w option(in-place change)

So, added -j1 option as a temp solution.

Bug: 190577319
Bug: 229413853
Test: run aidl-freeze-api with -j1
Change-Id: I7fabfa1224ea0bb8d71538f4c8012255df28a3e8
2022-05-03 01:51:06 +00:00
Treehugger Robot
7a79a27356 Merge "Add 33.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS" 2022-05-03 00:32:17 +00:00
Cole Faust
127115190b Remove RBC_BOARD_CONFIG
Always enable the rbc board config along with
the product config now that board config works
well.

Bug: 231224938
Test: Presubmits
Change-Id: I52a79d53dfe54878477ee015bd21863c4cee6b05
2022-05-02 14:16:04 -07:00
TJ Rhoades
6f488e9e33 Expose GetRamdiskFormat and use in ota_utils.py
Some OTA files may have additional OTA props; when this is being computed within
ota_utils.py -> ComputeRuntimeBuildInfos, the ramdisk type needs to be passed into
PartitionBuildProps.FromInputFile as not all ramdisk may still use gzip. This check
is already defined in common.py, so this change also exposes the function GetRamdiskFormat.

Bug: 231075507

Signed-off-by: TJ Rhoades <tjr@microsoft.com>
Change-Id: If1b93b887990f0d90df2c6003122821c1e66a1ac
2022-05-02 13:19:49 -07:00
Kelvin Zhang
6a683ce02b Merge identical key/val pairs in dynamic partition info
We might add new values to dynamic_partition_info.txt, so some kind of
generic fallback mechanism is needed. If keys are different, we need to
decided on a case-by-case basis which side takes precedence. For
example, Virtual AB requires vendor support, so vendor side takes
precedence. VABC on T+ devices are implemented entirely in system, so
system/framework side takes precedence.

Bug: 230876542
Test: th
Change-Id: I67747368547d3ef3e29ad64f8f818ef4c5896246
2022-05-02 12:19:45 -07:00
Daniel Norman
de1f8d583b Merge "Infers custom vendor partitions." am: d3eb2e30dc
Original change: https://android-review.googlesource.com/c/platform/build/+/2032572

Change-Id: If1fdefb9d725b92d00b192a1a1989184e60051be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-05-02 16:50:06 +00:00
Daniel Norman
d3eb2e30dc Merge "Infers custom vendor partitions." 2022-05-02 16:25:58 +00:00
Håkan Kvist
8cabc71bf6 fixup! Embed host liblz4.so in target_files
Fix typo introduced in 6877e81467

Bug: 206729162
Test: m dist

Change-Id: I799cbc2048f0a3ac715ecf094049776b507b1505
2022-05-02 09:52:50 +02:00
Inseob Kim
0b734ccd91 Add 33.0 to PLATFORM_SEPOLICY_COMPAT_VERSIONS
Test: m selinux_policy
Change-Id: I0efaf48ff96c6225183cdbf13904ef41c9f2389d
2022-05-02 14:19:51 +09:00
Treehugger Robot
35c9a04254 Merge "Add deprecation warning for base-rules-hook" am: e30f7e8be1
Original change: https://android-review.googlesource.com/c/platform/build/+/2080730

Change-Id: Id2b7f201b00a2ba36055c90374a161a36c43933a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 23:41:28 +00:00
Treehugger Robot
e30f7e8be1 Merge "Add deprecation warning for base-rules-hook" 2022-04-29 23:24:48 +00:00
Daniel Norman
679242b877 Infers custom vendor partitions.
Rather than hardcoding a list of allowed vendor partitions, we accept
anything in the vendor target files that is not a framework partition.

Also extend support for inferred misc_info keys when the device uses
SYSTEM/product or SYSTEM/system_ext.

Test: test --host releasetools_test
Test: Use to merge a device with a custom IMAGES/*.img in the vendor
      build, and SYSTEM/system_ext in the system build.
Bug: 225902565
Change-Id: I638c0f9c019357150516ea6c208ecd60c03c450f
2022-04-29 15:07:48 -07:00
Steven Moreland
e9ac7cf803 Merge "finalization: AIDL_FROZEN_REL" am: 2b9eda69aa
Original change: https://android-review.googlesource.com/c/platform/build/+/2078088

Change-Id: I4843eda952976d28164d92200759f09ebc1776b2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:51:40 +00:00
Cole Faust
9129807bb8 Merge "Add implementations for firstword/lastword" am: 997cfaaceb
Original change: https://android-review.googlesource.com/c/platform/build/+/2078089

Change-Id: Iad404bfe49fcc1d7a96a286ff701ba1608a4dfc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:50:49 +00:00
Steven Moreland
2b9eda69aa Merge "finalization: AIDL_FROZEN_REL" 2022-04-29 18:39:18 +00:00
Cole Faust
997cfaaceb Merge "Add implementations for firstword/lastword" 2022-04-29 18:32:40 +00:00
Treehugger Robot
86c5f3b5cf Merge "Update OWNERS." am: f4e2f4150b
Original change: https://android-review.googlesource.com/c/platform/build/+/2079379

Change-Id: Icb71135f5661c8a1f5305751a37dfe97ef7929f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:10:32 +00:00
Sebastian Ene
c47a55fdbc Merge "Drop the PLATFORM_VERSION_CODENAME conditional" am: 399c35d490
Original change: https://android-review.googlesource.com/c/platform/build/+/2077518

Change-Id: I14788fa34f0c4673c991ef2cafe68005a83c1126
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:10:03 +00:00
Treehugger Robot
82ecb99a3b Merge "Fix incorrect function call in product-graph" am: 0941f062af
Original change: https://android-review.googlesource.com/c/platform/build/+/2078438

Change-Id: Id557f9c506d6caf16e1606ef1d3aeb7450474934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:09:33 +00:00
Treehugger Robot
d03c6145f7 Merge "Allow non-compat suite to locate testcases dir properly" am: f8935efee8
Original change: https://android-review.googlesource.com/c/platform/build/+/2080295

Change-Id: Ie035f0c8001f94a657759d1a1f3a04f7118828f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:09:04 +00:00
Treehugger Robot
020ccb6819 Merge "Prototype of build orchestrator" am: 7320410c37
Original change: https://android-review.googlesource.com/c/platform/build/+/2077279

Change-Id: I9a88086e8e882b203aa7783e6d65545177342056
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:01:17 +00:00
Treehugger Robot
fe781b347d Merge "Prototype changes for multitree" am: 55d522096a
Original change: https://android-review.googlesource.com/c/platform/build/+/2076562

Change-Id: Id0e9ef26a6a47f6518df77e23b7e9157d0e8c876
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-29 18:01:14 +00:00
Treehugger Robot
f4e2f4150b Merge "Update OWNERS." 2022-04-29 17:05:22 +00:00
Sebastian Ene
399c35d490 Merge "Drop the PLATFORM_VERSION_CODENAME conditional" 2022-04-29 13:02:22 +00:00
Ulya Trafimovich
c6ebb82b9f Update OWNERS.
Some people left, some new files were added.

Bug: 214255490
Test: none
Change-Id: I39a4b313ad69e2a2076a0dc87e131add5dc85b20
2022-04-29 13:51:31 +01:00
Sebastian Ene
573fbcd114 Drop the PLATFORM_VERSION_CODENAME conditional
Evaluate the list of all active codenames when version_util.mk is
invoked.

Bug: 230720688
Change-Id: I1c6a3e94230e856cf41f1f79b37893576957dc3d
Signed-off-by: Sebastian Ene <sebastianene@google.com>
2022-04-29 09:09:03 +00:00
Treehugger Robot
0941f062af Merge "Fix incorrect function call in product-graph" 2022-04-29 07:54:05 +00:00
Treehugger Robot
f8935efee8 Merge "Allow non-compat suite to locate testcases dir properly" 2022-04-29 01:23:44 +00:00
Cole Faust
f773f3a024 Add deprecation warning for base-rules-hook
This lets product/board config define a function that
is called while processing modules defined in an
Android.mk file.

When the product/board configs are converted
to starlark, they won't be able to supply a base-rules-hook
anymore. Emit a warning saying that it's deprecated.

Bug: 226974242
Test: Manually
Change-Id: Ie6baa4952516a3ec5c6c440f9106f7b5185803b7
2022-04-28 16:20:32 -07:00
Cole Faust
c93109dc36 Add implementations for firstword/lastword
Bug: 226974242
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: Ibb992f42a59212bae48acd55647b2d0872c2f69e
2022-04-28 15:56:33 -07:00
Treehugger Robot
7320410c37 Merge "Prototype of build orchestrator" 2022-04-28 22:20:47 +00:00
Treehugger Robot
55d522096a Merge "Prototype changes for multitree" 2022-04-28 22:20:47 +00:00
Cole Faust
75ed0c7cdf Merge "Sort rblf_wildcard results and remove file existence functions" am: 76413f4c58
Original change: https://android-review.googlesource.com/c/platform/build/+/2076126

Change-Id: Ia0b59123331106d6373b39d420e3d73aa481f060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 20:40:36 +00:00
Dan Shi
3e85ca9d4b Allow non-compat suite to locate testcases dir properly
cc_test that can run on hostside are default to be part of
host-unit-tests suite. The suite is set up similar to device-tests and
general-tests, and it's not a compatibility suite. So following variable
will always be empty:
$(COMPATIBILITY_TESTCASES_OUT_host-unit-tests.
It should use HOST_OUT_TESTCASES as testcases dir.

The same logic should be applied to art-host-tests.

Bug: None
Test: build
Change-Id: Ieddacd5157da73c6df473c103be109d9c3a55281
2022-04-28 13:36:36 -07:00
Cole Faust
76413f4c58 Merge "Sort rblf_wildcard results and remove file existence functions" 2022-04-28 19:54:32 +00:00
Treehugger Robot
dbcc7e454b Merge "Replace DEX_FLAGS by flags for D8 and R8." am: b27140daa0
Original change: https://android-review.googlesource.com/c/platform/build/+/2059747

Change-Id: I69aead43a62c80acb9e53c52db062b8da5d4704f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 13:12:18 +00:00
Treehugger Robot
b27140daa0 Merge "Replace DEX_FLAGS by flags for D8 and R8." 2022-04-28 12:40:13 +00:00
Ulya Trofimovich
1d332af2b6 Merge "Remove DEXPREOPT_USE_ART_IMAGE; it is no longer needed." am: 4faef3876d
Original change: https://android-review.googlesource.com/c/platform/build/+/2069047

Change-Id: Id717a1359b2e6daf0c14e115c5db665ce2b24a65
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-28 10:09:03 +00:00
Ulya Trofimovich
4faef3876d Merge "Remove DEXPREOPT_USE_ART_IMAGE; it is no longer needed." 2022-04-28 09:44:21 +00:00
Inseob Kim
05fa7f1455 Prototype changes for multitree
This change contains a prototype implementation for multitree.
A new file core/tasks/multitree.mk adds a goal named "update-meta",
which searches for "imported" and "exported" Android.bp modules and
writes a json metadata to track dependencies between components.

Bug: 230448564
Test: m
Change-Id: Ie93e3bf130cacb6b6de41acee3bd302f64f1ab95
2022-04-28 08:03:55 +00:00
Steven Moreland
5fe7105f45 finalization: AIDL_FROZEN_REL
Simulate branch release state, to verify AIDL interfaces were
converted properly.

Bug: 190577319
Bug: 229413853
Test: run finalization script

Change-Id: I3061ef24ee6dc420ec0ecc85b503f9728170c9c0
2022-04-28 00:05:44 +00:00
Cole Faust
360b2b5253 Merge "Make mkstrip always return a string" am: 542399a8e8
Original change: https://android-review.googlesource.com/c/platform/build/+/2076128

Change-Id: Ibaf21180f44ec8feb2251b9a3926f14348a2db73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-27 21:59:10 +00:00
Cole Faust
542399a8e8 Merge "Make mkstrip always return a string" 2022-04-27 21:37:25 +00:00
Cole Faust
23b94e63ba Fix incorrect function call in product-graph
This was accidentally broken in aosp/2064287

Fixes: 230599451
Test: m product-graph
Change-Id: Ibc9aabc5ddf7ad4d347e89019be44ef0c8ae0ff7
2022-04-27 11:55:08 -07:00