Commit graph

89694 commits

Author SHA1 Message Date
Kiyoung Kim
5959c0200d Move vendor module into base_vendor
There is a vendor module android.hidl.memory@1.0-impl.vendor which is
defined in the base_system. Based on the definition of base_system.mk
and base_vendor.mk, this module is better to be located in the
base_vendor.mk. This change moves the module from base_system into
base_vendor.

Bug: 301344301
Test: Cuttlefish build succeeded
Change-Id: I6dba5ec2380028b1b2c629f901db996c518e3f72
2023-09-21 10:32:50 +09:00
Treehugger Robot
39b4166c95 Merge "Make the target_files zip reflect the recent partition change" into main am: ad30396b0e
Original change: https://android-review.googlesource.com/c/platform/build/+/2755427

Change-Id: Ia774c1bc53a257ebec365341a7b79e36c22cec9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 20:18:29 +00:00
Jihoon Kang
e06e4c5037 Add PRODUCT_NEXT_RELEASE_HID_FLAGGED_API for sdk targets
PRODUCT_NEXT_RELEASE_HIDE_FLAGGED_API added to the sdk targets will be used to determine whether to exclude flagged apis for next release or not.

Test: m TARGET_PRODUCT=sdk nothing
Bug: 299570421
Change-Id: I00cb84341a05e296a0c747d4921ed5fe445eabe6
2023-09-20 19:53:04 +00:00
Treehugger Robot
ad30396b0e Merge "Make the target_files zip reflect the recent partition change" into main 2023-09-20 19:40:01 +00:00
Cole Faust
60061340a5 Make the target_files zip reflect the recent partition change
The target_files zip includes a copy of all the installed files.
It wasn't updated to match aosp/2746998, causing a discrepency between
the target files zip and what was actually on the device.

Bug: 205632228
Bug: 300267995
Test: m dist, then compared the list of files in out/dist/sdk_phone_x86_64-target_files-colefaust.zip before/after this cl
Change-Id: I825fe110285f4e9550b264dea162a4bd7c3daef6
2023-09-20 18:33:02 +00:00
Treehugger Robot
8370a90e0f Merge "Move auto_gen_test_config.py to argparse." into main am: badadf9c4b
Original change: https://android-review.googlesource.com/c/platform/build/+/2756029

Change-Id: Ifd79709be40665ddd7fdc9c62bfc74d917bf3b92
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 10:30:50 +00:00
Treehugger Robot
badadf9c4b Merge "Move auto_gen_test_config.py to argparse." into main 2023-09-20 09:44:11 +00:00
Treehugger Robot
948d449316 Merge "Add support for TARGET_BOARD_INFO_FILES" into main am: 331fb9c708
Original change: https://android-review.googlesource.com/c/platform/build/+/2755629

Change-Id: Ibe1dda6123ec55240fbf8dc525a6a1ca89f528cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 06:56:43 +00:00
Treehugger Robot
331fb9c708 Merge "Add support for TARGET_BOARD_INFO_FILES" into main 2023-09-20 06:07:30 +00:00
Treehugger Robot
070419f03a Merge "Add an execution check for BOARD_KERNEL_VERSION" into main am: bf69b90e77
Original change: https://android-review.googlesource.com/c/platform/build/+/2755426

Change-Id: I91c5a518840b899a93521f1795a71b689e987eab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-20 04:17:23 +00:00
Treehugger Robot
bf69b90e77 Merge "Add an execution check for BOARD_KERNEL_VERSION" into main 2023-09-20 03:01:32 +00:00
LaMont Jones
e61610d31a Add support for TARGET_BOARD_INFO_FILES
This makes it so that portions of android-info.txt can come from
different sources.

Bug: b/301141632
Test: manual
Change-Id: I82793b37162f52805db425b802a2e0762526bd91
2023-09-19 23:06:39 +00:00
Kelvin Zhang
4a4bbda6e7 Add an execution check for BOARD_KERNEL_VERSION
Make sure the specified BOARD_KERNEL_VERSION matches what we extract
from the kernel binary. As other parts of the build system might rely on
the kernel version.

Test: set BOARD_KERNERL_VERSION to foo, make sure build fails
Bug: 293313353
Change-Id: I9005d338fcc3dbb692a6ea7a518a5e63219b2c99
2023-09-19 14:36:56 -07:00
Cole Faust
87e0fc95e9 Merge "Add ProductDirectory variable to soong_config.mk" into main am: b00035955c
Original change: https://android-review.googlesource.com/c/platform/build/+/2755206

Change-Id: Ie1df49e6d56ba0d67ffa863eebbbf7d6a06cddea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 21:16:34 +00:00
Cole Faust
b00035955c Merge "Add ProductDirectory variable to soong_config.mk" into main 2023-09-19 20:42:52 +00:00
Greg Kaiser
b79f1241b3 Merge "Revert "Give an error when trying to build "next" targets"" into main am: d5799abc55
Original change: https://android-review.googlesource.com/c/platform/build/+/2751295

