Commit graph

80570 commits

Author SHA1 Message Date
Treehugger Robot
246687c445 Merge "Add module name argument to build_license_metadata." 2022-10-14 15:32:25 +00:00
Yi-yo Chiang
f6eab1f608 Merge "Add virt APEX to arm64 & x86_64 GSI" 2022-10-14 05:07:47 +00:00
Treehugger Robot
5de9086ee9 Merge "envsetup.sh: fix typo in multitree_lunch" 2022-10-14 01:57:03 +00:00
LaMont Jones
5151ddc13f envsetup.sh: fix typo in multitree_lunch
Run lunch, not the orchestrator.

Change-Id: Ib0d81bddce4dea8b4daa51e3399d0adc4f9c8e64
2022-10-13 23:05:15 +00:00
Bob Badour
4f4c75fba9 Add module name argument to build_license_metadata.
Test: m droid dist

Change-Id: I40b9f403a3d17cc202844f4cebf336de40e5defe
2022-10-13 13:50:35 -07:00
Yi-Yo Chiang
595a0f7c20 Add virt APEX to arm64 & x86_64 GSI
Bug: 252441099
Test: Install GSI (MASTER) on Pixel 6a (TM) && fastboot oem pkvm enable
Test: atest VirtualizationTestCases.64
Test: atest MicrodroidHostTestCases
Test: atest MicrodroidTestApp
Change-Id: Iad14c8627e2807ef5ab2930ba9ed3626c77f9aa7
2022-10-13 17:19:01 +08:00
Treehugger Robot
1c5f813bf0 Merge "Zipalign: Don't align directory entries" 2022-10-12 23:28:34 +00:00
Fabien Sanglard
8163cfa5f4 Zipalign: Don't align directory entries
Directories are entries with uncompressed size zero and ending with
character '/' or '\' are allowed in apks since b/204425803. These
entries should not be considered for alignment since they are not
mmap by the framework.

Test: align_test.cpp
Bug: 250872480
Change-Id: I964aad118a82839f9ed230acc4c2c76f51888c67
2022-10-12 13:57:16 -07:00
Treehugger Robot
548592df7a Merge "Split system and vendor unmounted notice deps" 2022-10-12 06:55:24 +00:00
Treehugger Robot
fe21f99d13 Merge "Use AVB footer to determine caremap" 2022-10-11 19:58:08 +00:00
Justin Yun
dd15ec1fd1 Split system and vendor unmounted notice deps
Some unmounted notices need to be included in system only but not in
vendor image. Split the unmounted notice deps to exclude system
dependent notices from the vendor image.

Bug: 243753534
Test: check notice.xml
Change-Id: I23071542ac7823caf9697463928dcd1781f9414a
2022-10-11 13:46:56 +09:00
Kelvin Zhang
1caead09f9 Use AVB footer to determine caremap
Care maps need to store the original image size, which excludes bytes
used by hash tree or FEC code.

We used to propagate original image size using the global OPTIONS
dictionary. This is bad coding practice, and also fragile because we
have to make sure what's stored in dictionary and what's on disk are
consistent. Instead, let's read the content of images on disk, and parse
the AVB footer. The AVB footer contains the ground truth original image
size.

Test: build OTA, make sure the care maps have valid range
Bug: 246504616
Change-Id: I9250b478ab34dda60578a6b8c23ae6d7a9385788
2022-10-10 13:12:50 -07:00
Treehugger Robot
c6ea3aa6e0 Merge "Limit cts-api-coverage parallelism to 8" 2022-10-10 20:05:52 +00:00
Pierre-Clément Tosi
23330a0fb6 Merge "core: Get pmvfw.img partition from Soong" 2022-10-10 17:27:27 +00:00
Colin Cross
bb5bb5e242 Limit cts-api-coverage parallelism to 8
cts-api-coverage is getting OOM killed in presubmit, likely due to
spawning a copy of dexdeps in parallel for every cpu in the system.
Limit it to 8 parallel subprocesses when running inside the build,
as other processes are likely already using cpu and memory.

Bug: 252817769
Test: m out/host/linux-x86/cts-api-coverage/system-api-coverage.html
Change-Id: Iaae6561ac173d32c1b5af895cab76f3f898da4bb
2022-10-10 10:16:23 -07:00
Treehugger Robot
ed024f1bc8 Merge "Move GetCareMap from common.py to add_img_to_target_files.py" 2022-10-10 16:59:51 +00:00
Anton Hansson
8e7ccf0cb7 Merge "Pass docs goal to kati" 2022-10-10 09:52:24 +00:00
Kelvin Zhang
f294c87cfe Move GetCareMap from common.py to add_img_to_target_files.py
common.py is too big, break it down if possible

