Commit Graph

90603 Commits

Author SHA1 Message Date
Kelvin Zhang
513b86e5c2 Move more non-AB code to separate files
non-AB has different lifetime and development cycles from AB. To avoid
accidentally breaking each other when making changes, put non-AB code in
its own files.

Test: local non-AB OTA generation
Bug: 296485685

Merged-In: I0736ecef343834c746464666a454a8bfcd4a20ea

Change-Id: I0736ecef343834c746464666a454a8bfcd4a20ea
2023-10-30 23:43:15 +00:00
LaMont Jones
1dc07fa574 release_config: build flags can be lists
Allow a build flag definition to indicate that its value should be the
concatentation of assignements, rather than the final assigned value. In
this case, the "default" value from the flag definition is always
present as the start of the list.

The initial use case for this is RELEASE_ACONFIG_VALUE_SETS, where we
need apply multiple definition files that should be processed to arrive
at the final value.

Bug: b/302593603, b/304814040
Test: manual
Change-Id: I2474cdf23341f9b1682affce6cc784281557655d
2023-10-30 23:40:04 +00:00
LaMont Jones
c6631fed48 Add support for product-specific build flags
1. release config maps now specify where the flag definitions are found.
2. PRODUCT_RELEASE_CONFIG_MAPS specifies additional release config map
   files to use.

This allows product config to specify build flags, which can then be
specified by users of that product.

Bug: b/302593603
Test: manual
Change-Id: I660a3d88c2aaecc14d6f370bebb0d05a8cc224f2
2023-10-30 23:40:04 +00:00
Treehugger Robot
b40c808d89 Merge "Add a phony target for mk2bp_remaining files." into main am: 4c56f45c50
Original change: https://android-review.googlesource.com/c/platform/build/+/2809898

Change-Id: If980aecc15f2444151b214515e000b735739157a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 22:39:09 +00:00
Treehugger Robot
4c56f45c50 Merge "Add a phony target for mk2bp_remaining files." into main 2023-10-30 22:28:10 +00:00
Wei Li
2e84027864 Add a phony target for mk2bp_remaining files.
Bug: 308452586
Test: m mk2bp_remaining; CIs
Change-Id: I3d9242db500232da281f148da6b8205ada0b72e2
2023-10-30 11:20:13 -07:00
Wei Li
dfa5b28ce5 Merge "Generate SBOM of .kcm files in layoutlib." into main am: 52c2ea6a18
Original change: https://android-review.googlesource.com/c/platform/build/+/2802550

Change-Id: Ie5a656938763a1d8372a948572ddfc5f74274191
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 17:56:15 +00:00
Wei Li
52c2ea6a18 Merge "Generate SBOM of .kcm files in layoutlib." into main 2023-10-30 17:37:09 +00:00
Dave Mankoff
ee8ea97fc4 Merge "Let aconfig protos be read by FlagFlipper" into main am: 9d9d6556dc
Original change: https://android-review.googlesource.com/c/platform/build/+/2808034

Change-Id: I0d5a00e45881a5895e3bb9b7600bd1780ca025e0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 16:09:31 +00:00
Dave Mankoff
9d9d6556dc Merge "Let aconfig protos be read by FlagFlipper" into main 2023-10-30 15:27:33 +00:00
Greg Kaiser
d5ec42d96b Merge changes If78eacd6,Ie418aee2,Ica87b396 into main am: f3d33fb878
Original change: https://android-review.googlesource.com/c/platform/build/+/2808397

Change-Id: I4bc8cc099ddd802d4a293236ebe0345835bf0248
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 15:06:58 +00:00
Greg Kaiser
f3d33fb878 Merge changes If78eacd6,Ie418aee2,Ica87b396 into main
* changes:
  Set empty TARGET_RELEASE for some commands
  Fix banchan for trunk stable builds
  Require lunch targets to be product-release-variant
2023-10-30 14:38:59 +00:00
Zhi Dou
519c1eca15 Merge "Revert "aconfig: cache flag value in generated java code"" into main am: 0989dcd64c
Original change: https://android-review.googlesource.com/c/platform/build/+/2809793

Change-Id: I2390d7d78a293cdd99992f7533dec01d6822c8e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 14:34:35 +00:00
Zhi Dou
0989dcd64c Merge "Revert "aconfig: cache flag value in generated java code"" into main 2023-10-30 14:00:07 +00:00
Zhi Dou
257f64347d Revert "aconfig: cache flag value in generated java code"
This reverts commit 3dea629a9e.

Reason for revert: b/308228560

Change-Id: I6511def2e53ab793c5fd78f65bea14eeebc5cdb2
2023-10-30 13:24:31 +00:00
Justin Yun
9222bcb9f0 Move vndk apex to the vendor partition for in-development builds
We may now install VNDK apex on vendor partition safely as product
modules no longer requires vndk libs.

Bug: 299867815
Bug: 307214977
Test: lunch cf_x86_64_phone-trunk_staging-userdebug; m
Change-Id: Ibc2391c326a392644e251d2938adedbdf8b23630
2023-10-30 16:51:31 +09:00
Justin Yun
c8651b789a Merge "Remove ro.product.vndk.version property" into main am: b81aa10eba
Original change: https://android-review.googlesource.com/c/platform/build/+/2803633

