Commit Graph

96457 Commits

Author SHA1 Message Date
Zhi Dou
1fdf9f22df Merge "aconfig: disable export mode for generated native flag libraries" into main 2024-02-29 20:38:25 +00:00
Bart Van Assche
594180d8d0 Makefile: Optimize the code for creating the kernel module list
The time needed for executing shell code strongly depends on how many
times the shell has to call fork(). Hence, instead of invoking 'basename'
once per kernel module, invoke 'basename' once for all kernel modules.

Change-Id: Ibe322c8ebf0a466568f902beb5ab91988381678c
Signed-off-by: Bart Van Assche <bvanassche@google.com>
2024-02-29 11:23:23 -08:00
Treehugger Robot
b6cb255902 Merge "Fix cogsetup.sh to work from non-root dirs" into main am: c135861a61
Original change: https://android-review.googlesource.com/c/platform/build/+/2941606

Change-Id: I631585f7f451927d8723b4112b67cb2042c048e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 19:11:49 +00:00
Alyssa Ketpreechasawat
0f00fbd681 Merge "Use build flag to control the apex boot jars to be excluded." into main am: eb4f3ec4b8
Original change: https://android-review.googlesource.com/c/platform/build/+/2980732

Change-Id: I658366663def6257d11c0a730ec874a0860f6aad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 19:11:08 +00:00
Treehugger Robot
c135861a61 Merge "Fix cogsetup.sh to work from non-root dirs" into main 2024-02-29 18:19:56 +00:00
Alyssa Ketpreechasawat
eb4f3ec4b8 Merge "Use build flag to control the apex boot jars to be excluded." into main 2024-02-29 18:17:09 +00:00
Wei Li
c1ed63b8d0 Merge "Add meta-lic.mk for declaring license metadata of some 1P files." into main am: 7c48999446
Original change: https://android-review.googlesource.com/c/platform/build/+/2983691

Change-Id: Ib6bca4f2400a3197fe683107a2c7c3a2d1ff0b91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 16:59:44 +00:00
Wei Li
7c48999446 Merge "Add meta-lic.mk for declaring license metadata of some 1P files." into main 2024-02-29 16:23:27 +00:00
Zhi Dou
036cdbe92f aconfig: disable export mode for generated native flag libraries
Currently the default flag values are not loaded into sysprop. Since the
current requirements for export flag are for flagged api in java and the
new storage system will load default values for all, there won't be
changes to make the default value loaded into sysprop. Thus this change
disable export mode for generated native flag libraries for now. It will
be enabled once the new storage is landed.

Test: m libaconfig_test_rust_library_with_exported_mode and expect build
failure
Bug: 327392334

Change-Id: I2db814d015cdb533778822f7417d055b251ed589
2024-02-29 12:57:24 +00:00
Daniel Zheng
9af982c4cf Merge "fallback on older cow version" into main am: 4fc7815094
Original change: https://android-review.googlesource.com/c/platform/build/+/2982349

Change-Id: I29b2ca63b0e52184f3885272a1da98a0e25cbb7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 04:59:38 +00:00
Daniel Zheng
4fc7815094 Merge "fallback on older cow version" into main 2024-02-29 04:49:16 +00:00
Daniel Zheng
474afa8f06 fallback on older cow version
If a device's source or target cow version is specified at 2 (or
undefined) we should fallback on using the v2 writer.

e.g.
1. v3 -> v2 downgrade OTA
2. v2 -> v3

Bug: 322279333
Test: ota_from_target_files
Change-Id: I8c5139eceeb64ee255ddea66017b3e17bbdc44c0
2024-02-28 20:47:20 -08:00
Treehugger Robot
76670ce735 Merge "Define PRODUCT_SHIPPING_VENDOR_API_LEVEL" into main am: be94153266
Original change: https://android-review.googlesource.com/c/platform/build/+/2980493

Change-Id: I1d3c2de54819a56dda023489a27920e9c87a1528
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-29 04:37:59 +00:00
Treehugger Robot
be94153266 Merge "Define PRODUCT_SHIPPING_VENDOR_API_LEVEL" into main 2024-02-29 03:51:52 +00:00
Alyssa Ketpreechasawat
74dabedcb3 Use build flag to control the apex boot jars to be excluded.
Different prebuilts might have different contents and thus, different
boot jars to be removed from the existing apex boot jar lists e.g. next
using U prebuilts would need to remove framework-pdf while ap31 with V
prebuilts must not remove such. The existing mechanism will always
remove framework-pdf whenever prebuilts are enabled regardless of
release config, which is not correct in context of multiple prebuilt
support.