Test: th
Bug: 246504616
Change-Id: Ic1c1f11b53673419558137dffc2e233eeafff2c1
2022-10-07 10:42:00 -07:00
Anton Hansson
7b2b0b209a Pass docs goal to kati
The docs goal affects makefile parsing (android_soong_config_variables),
so it needs to be passed to kati to work properly.

Bug: 251762621
Test: TARGET_PRODUCT=sdk m docs dist (in prebuilt branch)
Change-Id: Ifa8e1e8e3a239434ac40a3edb213ed6344ceb424
2022-10-07 16:21:04 +00:00
Sorin Basca
566aa5d177 Merge "Revert^2 "Use the toolchain from JDK 17 for Robolectric"" 2022-10-07 05:10:30 +00:00
Yi-yo Chiang
0c022f3161 Merge "Assert BOARD_BUILD_SYSTEM_ROOT_IMAGE is not true" 2022-10-07 03:47:48 +00:00
Jingwen Chen
6fcd760988 Merge "envsetup: add bmod to get Bazel label of a Soong module." 2022-10-06 23:21:14 +00:00
Jingwen Chen
a45c1be97d Merge "Disable USE_RBE with b builds (m bp2build)." 2022-10-06 23:20:59 +00:00
Treehugger Robot
fee742d7e1 Merge "Clear the OUT folder before update-api" 2022-10-06 20:21:49 +00:00
Treehugger Robot
909117a6e1 Merge "Add repo cleanup utility script." 2022-10-06 20:19:11 +00:00
Alex Buynytskyy
56f69e0c67 Add repo cleanup utility script.
Bug: 243966946
Test: run locally
Change-Id: I1c20161673a2cb1b300951e17d9f560310d20c0d
2022-10-06 17:48:36 +00:00
Alex Buynytskyy
2dcc78656c Clear the OUT folder before update-api
This *should* fix the bug when update-api fails to update current.txt

Bug: 243966946
Test: run locally
Change-Id: I330e03eee695b6b9b27785dd14d00e2589f9c5e7
2022-10-06 17:48:30 +00:00
Jingwen Chen
141d63dcd9 Disable USE_RBE with b builds (m bp2build).
RBE is not used with standalone builds, and it adds unnecessary
overhead.

Test: without this change, b info no-op takes 24s on my machine. with
this change, it drops to 9s.

Fixes: 251441524
Bug: 243596580
Change-Id: I564629064f51e2b2cad836915aacf6f72e84aaeb
2022-10-06 15:28:14 +00:00
Sorin Basca
c42562f596 Revert^2 "Use the toolchain from JDK 17 for Robolectric"
This reverts commit a2578b28ab.

Reason for revert: Issues that caused the failures have been fixed.

Bug: 233029164
Change-Id: Ibde1bc6d900815072146ea291737bff701485f9d
Test: TH
2022-10-06 14:50:57 +00:00
Mark Teffeteller
13b3f240bf Merge "Add module info to Haiku builds" 2022-10-06 14:13:20 +00:00
Yi-Yo Chiang
b4bd8395bf Assert BOARD_BUILD_SYSTEM_ROOT_IMAGE is not true
Right now BOARD_BUILD_SYSTEM_ROOT_IMAGE is either empty or false.
This change stops new users from setting BOARD_BUILD_SYSTEM_ROOT_IMAGE
to true. After all remaining references (read or set to empty/false) to
BOARD_BUILD_SYSTEM_ROOT_IMAGE are removed, we can mark it as obsolete.

Bug: 241346584
Test: Presubmit build_test
Change-Id: Ie23504525ffc0f0dcad6dff81e7eddb22edffd0e
2022-10-06 19:00:04 +08:00
Rob Seymour
e78ed3ed49 Merge "Update check_target_files_vintf to check the last line of stdout." 2022-10-06 00:40:11 +00:00
Xin Li
a93e7417aa Merge "Merge TP1A.221005.003" 2022-10-05 22:20:14 +00:00
Colin Cross
a4e13d8866 Merge "Add initial files for aosp_riscv64 target" 2022-10-05 22:03:22 +00:00
Colin Cross
be8d2442ae Merge "Remove references to gcc from envsetup.sh" 2022-10-05 22:01:49 +00:00
Rob Seymour
dc4e0f2ee0 Update check_target_files_vintf to check the last line of stdout.
More output is now produced on stdout by checkvintf.
Update logic to compare against the last line for incompatible.