Change-Id: I66b76264bc428fc45f87a70bf37a3f864f50348d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 05:14:29 +00:00
Justin Yun
b81aa10eba Merge "Remove ro.product.vndk.version property" into main 2023-10-30 05:01:44 +00:00
Treehugger Robot
47f2f098cd Merge "math.mk supports larger number comparison" into main am: 8e403a4c60
Original change: https://android-review.googlesource.com/c/platform/build/+/2805773

Change-Id: I43b1f25684f321111532b8e863b4ee279410cb1e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 04:11:19 +00:00
Treehugger Robot
8e403a4c60 Merge "math.mk supports larger number comparison" into main 2023-10-30 03:56:39 +00:00
Justin Yun
b2b556472c math.mk supports larger number comparison
To support 6-digit version format, extend the integer limit for
the comparison functions. It keeps the simple fast comparisons for
integers <= 100, but uses the extended functions for larger numbers.

Bug: 295269182
Test: make -f math.mk RUN_MATH_TESTS=true
Change-Id: Ib0752fbeb0a80796aeca663b0dc6bda0fd339440
2023-10-30 10:58:25 +09:00
Zhi Dou
47f37bec31 Merge "aconfig: cache flag value in generated java code" into main am: da88660301
Original change: https://android-review.googlesource.com/c/platform/build/+/2802758

Change-Id: I7c0bdee071f4be54f28be230599751088dd2f27f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-28 03:40:50 +00:00
Zhi Dou
da88660301 Merge "aconfig: cache flag value in generated java code" into main 2023-10-28 03:24:58 +00:00
Greg Kaiser
b6a0d39dad Set empty TARGET_RELEASE for some commands
The same commands where we're setting things like
TARGET_BUILD_VARIANT to be explicitly empty, we do the
same with TARGET_RELEASE.

Bug: 307946156
Test: 'lunch' with no arguments
Change-Id: If78eacd62725122d47829e2e9079b182fdafb9b4
2023-10-27 18:07:30 -06:00
Greg Kaiser
d35095e5f4 Fix banchan for trunk stable builds
In the trunk stable builds, we're required to have a
TARGET_RELEASE set.

For now, we hard-code this to "trunk_staging" (and leave a TODO
to accept this as a function argument).

This will have us producing valid builds in places like git_main.

Bug: 307946156
Test: None
Change-Id: Ie418aee2fad192a38beca44cd7d168e0e1b45689
2023-10-27 18:07:23 -06:00
Zhi Dou
3dea629a9e aconfig: cache flag value in generated java code
This change add cache in generated jave code to improve the performance.

The cache is a DeviceConfig.Properties. One Properties contains all
flag values from the given namesapce.

The Properties for a given namespace is initialized as null, and the
first call for any flags in that Properties will trigger the call to
fetch all the values. After the first call, the flag values are stored
in the Properties, so the following calls will directly get the value
from the Properties instead from the backup storage.

Test: atest aconfig.test.java
Bug: 307511846
Change-Id: Ic43626101c28099199b6faa419cf1945bd53b15d
2023-10-27 23:53:09 +00:00
Treehugger Robot
da01c05451 Merge "Remove emulator_x86_arm board from common boards" into main am: 4fd3b11018
Original change: https://android-review.googlesource.com/c/platform/build/+/2808362

Change-Id: I48fc36fadd1c57045e3033b0f06b41eacf73a40e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 23:16:00 +00:00
Treehugger Robot
4fd3b11018 Merge "Remove emulator_x86_arm board from common boards" into main 2023-10-27 22:36:11 +00:00
Greg Kaiser
5e2d3399d3 Require lunch targets to be product-release-variant
Instead of supporting both product-variant and
product-release-variant, we now require the release
type to be given to use.

Bug: 307946156
Test: 'lunch aosp_mokey-userdebug' (now) fails; 'lunch aosp_mokey-trunk_staging-userdebug' (still) works
Change-Id: Ica87b3969f950a57232615f33bfe5f4012a743d6
2023-10-27 15:59:36 -06:00
Treehugger Robot
9b49822843 Merge "Fix tapas for git_main builds" into main am: 3006f169b5
Original change: https://android-review.googlesource.com/c/platform/build/+/2806374

Change-Id: Ic5e52e755a04e9808d72621679325873605ae3b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 20:18:35 +00:00
Treehugger Robot
3006f169b5 Merge "Fix tapas for git_main builds" into main 2023-10-27 19:56:40 +00:00
Treehugger Robot
3947fa0948 Merge "Make non-ab code path compatible with extracted target files" into main am: 61f81a68d8
Original change: https://android-review.googlesource.com/c/platform/build/+/2808357

Change-Id: I9f65bb3010a334a4361efc828813ad2804669512
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 19:49:18 +00:00
Treehugger Robot
61f81a68d8 Merge "Make non-ab code path compatible with extracted target files" into main 2023-10-27 19:32:48 +00:00
Alfred Piccioni
bd523029a9 Remove emulator_x86_arm board from common boards
The board will now live in the Android TV vendor partition, since the
emulator team is no longer supporting 32-bit boards.