Ignore-AOSP-First: for successful build, we need to submit this togther with ag/26332775. this cl will get cp'ed into aosp later on
Bug: 327022391
Test: build device in next and trunk
Merged-In: I9949fb7075ab6c207a292f13fd75e010a4958f87
Change-Id: I9949fb7075ab6c207a292f13fd75e010a4958f87
2024-02-29 02:26:44 +00:00
Wei Li
5dd61f03ff Add meta-lic.mk for declaring license metadata of some 1P files.
The 1p files are included in PRODUCT_COPY_FILES and released with products.

Bug: 316805918
Test: CIs
Change-Id: Ibe443af26fb14c1bd84552c9f327a1c2ba8c70a4
2024-02-28 15:15:42 -08:00
Dennis Shen
fe06f890cd Merge "aconfig_storage: move storage files to <partition>/etc/aconfig dir" into main am: 1eb16c12f2
Original change: https://android-review.googlesource.com/c/platform/build/+/2982351

Change-Id: I54cdff0c3d062de39dd4e4754af201167dbefba8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 23:13:50 +00:00
Dennis Shen
1eb16c12f2 Merge "aconfig_storage: move storage files to <partition>/etc/aconfig dir" into main 2024-02-28 22:23:05 +00:00
Dennis Shen
bebbf54aa0 aconfig_storage: move storage files to <partition>/etc/aconfig dir
Move them to under aconfig dir so it is easier to define SELinux policy.

Bug: b/312459182
Test: m
Change-Id: I2af7167a21e004729a9ac8628243080c893fb33a
2024-02-28 17:39:21 +00:00
Dennis Shen
04cfe63844 Merge "aconfigd: add aconfigd to system partition" into main am: 40922cb75b
Original change: https://android-review.googlesource.com/c/platform/build/+/2974532

Change-Id: I341d383ba6c8cf548931542a2d709fa7bc5fe12f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 13:21:35 +00:00
Dennis Shen
40922cb75b Merge "aconfigd: add aconfigd to system partition" into main 2024-02-28 12:31:26 +00:00
Justin Yun
000e31c9ed Define PRODUCT_SHIPPING_VENDOR_API_LEVEL
Devices may set its first vendor api level to
PRODUCT_SHIPPING_VENDOR_API_LEVEL. This will manually set to
ro.vendor.api_level and will be used by tests.

If this value is not defined, init process will automatically
calculate the ro.vendor.api_level property for tests.

Bug: 326164316
Test: Check vendor/build.prop
Change-Id: I89f844ffaad9e3e39deab1c680bd1f7f17f4d8ad
2024-02-28 21:01:40 +09:00
Kadir Çetinkaya
2d708e5467 Merge "Add CC analysis support to ide_query" into main am: 1ffcbde28e
Original change: https://android-review.googlesource.com/c/platform/build/+/2966444

Change-Id: Ifa22e00c3c57e889f125a73ffbe1d09975de53ed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 11:34:08 +00:00
Kadir Çetinkaya
1ffcbde28e Merge "Add CC analysis support to ide_query" into main 2024-02-28 10:41:19 +00:00
Treehugger Robot
ce00eff465 Merge "Add custom images in fastboot-info" into main am: 0d25dfc3a4
Original change: https://android-review.googlesource.com/c/platform/build/+/2957065

Change-Id: Ifcf434dbb19936e171b8399b3d11a81c0b5169a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 08:13:05 +00:00
Treehugger Robot
0d25dfc3a4 Merge "Add custom images in fastboot-info" into main 2024-02-28 07:26:45 +00:00
Kadir Çetinkaya
0769200450 Add CC analysis support to ide_query
Introduces ide_query_cc_analyzer, which figures out relevant build targets that needs to be built for a given C++ source or header file.
Once these targets are built, it analyzes the sources in question and reports any generated files that are used back.

Full ide_query integration relies on this binary also being available in prebuilts clang-tools, it'll be done in a future patch.

Change-Id: Ib0ef6da7a2bc8ecf66940b326e037fb1ee230bf9
2024-02-28 07:14:15 +00:00
Peter Collingbourne
145e62cfad Merge "Create empty /linkerconfig/ld.config.txt in ramdisk." into main am: 81f8ba86f3
Original change: https://android-review.googlesource.com/c/platform/build/+/2974335