Fixes the following tests:
test_check_target_files_vintf.CheckTargetFilesVintfTest#test_CheckVintf_kernel_incompat
test_check_target_files_vintf.CheckTargetFilesVintfTest#test_CheckVintf_matrix_incompat
test_check_target_files_vintf.CheckTargetFilesVintfTest#test_CheckVintf_sku_incompat

Bug: 251221029
Test: atest releasetools_test
Change-Id: I592acf9a3868e2a60e203b2201e7fadcbb0e7f04
2022-10-05 19:52:54 +00:00
Colin Cross
dac728895d Add initial files for aosp_riscv64 target
Add barebones files to support building for a riscv64 target.

Bug: 250918230
Test: lunch aosp_riscv64-userdebug && m ALLOW_MISSING_DEPENDENCIES=true nothing
Change-Id: I61e6ecf6706b7682c77b07e6593d78c7d1eaef39
2022-10-05 12:04:31 -07:00
Colin Cross
c0b0104bff Remove references to gcc from envsetup.sh
The target gcc toolchains have been removed from the tree, remove them
from the PATH set up by envsetup.sh.  Also remove GCC_COLORS, since
we always use clang.

Test: source envsetup.sh
Change-Id: I6020816a78d0f3e03ade13812313adb156864ab6
2022-10-05 12:03:03 -07:00
Jihoon Kang
529b58c8e8 Merge "Create partition-specific symlink for jnilib install" 2022-10-05 16:19:51 +00:00
Mark
f7ffdac744 Add module info to Haiku builds
Test: make haiku
Change-Id: I8b3e2792f750e9aaeb2b05fee784a972118f9bd9
2022-10-05 15:49:49 +00:00
Jingwen Chen
83eeebb4df envsetup: add bmod to get Bazel label of a Soong module.
This benefits interactive workflows of folks who are used to typing just
module names on the command line, and lowers the cognitive load to find
the package name, and can be used to check if a module is converted.

Can be used as :

$ bmod libaapt2
//frameworks/base/tools/aapt2:libaapt2
$ b build $(bmod aapt2)

If the mod is not in the bp2build metrics file, it returns:

$ bmod nonexistent
nonexistent is not converted to Bazel.

Test: build/make/core/tests/b_tests.sh
Change-Id: I245665a393621a47598e6743c0fedcd87ac33631
2022-10-05 04:11:22 +00:00
Treehugger Robot
694cb51d7e Merge "Also copy init.zygote64.rc for 64-bit primary 32-bit secondary targets." 2022-10-04 21:14:37 +00:00
Treehugger Robot
7af526f93f Merge "Retire emulator.mk" 2022-10-04 20:15:56 +00:00
Peter Collingbourne
58a7f29c21 Also copy init.zygote64.rc for 64-bit primary 32-bit secondary targets.
Bug: 250705777
Change-Id: I59563d4907bb91fcdb17dbe5d687411cf8be7031
2022-10-04 11:31:57 -07:00
Roman Kiryanov
d9bbd880fd Retire emulator.mk
use emulator_vendor.mk instead

Bug: 250696437
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: Ib770efb32fdf014d8ffa20ec34485d3235036a4a
2022-10-04 10:34:36 -07:00
Treehugger Robot
38226d289d Merge "releasetools: Support erofs on non-dynamic partitions" 2022-10-04 17:33:57 +00:00
Xin Li
dc42f73ad8 Merge TP1A.221005.003
Merged-In: If4e16c8a7ab84076c129e1a6ed1e7c31b46164db
Change-Id: Ic2a8f8130a1090cd67f280418e7a6b933fe7f195
2022-10-03 13:19:15 -07:00
Ken Sun
61818c4aa9 Merge "Revert "Use the toolchain from JDK 17"" 2022-10-03 03:17:13 +00:00
Ken Sun
a2578b28ab Revert "Use the toolchain from JDK 17"
Revert "Use the toolchain from JDK 17"

Revert submission 2164342-use-jdk17

Reason for revert: DroidMonitor-triggered revert due to breakage b/250426490

Reverted Changes:
Ib1a24e7ea:Update path for libjli.so
I3375bd4e4:Use the toolchain from JDK 17
I9183e5511:Use the toolchain from JDK 17

Change-Id: Ic72662dab2e57a60272b0a82606a17974efcd982
2022-10-03 03:12:41 +00:00
Sorin Basca
71ddbf4351 Merge "Use the toolchain from JDK 17" 2022-10-02 19:36:17 +00:00