Change-Id: I0d0b0e6dd8038998b6babaf5eea28220350b199b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 20:24:10 +00:00
Greg Kaiser
d5799abc55 Merge "Revert "Give an error when trying to build "next" targets"" into main 2023-09-19 19:55:07 +00:00
Treehugger Robot
c3744daced Merge "Tidy AVF build-time flags" into main am: 106f7202d8
Original change: https://android-review.googlesource.com/c/platform/build/+/2754886

Change-Id: I8daa27e012a897c96f8e45bc9af2e88c49c12a9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 16:49:30 +00:00
Treehugger Robot
106f7202d8 Merge "Tidy AVF build-time flags" into main 2023-09-19 15:45:14 +00:00
Prashant Dubey
f442476158 Merge "Fix typos in METADATA.txt inside boot.zip" into main am: 7f8e4b5549
Original change: https://android-review.googlesource.com/c/platform/build/+/2755026

Change-Id: Ia227b0e4236b1a3d1ec0747bd1342c01b6681e0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 15:00:36 +00:00
Alan Stokes
eb6896a82f Add a build-time flag for AVF permission change
Bug: 278765584
Test: Builds, with and without the flag enabled
Change-Id: I91c9cf136a534f37a6bd4f0375f86ae16b3e59dd
2023-09-19 15:42:39 +01:00
Prashant Dubey
7f8e4b5549 Merge "Fix typos in METADATA.txt inside boot.zip" into main 2023-09-19 14:26:19 +00:00
Alan Stokes
efcd43d7e6 Tidy AVF build-time flags
Sort into alphabetical order, to match the order in build_flags.bzl.

Fix a typo that then became obvious.

Bug: 278067832
Test: Builds, with and without flag enabled
Change-Id: I89ca6b3f96634ece089f86d69bd0b40fc074adff
2023-09-19 15:05:58 +01:00
Jingwen Chen
4bccadd460 Move auto_gen_test_config.py to argparse.
Follow up to aosp/2752414

Test: atest-dev auto_gen_test_config_test
Change-Id: I401c6213f0ed5e97eb97b1c603a8b6c5286f0d88
2023-09-19 06:36:19 +00:00
Jooyung Han
a60ddcab86 Merge "Revert^2 "Install CAS HAL APEX"" into main am: 4f6eb3112f
Original change: https://android-review.googlesource.com/c/platform/build/+/2752546

Change-Id: Ib2e535c0a3991f4d58c3a0480ee3373eaa62894d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 01:50:44 +00:00
Jooyung Han
4f6eb3112f Merge "Revert^2 "Install CAS HAL APEX"" into main 2023-09-19 01:18:07 +00:00
Jingwen Chen
20ebf61214 Merge "Make auto_gen_test_config available to Bazel." into main am: 84b5bb9139
Original change: https://android-review.googlesource.com/c/platform/build/+/2752414

Change-Id: I733ef23456e96bb888b94bd440dab7706eb380d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-19 00:04:46 +00:00
Jingwen Chen
84b5bb9139 Merge "Make auto_gen_test_config available to Bazel." into main 2023-09-18 23:27:14 +00:00
Cole Faust
c7dcd2629a Add ProductDirectory variable to soong_config.mk
Bug: 297269187
Test: m nothing
Change-Id: Ib14ce9d911c86afb5bb770c4b05977021e771c0f
2023-09-18 13:07:22 -07:00
Prashant Dubey
029a6159df Fix typos in METADATA.txt inside boot.zip
Bug: 287652269
Test: m dist out/dist/boot.zip
Change-Id: I55313453393f7a5c3ec565c476722c5ee4d8fc38
2023-09-18 18:27:50 +00:00
Jingwen Chen
f3406e64f7 Make auto_gen_test_config available to Bazel.
In the Bazel rule, the actual AndroidManifest.xml file isn't available
in the providers of the android_binary dependency. And for good reason,
we should also rely on aapt2 to dump the manifest contents from the
final packaged APK anyway, but this auto gen script doesn't support
reading the output of aapt2 dump.

This CL adds a simple reader of the output of `aapt2 dump xmltree`, and
enabled if the xmltree content is passed to this tool instead of
AndroidManifest.xml.

Also fixup auto_gen_test_config_test.py. The test was completely failing.

Test: atest auto_gen_test_config_test
Test: presubmits

Change-Id: I7fecd927d0ed7847b6463d964b3698f4164b0177
2023-09-18 12:34:29 +00:00
Edward Liaw
ba282927bf linux-kselftest: Remove special cased build rule for kselftest
Bug: 277261121
Bug: 293945424
Test: m vts
Change-Id: I1c5992730958645e96037fa01a5c110cf410753b
Signed-off-by: Edward Liaw <edliaw@google.com>
2023-09-15 22:49:17 +00:00
Liz Kammer
a438b6dae2 Merge "Cleanspec to remove tools/metalava subdir" into main am: 5922b630c5
Original change: https://android-review.googlesource.com/c/platform/build/+/2754005