Bug: 305610937
Test: Null
Change-Id: Ia1afb35ad15eb991bb2451c160db4f853f016587
Merged-In: Ia1afb35ad15eb991bb2451c160db4f853f016587
2023-10-27 18:58:37 +00:00
Dave Mankoff
0e0c3dec70 Let aconfig protos be read by FlagFlipper
Bug: 307526764
Test: manually built
Change-Id: I689a15cc8c97a814df6f8e45bcf7f732d1693835
Merged-In: I689a15cc8c97a814df6f8e45bcf7f732d1693835
2023-10-27 18:43:50 +00:00
Kelvin Zhang
2ab6986dd9 Make non-ab code path compatible with extracted target files
Bug: 296485685
Test: ota_from_target_files -v -i non_ab.zip non_ab.zip ota.zip
Change-Id: I13ed54bfe7d14d2d1e87f45564da465a77bc2d1d
2023-10-27 11:01:27 -07:00
Treehugger Robot
3a5de12447 Merge "De-duplicate kernel module names" into main am: a997e48000
Original change: https://android-review.googlesource.com/c/platform/build/+/2806394

Change-Id: I0939c86aa6339e838089573b60d6b30f2a246166
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:37:25 +00:00
Treehugger Robot
a997e48000 Merge "De-duplicate kernel module names" into main 2023-10-26 19:02:38 +00:00
Greg Kaiser
83ed159cf7 Fix tapas for git_main builds
In the git_main trunk stable builds, we're required to have a
TARGET_RELEASE set.

For now, we hard-code this to "trunk_staging" (and leave a TODO
to accept this as a function argument).

This will have us producing valid builds under git_main.

Bug: 307975293
Test: 'tapas google-tradefed-all' now works on a tree that has go/aog/2806253
Change-Id: I70572fb4c7902350513e251694f3ddef91efcb13
2023-10-26 18:38:35 +00:00
Kelvin Zhang
57f23bf317 De-duplicate kernel module names
If BOARD_KERNEL_MODULES_16K contains duplicate kernel modules under
different directories, build will fail with 'multiple overriding
commands error' . To fix it, de-dup BOARD_KERNEL_MODULES_16K base on the
basename of kernel modules files.

Test: th
Change-Id: I45d850d5b3804c54b9ec0133d3a657c2db5adb17
2023-10-26 10:29:55 -07:00
Ted Bauer
2e02bb7fc7 Merge "Revert "Do not generate aconfig_flags.textproto"" into main am: 6866204083
Original change: https://android-review.googlesource.com/c/platform/build/+/2803994

Change-Id: Iaf6db998aef886eb038cf5ce129fa773b7114df6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 17:18:46 +00:00
Ted Bauer
6866204083 Merge "Revert "Do not generate aconfig_flags.textproto"" into main 2023-10-26 16:46:57 +00:00
Ted Bauer
49fbb31fcf Revert "Do not generate aconfig_flags.textproto"
This reverts commit 0ac5304598.

Reason for revert: unbreak FlagFlipper

Test: m
Change-Id: I3c00d97bcb39d50a54b46fb61eaa30e8fcb0c9a5
2023-10-26 10:59:34 -04:00
Treehugger Robot
a9ad4a435b Merge "Fix lunch choices for git_main" into main am: 3d79e54ff1
Original change: https://android-review.googlesource.com/c/platform/build/+/2802547

Change-Id: I39f5b177ffff6828d913641ec07d018c754726b7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 22:55:59 +00:00
Wei Li
ee4ab5359d Generate SBOM of .kcm files in layoutlib.
Bug: 303905932
Test: CIs; m layoutlib dist
Change-Id: Iab35c44bdfff7ea82734a8efd37dfa005bae2664
2023-10-25 15:49:26 -07:00
Treehugger Robot
3d79e54ff1 Merge "Fix lunch choices for git_main" into main 2023-10-25 22:24:57 +00:00
Treehugger Robot
e8c4106678 Merge "Use deterministic salt for AVB footer of prebuilt boot img" into main am: 07f84b7b17
Original change: https://android-review.googlesource.com/c/platform/build/+/2794713

Change-Id: If68f49a25b1ff672d4e420c14715ff81f6b8772b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 22:02:54 +00:00
Treehugger Robot
07f84b7b17 Merge "Use deterministic salt for AVB footer of prebuilt boot img" into main 2023-10-25 21:40:19 +00:00
Greg Kaiser
0fe27f448b Fix lunch choices for git_main
We add "trunk_staging-" for all COMMON_LUNCH_CHOICES so they are
valid in the trunk stable setup.

Bug: 307738446
Test: lunch
Change-Id: I7d56b288355d1335db5297ad9b5117054caf365b
2023-10-25 21:28:57 +00:00
Greg Kaiser
53c54898ac Merge "Have default 'lunch' target use a release type" into main am: 6787354f96
Original change: https://android-review.googlesource.com/c/platform/build/+/2802543

Change-Id: Ic35b2ac257345e8689c33e198c16ae42aa497037
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 20:43:21 +00:00