Commit Graph

92890 Commits

Author SHA1 Message Date
Justin Yun
b81aa10eba Merge "Remove ro.product.vndk.version property" into main 2023-10-30 05:01:44 +00:00
Treehugger Robot
bf21ba4b89 Merge "math.mk supports larger number comparison" into main am: 8e403a4c60
Original change: https://android-review.googlesource.com/c/platform/build/+/2805773

Change-Id: I1dc77c273f6acb992b5ee77092c2443ab5182139
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-30 04:09:14 +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
6e1ac53b5a 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: Id26d889a02342f983a6c48d9b42b343a2fb9c6fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-28 03:38:47 +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
e1c5cfde46 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: I7465d29e2cfc1f7ef1ae58fbe2795f5ae3997378
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 23:14:53 +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
Android Build Coastguard Worker
1bbb127122 Version bump to UQ1A.231205.010 [core/build_id.mk]
Change-Id: Ib4601e59c92f0eff58a4459a2c7ea2006852c70d
2023-10-27 21:41:34 +00:00
Treehugger Robot
68f7489808 Merge "Fix tapas for git_main builds" into main am: 3006f169b5
Original change: https://android-review.googlesource.com/c/platform/build/+/2806374

Change-Id: Ia83f79665b8fdedf21de356ee21825d0e3f63bbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 20:16:33 +00:00
Treehugger Robot
3006f169b5 Merge "Fix tapas for git_main builds" into main 2023-10-27 19:56:40 +00:00
Treehugger Robot
e1d6a5324d 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: I96fdee77a50c9a26d8ec54b193fd3fc9dadf8401
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-27 19:48:09 +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
Android Build Coastguard Worker
ae93656557 [coastguard skipped] Merge sparse cherrypicks from sparse-11012875-L09900000963776293 into udc-qpr1-release.
COASTGUARD_SKIP: I309db21cc2d5b0d77ff7fef637f030c7582f3f20

Change-Id: Idd7f30847d0f4ffaed8e21d6bbb5325fe3b0dc45
2023-10-27 17:45:31 +00:00
Android Build Coastguard Worker
430510bb73 Version bump to UQ1A.231205.009.X1 [core/build_id.mk]
Change-Id: I309db21cc2d5b0d77ff7fef637f030c7582f3f20
2023-10-27 17:42:27 +00:00
Android Build Coastguard Worker
2a2517fe54 Version bump to UQ1A.231205.009 [core/build_id.mk]
Change-Id: Iad7684e5eebb73ce734e16ed7d01fef6e563d547
2023-10-27 03:36:50 +00:00
Treehugger Robot
da7e14b9e5 Merge "De-duplicate kernel module names" into main am: a997e48000
Original change: https://android-review.googlesource.com/c/platform/build/+/2806394

Change-Id: I91b8b475fc874ca3fd7e64072458effcd071a693
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 19:35:01 +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
ebdb7b84fd 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: I36e89107465639367539a00b61074f20ca5f6282
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-26 17:16:34 +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
Android Build Coastguard Worker
f85e5c84a4 Version bump to UQ1A.231205.008 [core/build_id.mk]
Change-Id: I9d13a044ddf367b39a40b103f068518d69cc0f8c
2023-10-26 00:13:21 +00:00
Treehugger Robot
bf665a1fa6 Merge "Fix lunch choices for git_main" into main am: 3d79e54ff1
Original change: https://android-review.googlesource.com/c/platform/build/+/2802547

Change-Id: I5312f186611997b3d8a4467f7a34fdaa1632c72e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 22:54:14 +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
fa0091a912 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: I31deb3c465031bf5ed06a52f5eb7c8b82ba4ef4f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 22:00:46 +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
d9ed78ac08 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: I46dcde8fddc5cafbb72ed31bb9632e91a57e35a8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 20:41:29 +00:00
Kelvin Zhang
160762a276 Use deterministic salt for AVB footer of prebuilt boot img
When target specified a prebuilt boot.img, current build system will add
avb hash footer to it with a random salt. Use a deterministic salt
instead for more reproducible builds. To stay consistent with
non-prebuilt boot.img code path, we extract the kernel image from
prebuilt boot.img and uses sha256sum of kernel image as the salt.