Change-Id: I0416e53990a789f1a09a5f842d340b87f6c56399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-28 03:05:01 +00:00
Peter Collingbourne
81f8ba86f3 Merge "Create empty /linkerconfig/ld.config.txt in ramdisk." into main 2024-02-28 02:09:15 +00:00
Yi-Yo Chiang
5e8c4e77d2 Merge "Skip check_vintf_system_deps if not building system image" into main am: 0656d0a451
Original change: https://android-review.googlesource.com/c/platform/build/+/2973131

Change-Id: I8e8b02963e741743f6725596bcc07790728d0f12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-26 03:23:47 +00:00
Yi-Yo Chiang
0656d0a451 Merge "Skip check_vintf_system_deps if not building system image" into main 2024-02-26 02:51:26 +00:00
Thiébaud Weksteen
78f29acf19 Add RELEASE_SELINUX_DATA_DATA_IGNORE flag
Bug: 317296680
Test: presubmit
Change-Id: I004654cd652516fb73308ddcaa9d0607a755c177
2024-02-26 13:08:55 +11:00
Peter Collingbourne
69281c31ba Create empty /linkerconfig/ld.config.txt in ramdisk.
This silences warnings such as:

linker: Warning: failed to find generated linker configuration from "/linkerconfig/ld.config.txt"
WARNING: linker: Warning: failed to find generated linker configuration from "/linkerconfig/ld.config.txt"

that are printed at the start of every command in the first
stage console.

Change-Id: I3d820e4960a4dbca34369223aed83589534c2eb6
2024-02-23 23:04:33 -08:00
Seungjae Yoo
976035677c Resign microdroid_vendor.img with avb_vendor_key
microdroid_vendor.img is vendor image for running Microdroid, a type of
VM run on top of Android. microdroid_vendor.img is currently stored in
host device's vendor partition. However the original key signed for
microdroid_vendor.img is not enrolled in the signing server, so it can
make possible test breakage if there's a test checking all files in the
partition is signed with trusted key.

Therefore, this is the patch to resign micrdoroid_vendor.img with
avb_vendor_key. When vendor image of host device is resigned with that
key, microdroid_vendor.img would be resigned as well with the same key.

Bug: 285855442
Test: First, for testing, modify the script to skip all files except
VENDOR/etc/avf/microdroid/microdroid_vendor.img in ProcessTargetFiles.
Second, run following commands and check if script doesn't throw any
error until ProcessTargetFiles ends.
- sign_target_files_apks --avb_vendor_key external/avb/test/data/testkey_rsa2048.pem --avb_vendor_algorithm SHA256_RSA2048 <source_zip_file> <target_zip_file>
- sign_target_files_apks --avb_vendor_key external/avb/test/data/testkey_rsa4096.pem --avb_vendor_algorithm SHA256_RSA4096 <source_zip_file> <target_zip_file>
- sign_target_files_apks --avb_vendor_key external/avb/test/data/testkey_rsa8192.pem --avb_vendor_algorithm SHA256_RSA8192 <source_zip_file> <target_zip_file>
Third, `unzip <target_zip_file>` and do `avbtool info_image`

Change-Id: I5337f61ab9eca7e6d0f92860486bc820b6e09eac
2024-02-23 11:58:15 +09:00
Yi-Yo Chiang
00ae5874ea Merge "core/Makefile: Define write-file-lines unconditionally" into main am: 999350475b
Original change: https://android-review.googlesource.com/c/platform/build/+/2972991

Change-Id: I0471eabd46f39f0bb5b38dc5ca9ccebe9ce6e334
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23 02:37:05 +00:00
Treehugger Robot
8b7801fda5 Merge changes from topics "product_runtime_apis", "product_var_hidden_api" into main am: 0a8fd1404e
Original change: https://android-review.googlesource.com/c/platform/build/+/2974393

Change-Id: I3dc9c70f0fe740e3cbefaf60b0a7e60e3b068168
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23 02:36:48 +00:00
Jihoon Kang
bb717a3c38 Introduce the product variable PRODUCT_EXPORT_RUNTIME_APIS am: 49f08d9328
Original change: https://android-review.googlesource.com/c/platform/build/+/2974392

