Commit Graph

89540 Commits

Author SHA1 Message Date
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
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
Treehugger Robot
2fd4abc212 Merge "Add cog setup scripts" into main 2023-09-14 18:20:52 +00:00
Alyssa Ketpreechasawat
b46d79b745 Merge "Add mainline_module_prebuilt_* in BLUEPRINT_INCLUDE_TAGS_ALLOWLIST." into main am: 6e1c947d59
Original change: https://android-review.googlesource.com/c/platform/build/+/2750122

Change-Id: I22964d6f3dadd10c2e93fb08c4ad86e31e0eb7cf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 18:06:59 +00:00
Dennis Shen
a1de8fd435 aconfig: Fix missing header in the generated c/cpp code
Test: atest aconfig.test
Change-Id: I0c23299ad366cb5c61b84b738dd9e6bf3428435c
2023-09-14 17:40:13 +00:00
Alyssa Ketpreechasawat
6e1c947d59 Merge "Add mainline_module_prebuilt_* in BLUEPRINT_INCLUDE_TAGS_ALLOWLIST." into main 2023-09-14 17:24:52 +00:00
Kousik Kumar
ec5416c9ad Add cog setup scripts
This script has the following functionality:
1. Sets up the `out` symlink to point to a default location on disk
2. Copies RBE binaries outside Cog (temporary fix for build stall problem) - b/289391270
3. Exports ANDROID_BUILD_ENVIRONMENT_CONFIG variable to point to googler-cog.json file. This file will be available in aosp-main-with-phones and goog/main and downstream branches.

TESTED=ran the script within and outside the Cog workspace to test it.

Bug: b/295053716
Change-Id: I59cd6d2d5f954be6f7e4ecd7d64de1e63e51b72e
2023-09-14 17:11:45 +00:00
Ted Bauer
98bedd8854 Dump Aconfig flags pb file alongside textproto.
Bug: 299907996
Test: manually confirmed that pb file is gen'd and cp'd to device
Change-Id: I8e5c7bb8b1ad234bd6f0dba4de1cbe3fe1df19ae
2023-09-14 15:28:12 +00:00
Jooyung Han
72187661c3 Revert^2 "Install CAS HAL APEX"
5d6da97ed0

Change-Id: Ic621583ff1ee1c3eefb6caeff77d950f2e08e1e1
2023-09-14 13:31:55 +00:00
Justin Yun
9ccc880aa6 Define PRODUCT_PRODUCT_VNDK_VERSION as current by default
It has been mandatory since Android 11 (rvc) launching devices. Now we
can enable the product variants by default to all devices.

Bug: 300371698
Test: TH
Change-Id: I6b2d2e8e105ca35c38db8132486b1cb3bdbab40f
2023-09-14 13:11:46 +00:00
Zhi Dou
73a34ce10a aconfig: throw exception if reading from DeviceConfig fails
Reading value from DeviceConfig may fail if the provider is not ready.
Since DeciceConfig, and Settings class are static wrapper on top of
the provider, it won't cause the instance  initialization issue.
Thus when the issue happens it means the provider is not initialized.

Test: atest aconfig.test.java and manually make a change in the
framework and check the exception message
Bug: 299471646

Change-Id: Ic08d7a9cd32a8810a7274b6d93c249abccb50b9e
2023-09-14 13:00:45 +00:00
Sebastian Pickl
f4ce61774a Merge "Revert "Install CAS HAL APEX"" into main am: 91646be0a5
Original change: https://android-review.googlesource.com/c/platform/build/+/2751048

Change-Id: I0d3225691bfe3fe1f471ba49ad5e0fdc21ef6d82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 12:37:00 +00:00
Sebastian Pickl
91646be0a5 Merge "Revert "Install CAS HAL APEX"" into main 2023-09-14 12:26:38 +00:00
Sebastian Pickl
5d6da97ed0 Revert "Install CAS HAL APEX"
Revert submission 2742398-cas-apex

Reason for revert: culprit for flake b/300311777, verified with go/abtd with 15 runs to make sure the flake is gone https://android-build.googleplex.com/builds/abtd/run/L46500000963034919

Bug:300311777

Change-Id: I2b566413ac1869f9bf3e974da7d84662047e436a
2023-09-14 12:25:49 +00:00
Alyssa Ketpreechasawat
8894e1f02e Add mainline_module_prebuilt_* in BLUEPRINT_INCLUDE_TAGS_ALLOWLIST.
The newly added mainline_module_prebuilt_nightly and mainline_module_prebuilt_monthly_release are possible values for RELEASE_MAINLINE_MODULE_PREBUILT_VERSION (build flag in trunk stable). By adding these in BLUEPRINT_INCLUDE_TAGS_ALLOWLIST, we would be able to choose mainline modules prebuilts (apks) based on release config.