Test: th
Bug: 293313353
Change-Id: I988999ddc4f18e0b8677b05a3165c847b6a11b52
2023-10-25 13:28:11 -07:00
Greg Kaiser
6787354f96 Merge "Have default 'lunch' target use a release type" into main 2023-10-25 20:19:37 +00:00
Wei Li
e8f77226d0 Merge "Add key character maps to layoutlib dist files" into main am: b3731e0db2
Original change: https://android-review.googlesource.com/c/platform/build/+/2802643

Change-Id: I7f0c14502d15b00ba7d84169a9ca47d4de7eb453
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 18:07:21 +00:00
Wei Li
b3731e0db2 Merge "Add key character maps to layoutlib dist files" into main 2023-10-25 17:35:40 +00:00
Mark White
2c807515c0 Suggest developers use -eng builds instead when they lunch -userdebug
This is because -eng provides faster local builds.

(also moving hints to where they are more likely to be seen)

Test: lunch cf_x86_64_phone-userdebug
Fixes: 307753064
Change-Id: I52cf9e9c399dbb3a52c7952f7204a9e567d15c22
2023-10-25 17:34:04 +00:00
Greg Kaiser
a13cd28e44 Have default 'lunch' target use a release type
In git_main, the correct target here is aosp_arm-trunk_staging-eng
(or "trunk_food" or "next", but we choose the most generic
"trunk_staging").

Bug: 307738446
Test: "lunch", hit return for the default, "echo $TARGET_RELEASE" to confirm
Change-Id: I4d4bcaf27553976e64133c7351db296953f88b08
2023-10-25 16:18:45 +00:00
Kelvin Zhang
69438b2a20 Merge "Allow -v option to change log level" into main am: c87fd674a8
Original change: https://android-review.googlesource.com/c/platform/build/+/2802637

Change-Id: I9ee92c77d861a895c107fbf46332cc77b167fad2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-25 05:27:53 +00:00
Kelvin Zhang
c87fd674a8 Merge "Allow -v option to change log level" into main 2023-10-25 04:59:01 +00:00
Kelvin Zhang
9d74128194 Allow -v option to change log level
Setting logging level to 'NOTSET' would tell logging module to inherit
logging level from handlers. Since the verbosity of handlers is
controlled by -v option, this allows sign_apex.py to give verbose output
if -v is specified.

Test: th
Bug: 307191956
Change-Id: I9c1db107cf4eae80ab570d892b0465b3902298fd
2023-10-24 21:58:28 -07:00
Justin Yun
f71c221f40 Remove ro.product.vndk.version property
Product modules no longer use vndk libraries but install them to
/product/lib[64].

Test: lunch cf_x86_64_phone-next-userdebug; m
Test: atest GtsVndkDependencyTestCases
Bug: 299867815
Bug: 302255959
Change-Id: I67614457c83f0f18eba7dc1d8259efeb5795807b
2023-10-25 13:24:29 +09:00
Jerome Gaillard
ea9dab478c Add key character maps to layoutlib dist files
This makes key character map files from the framework part of the
layoutlib artifacts so that they can be used in Android Studio to
handle platform key events.

Bug: 255328531
Test: N/A
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:1894ff5c78ca33be85d983d28be42870bac0bed0)
Merged-In: I147159912f85daafc97364468d6a6c2cfa3916b8
Change-Id: I147159912f85daafc97364468d6a6c2cfa3916b8

NOTE FOR REVIEWERS - errors occurred while applying the patch.
PLEASE REVIEW CAREFULLY.
Errors:
Error applying patch in core/Makefile, hunk HunkHeader[7006,8->7006,8]: Hunk cannot be applied

Original patch:
 From 1894ff5c78ca33be85d983d28be42870bac0bed0 Mon Sep 17 00:00:00 2001
From: Jerome Gaillard <jgaillard@google.com>
Date: Mon, 24 Oct 2022 16:30:25 +0100
Subject: [PATCH] Add key character maps to layoutlib dist files

This makes key character map files from the framework part of the
layoutlib artifacts so that they can be used in Android Studio to
handle platform key events.

Bug: 255328531
Test: N/A
Change-Id: I147159912f85daafc97364468d6a6c2cfa3916b8
---
2023-10-25 01:15:53 +00:00
Baligh Uddin
07b5947c82 [automerger skipped] Merge "Move most version variable out to relase configs." into main am: 4c09638237 -s ours
am skip reason: Merged-In I9edc7171d124f0cfa540fea6f0e06ba877910444 with SHA-1 2666d4443b is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2801838

Change-Id: I91e73764f807fb7ad038f2703aeb9ff9e228d609
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-24 23:55:42 +00:00