Change-Id: Ifdf34587fc7ed266cf7e0604622321120048ac58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23 02:36:44 +00:00
Jihoon Kang
886cdfe157 Introduce product variable PRODUCT_HIDDEN_API_EXPORTABLE_STUBS am: c974a2786f
Original change: https://android-review.googlesource.com/c/platform/build/+/2974391

Change-Id: I9da44df6876255b33e8388adb05bbc3ba2f17af2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23 02:36:39 +00:00
Yi-Yo Chiang
cfef6e8ee2 Merge "Add system_ext.img to droidcore-unbundled" into main am: 0f68977878
Original change: https://android-review.googlesource.com/c/platform/build/+/2973132

Change-Id: I30b08a5d5e1ee416755856030041c5bb82914580
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-23 02:35:56 +00:00
Yi-Yo Chiang
999350475b Merge "core/Makefile: Define write-file-lines unconditionally" into main 2024-02-23 01:53:44 +00:00
Treehugger Robot
0a8fd1404e Merge changes from topics "product_runtime_apis", "product_var_hidden_api" into main
* changes:
  Introduce the product sdk_with_runtime_apis
  Introduce the product variable PRODUCT_EXPORT_RUNTIME_APIS
  Introduce product variable PRODUCT_HIDDEN_API_EXPORTABLE_STUBS
2024-02-23 01:53:40 +00:00
Yi-Yo Chiang
0f68977878 Merge "Add system_ext.img to droidcore-unbundled" into main 2024-02-23 01:53:20 +00:00
Dennis Shen
04aea83c2e aconfigd: add aconfigd to system partition
Bug: b/312444587
Test: m
Change-Id: Ib8195124cf9aea09c088f892fbe1b68b5d197704
2024-02-22 21:09:02 +00:00
Jihoon Kang
727dd6c4e5 Introduce the product sdk_with_runtime_apis
This product is an extension of the sdk product, and allows the
"runtime" api stub artifacts are exported to the dist directory and used
to generate the stubs.

Test: lunch sdk_with_runtime_apis-trunk_staging-eng && m sdk dist
Bug: 326312949
Change-Id: I96f6c1f5a5e7b40165d55ea4c0898a880ed62c96
2024-02-22 20:39:47 +00:00
Jihoon Kang
49f08d9328 Introduce the product variable PRODUCT_EXPORT_RUNTIME_APIS
PRODUCT_EXPORT_RUNTIME_APIS is a product variable that inherits the
behavior of the build flag RELEASE_EXPORT_RUNTIME_APIS, which is being
removed. This will be utilized in the product `sdk_with_runtime_apis`,
which will be introduced in a future change.

Test: m nothing --no-skip-soong-tests
Bug: 326312949
Change-Id: I4966b7bfc7423db049acfcede67233352ba8341b
2024-02-22 20:08:53 +00:00
Jihoon Kang
c974a2786f Introduce product variable PRODUCT_HIDDEN_API_EXPORTABLE_STUBS
The new product variable behaves identical to the build flag
RELEASE_HIDDEN_API_EXPORTABLE_STUBS: if the variable is set to true, the
hiddenapi flags are generated from the "exportable" stubs (i.e. the
stubs that does not include READ_WRITE permission or DISABLE state
flagged apis) instead of the "everything" stubs (i.e. the stubs that
includes all flagged apis regardless of the state of the flags). If the
variable is set to false, the stubs are generated from the "everything"
stubs.

This product variable will be utilized for `sdk_with_runtime_apis`
product in the future changes.

Test: m nothing
Bug: 326310637
Change-Id: Iab3b46ac39972b8721d3aa07cec622c57dafbd0e
2024-02-22 20:08:18 +00:00
Steven Moreland
8d8c62b9ad Merge "system += misctrl" into main am: e6045f8b74
Original change: https://android-review.googlesource.com/c/platform/build/+/2966072

Change-Id: I4726d9546531e4e3ebd84e4144f3df7c51dbd3c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-22 19:16:46 +00:00
Luca Farsi
f7ec772748 Merge "Build the general tests host shared libs." into main am: d84d2b056c
Original change: https://android-review.googlesource.com/c/platform/build/+/2971976

Change-Id: I59e7949dcd4ed111d9394c69662cbe227ff8d39b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-02-22 19:16:04 +00:00
Steven Moreland
e6045f8b74 Merge "system += misctrl" into main 2024-02-22 18:57:01 +00:00
Luca Farsi
d84d2b056c Merge "Build the general tests host shared libs." into main 2024-02-22 18:29:13 +00:00