Bug: 294969202
Test: DEFAULT_MODULE_BUILD_FROM_SOURCE=false m (with 2 versions of apks, different blueprint_package_includes)
Change-Id: Ifcc49e5499d4659b73179fff715945cd2e3ca4fa
2023-09-14 11:08:20 +00:00
Treehugger Robot
a61ed55d48 Merge "Do not freeze VNDK in trunk stable" into main am: 1e042d4635
Original change: https://android-review.googlesource.com/c/platform/build/+/2747261

Change-Id: I9eec8eed73fe4f3e816765ef59cff2e612f2c679
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14 00:43:18 +00:00
Treehugger Robot
1e042d4635 Merge "Do not freeze VNDK in trunk stable" into main 2023-09-14 00:16:18 +00:00
Cole Faust
a1e610a819 Merge "Change default logging level to WARNING" into main am: 386470f7d7
Original change: https://android-review.googlesource.com/c/platform/build/+/2748498

Change-Id: Ie6a43959c180245efbeb513fad67da919b2447fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 21:17:35 +00:00
Cole Faust
386470f7d7 Merge "Change default logging level to WARNING" into main 2023-09-13 20:22:22 +00:00
Cole Faust
7d5f7352c0 Merge "Mention LOCAL_POST_INSTALL_CMD when talking about BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main am: b870b9c933
Original change: https://android-review.googlesource.com/c/platform/build/+/2748497

Change-Id: Iac1000a5ac31b6f88bef2a2a81f74dd123144e2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 18:50:27 +00:00
Cole Faust
b870b9c933 Merge "Mention LOCAL_POST_INSTALL_CMD when talking about BUILD_BROKEN_INCORRECT_PARTITION_IMAGES" into main 2023-09-13 18:08:22 +00:00
Colin Cross
cbc3ace1db Merge "Update LOCAL_JAVA_LANGUAGE_VERSION logic to match Soong" into main am: 708dc5bf81
Original change: https://android-review.googlesource.com/c/platform/build/+/2748842

Change-Id: I1d7c1ae71a916ab497a0ee8ba81b89718922fa37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 18:01:14 +00:00
Colin Cross
708dc5bf81 Merge "Update LOCAL_JAVA_LANGUAGE_VERSION logic to match Soong" into main 2023-09-13 16:48:35 +00:00
Mårten Kongstad
7fca45d34a Merge "aconfig: explicitly @hide FLAG_ constants" into main am: 65d19d1403
Original change: https://android-review.googlesource.com/c/platform/build/+/2748397

Change-Id: I82cd8383c2578a30cfb1b25dd9000345537a560a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 13:04:51 +00:00
Mårten Kongstad
65d19d1403 Merge "aconfig: explicitly @hide FLAG_ constants" into main 2023-09-13 11:58:22 +00:00
Mårten Kongstad
fb10840da5 aconfig: explicitly @hide FLAG_ constants
Because of a bug in metalava [1], the flag constants are incorrectly
considered not-hidden when metalava generates the API signature files.
This means the FLAG_ constant name will be used, instead of the FLAG_
constant value, which is what we want.

While waiting for b/300211291 to be fixed, explicitly mark the FLAG_
constants as hidden (and keep marking the classes as such).

This CL can be reverted when b/300211291 is fixed.

1. Item.isHiddenOrRemoved does not check if its parent item is hidden,
   tracked in b/300211291

Bug: 297881670
Test: atest aconfig.test aconfig.test.java
Change-Id: I05de8344ccb424bee51c39f9609489ad312397ce
2023-09-13 10:15:01 +02:00
Daniel Zheng
ccb5ade512 Merge "remove --apply-vbmeta from vbmeta_vendor" into main am: 2860f5f574
Original change: https://android-review.googlesource.com/c/platform/build/+/2747219

Change-Id: I600baab15b26c6215c4550fb5711019ab7121d8c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13 07:58:34 +00:00
Daniel Zheng
2860f5f574 Merge "remove --apply-vbmeta from vbmeta_vendor" into main 2023-09-13 07:26:43 +00:00
Colin Cross
82df516665 Update LOCAL_JAVA_LANGUAGE_VERSION logic to match Soong
Support LOCAL_JAVA_LANGUAGE_VERSION := 11 or 17 and match the default value of 17 used
in Soong.

Bug: 298613711
Bug: 299937334
Test: m javac-check
Change-Id: I19aa24cc5197ab0e6cb03361124c36ce3e316810
2023-09-13 04:53:17 +00:00