Change-Id: I70e30741426f093bc48c2650515c2a285082dcf4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 21:49:24 +00:00
Liz Kammer
5922b630c5 Merge "Cleanspec to remove tools/metalava subdir" into main 2023-09-15 20:32:43 +00:00
Treehugger Robot
ca8e0fba2a Merge "Respect framework partition set while merging meta files" into main am: b25e443bc5
Original change: https://android-review.googlesource.com/c/platform/build/+/2749885

Change-Id: Ib22c0f6680d7cc30909dd975faebeae9d066bda2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 19:08:12 +00:00
Liz Kammer
c4d9d32fe8 Cleanspec to remove tools/metalava subdir
Test: CI
Change-Id: I412a093ef3964fcecf2b726cbfe0f78032242e95
2023-09-15 14:09:09 -04:00
Treehugger Robot
b25e443bc5 Merge "Respect framework partition set while merging meta files" into main 2023-09-15 17:52:17 +00:00
Yu Liu
7b09b7c614 Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main am: fc68cf4d45
Original change: https://android-review.googlesource.com/c/platform/build/+/2745809

Change-Id: I096473fdcf27348d39e2b24031faec2c6c2cf0c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 17:22:06 +00:00
Yu Liu
fc68cf4d45 Merge "Support aconfig_declarations, aconfig_values and aconfig_value_set" into main 2023-09-15 16:46:01 +00:00
Ted Bauer
8aa65dd354 Merge "Dump Aconfig flags pb file alongside textproto." into main am: 202eab9b14
Original change: https://android-review.googlesource.com/c/platform/build/+/2752625

Change-Id: I185ed112926cb95aa6082a1b1c5de195be538879
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-15 15:33:17 +00:00
Greg Kaiser
6c1723254e Revert "Give an error when trying to build "next" targets"
This reverts commit f5eaf3cff3.

Reason for revert: -next targets are now healthy
Bug: 294161396

Change-Id: Idd61fd65d59a90057db9d6909267f5550cd5b2fe
2023-09-15 14:46:54 +00:00
Ted Bauer
202eab9b14 Merge "Dump Aconfig flags pb file alongside textproto." into main 2023-09-15 14:19:26 +00:00
Dennis Song
36ce326f95 Respect framework partition set while merging meta files
The framework_partition_set would be generated from
framework_item_list and we should respect this partition
set while merging META/ab_partitions.txt.

This is to handle the case when we use a complete merged
target files package as the framework-target-files, where
its ab_partitions.txt may have non-framework partitions.
So we need to filter them out to prevent from the merged
meta file has some partitions that don't exist.

Test: merge_target_files &&
        add_img_to_target_files &&
	img_from_target_files &&
	flash device
Bug: 300193612
Change-Id: I0a76d706a20dcaffa2533278db7383563f03ec02
2023-09-15 06:20:19 +00:00
Treehugger Robot
251a45040a Merge "Define PRODUCT_PRODUCT_VNDK_VERSION as current by default" into main am: 2a65d6a7e9
Original change: https://android-review.googlesource.com/c/platform/build/+/2752225

Change-Id: I64f571b8c84d8facead888f3b55a89ecf67087ec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 23:25:19 +00:00
Treehugger Robot
2a65d6a7e9 Merge "Define PRODUCT_PRODUCT_VNDK_VERSION as current by default" into main 2023-09-14 22:19:02 +00:00
Zhi Dou
093793c8d7 Merge "aconfig: throw exception if reading from DeviceConfig fails" into main am: c20d115562
Original change: https://android-review.googlesource.com/c/platform/build/+/2751666

Change-Id: I2cd0def3e284c39230780e9c8a8bb60debce3bb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 19:52:38 +00:00
Treehugger Robot
fe1cb899b2 Merge "aconfig: Fix missing header in the generated c/cpp code" into main am: 2cb7622dca
Original change: https://android-review.googlesource.com/c/platform/build/+/2752628

Change-Id: If1cd7c0f6f62b1ee0ab41f673d648ed6cd6f0566
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 19:52:21 +00:00
Zhi Dou
c20d115562 Merge "aconfig: throw exception if reading from DeviceConfig fails" into main 2023-09-14 19:28:16 +00:00
Treehugger Robot
2cb7622dca Merge "aconfig: Fix missing header in the generated c/cpp code" into main 2023-09-14 19:13:34 +00:00
Treehugger Robot
4cc73265cc Merge "Add cog setup scripts" into main am: 2fd4abc212
Original change: https://android-review.googlesource.com/c/platform/build/+/2745175

Change-Id: I82b1c5a64f301bdfb713695d957a46cc335fc155
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 18:57:37 +00:00