Commit graph

80630 commits

Author SHA1 Message Date
Treehugger Robot
aa3b322971 Merge "Convert findleaves.py to python 3" 2022-10-25 09:17:27 +00:00
Cole Faust
407d214b0d Convert findleaves.py to python 3
Kati special-cases findleaves.py to an internal
C++ implementation, so I don't think this python
script is even used. Update it anyways, and
test by manually running findleaves.py.

Bug: 203436762
Test: ./build/make/tools/findleaves.py --mindepth=2 --dir=build/make/target Android.mk
Change-Id: If27cc37d8f673388c0e31b9491e792b98ca59da4
2022-10-24 17:57:39 -07:00
Spandan Das
afa0bd4717 Merge "Convert check_radio_versions to python3" 2022-10-24 23:35:43 +00:00
Spandan Das
ce69e9c812 Convert check_radio_versions to python3
Additionaly,
1. Run it as a python_binary_host so that it uses the hermetic python
toolchain
2. Fix an existing bug where if `board_info_txt` was empty, $^ would
   evaluate to its own path, and it would try to parse the relevant
   configuration from the wrong file

Bug: 196300985
Test: m out/target/product/vsoc_arm64/android-info.txt
Change-Id: Ie1e51a93041591829da4351dd57f37106e15d764
2022-10-24 21:02:00 +00:00
Treehugger Robot
3946ea0318 Merge "Revert "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var"" 2022-10-24 15:32:05 +00:00
Yan Han
d6e2c8f84d Revert "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var"
This reverts commit 2bd45d0fd8.

Reason for revert: b/255298902

Change-Id: If0b006b0d88dd08ff116abc50d7b9dd4c8ea5806
2022-10-24 12:58:31 +00:00
Yi-yo Chiang
b72a874d4d Merge "Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var" 2022-10-24 09:25:25 +00:00
Treehugger Robot
e9d0a7f5d9 Merge "Convert fs_config_generator.py to python 3" 2022-10-21 21:17:23 +00:00
Treehugger Robot
775187f921 Merge "Fix ota build error when using boot variable files" 2022-10-21 20:43:21 +00:00
Cole Faust
216978e7c4 Convert fs_config_generator.py to python 3
Bug: 203436762
Test: ./test_fs_config_generator.py and m libc
Change-Id: I16ce5f5e273ade064acce8889a9eb3f2707910ae
2022-10-21 11:16:18 -07:00
Kelvin Zhang
eb147e051e Fix ota build error when using boot variable files
When performing a deep copy of info dict, input_file is serialized as
filename. Make ExtractFromInputFile support reading from filename of a
ZipFile.

Test: build OTA with partner provided target_files
Bug: 253549364
Change-Id: I366a076c32d638d61b83a1df9bf864807cf5257c
2022-10-21 10:53:21 -07:00
Dennis Song
8d69e1b7ef Merge "Add GSI overlay for SystemUI" 2022-10-21 07:37:42 +00:00
Treehugger Robot
e7bf5958b9 Merge "Fix broken fs_config_generator tests" 2022-10-21 01:33:41 +00:00
Colin Cross
a1920a2f2e Merge "Set ALLOW_MISSING_DEPENDENCIES=true in generic_riscv64/BoardConfig.mk" 2022-10-21 00:35:39 +00:00
Colin Cross
516cf13c05 Merge "Add a phony target to dist ndk_sysroot.tar.bz2" 2022-10-21 00:35:28 +00:00
Kelvin Zhang
08b7e3aacb Merge "add a test case to validate deepcopy on PartitionBuildProps" 2022-10-20 21:46:07 +00:00
Colin Cross
a098e96018 Set ALLOW_MISSING_DEPENDENCIES=true in generic_riscv64/BoardConfig.mk
Building for riscv64 without ALLOW_MISSING_DEPENDENCIES=true fails
on prebuilt modules that are missing riscv64 files.  Set
ALLOW_MISSING_DEPENDENCIES=true in BoardConfig.mk for now to avoid
always having to set it on the command line.

Test: lunch aosp_riscv64-userdebug && m ndk_sysroot
Change-Id: I6b7dcf684b59d073cb6e257717946d551aefdb44
2022-10-20 14:04:21 -07:00
Colin Cross
ec65b76217 Add a phony target to dist ndk_sysroot.tar.bz2
Test: lunch aosp_riscv64-userdebug && m ndk_sysroot
Change-Id: I9e1a7da8cd837fa50503f6458ed6b91829611a61
2022-10-20 14:03:47 -07:00
Cole Faust
f08ab3d098 Fix broken fs_config_generator tests
These tests were failing at TOT. Also add a
python_test_host target so the tests will be
run on CI in the future.

Bug: 203436762
Test: m libc, prebuilts/build-tools/linux-x86/bin/py2-cmd build/make/tools/fs_config/test_fs_config_generator.py
Change-Id: I6dda841023a2f5e76d59360d08626fc1a8842ffe
2022-10-20 13:40:07 -07:00
Treehugger Robot
de764d7d82 Merge "Update normalize_path.py to Python 3." 2022-10-20 20:27:06 +00:00
Treehugger Robot
a911c507dd Merge "Add prng_seeder to base PRODUCT_PACKAGES." 2022-10-20 20:20:19 +00:00
Pete Bentley
19b3361a02 Add prng_seeder to base PRODUCT_PACKAGES.
Needs to be on all (for now) devices with libcrypto, i.e. all
of them.

I failed to learn from https://r.android.com/1305853 that
adding something to Conscrypt's requirements doesn't work if
the module is coming from a prebuilt...

Again, the correct solution here would actually be to make
libcrypto rather than Conscrypt require prng_seeder but Soong
considers that a circular dependency

Bug: 243933553
Test: m installclean && m and verify prng_seeder is installed and running.
Change-Id: Ie34f8c693469eaeedae6a010b956d6c6513a6b15
2022-10-20 18:42:35 +01:00
GeQi
3fa9e32563 add a test case to validate deepcopy on PartitionBuildProps
Test: atest --host releasetools_test
Bug: 253549364
Change-Id: I187554ae33041ed090ee352167ef8deb51d754bc
2022-10-20 18:39:08 +08:00
Lukacs T. Berki
740641571c Update normalize_path.py to Python 3.
Test: presubmits.
Change-Id: I2db4fedcbb658a7ca4efa3a4557a216b8682735d
2022-10-20 08:11:18 +00:00
Treehugger Robot
eb5f9e2bef Merge "check_target_files_vintf: Support flattened apexes" 2022-10-20 03:19:24 +00:00
Treehugger Robot
3bb6ef9007 Merge "Fix picle error on ota_from_target_files" 2022-10-19 21:34:03 +00:00
Kelvin Zhang
5ef25191f7 Fix picle error on ota_from_target_files
When trying to make a deep copy of PartitionBuildProps, execution fails
with picle error because PartitionBuildProps stores a ZipFile object,
which stores a lock object, which doesn't support pickling.

To fix it, pickle ZipFile object as a str to its path.

Test: generate ota with boot variable files
Bug: 253549364
Change-Id: I92c5d78ce65045495203c85862922d33d886e9ea
2022-10-19 11:25:22 -07:00
Treehugger Robot
434295ceb5 Merge "Retire compatibility_matrix.xml in goldfish" 2022-10-19 15:52:48 +00:00
Anton Hansson
2e55cb4f6b Merge "Update naming of platforms subdir" 2022-10-19 11:52:32 +00:00
Bob Badour
e790bc6f0a Merge "Refactor projectmetadata into separate package." 2022-10-19 02:04:50 +00:00
Bob Badour
dc62de4760 Refactor projectmetadata into separate package.
Replace regular expressions to extract fields from a text proto with
and actual parsed protobuf.

Refactor TestFS into its own package, and implement StatFS.

Test: m droid dist cts alllicensemetadata

Test: repo forall -c 'echo -n "$REPO_PATH  " && $ANDROID_BUILD_TOP/out/host/linux-x86/bin/compliance_checkmetadata . 2>&1' | fgrep -v PASS

Change-Id: Icd17a6a2b6a4e2b6ffded48e964b9c9d6e4d64d6
2022-10-18 16:55:47 -07:00
Roman Kiryanov
09741e4e4d Retire compatibility_matrix.xml in goldfish
not required

Bug: 250696437
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I3dc983e829613daabbc836bea3e0e26af632a25d
2022-10-18 13:54:05 -07:00
Devin Moore
ee4bc816c3 Merge "Restrict the framework manifest check against frozen files" 2022-10-18 15:22:32 +00:00
Anton Hansson
8b22209184 Update naming of platforms subdir
The build system previously named the platforms subdir by
PLATFORM_VERSION, which is 13 for android 13, aka T, so the subdir
name would be android-13.

Android studio installs the SDK into a subdir identified by the api
level, so android-33 for android T, and also the extension api level
for extension SDKs, e.g. android-33-ext4.

Update the build system subdir name to match the android studio install
path, in order to avoid confusion and make it simpler to just unzip
a built SDK into the platforms dir, avoiding the need to provide a
package.xml file for studio to install it correctly.

Bug: 254023524
Test: m sdk sdk_repo dist, verify subdir is android-33 in:
   $ zipinfo -1 out/dist/android-sdk_eng.hansson_linux-x86.zip \
     | cut -f 1-3 -d '/' | grep platforms | sort | uniq
Change-Id: I1d3a7fd4c480859c28cdcbcb8c0cf2800ac4a1d7
2022-10-18 13:43:46 +00:00
Yi-Yo Chiang
2bd45d0fd8 Mark BOARD_BUILD_SYSTEM_ROOT_IMAGE as KATI_obsolete_var
Bug: 241346584
Test: Presubmit build_test
Change-Id: I5fc9fd98dccd24ce31f493f63841ee049e7fc5b7
2022-10-18 09:39:23 +00:00
Yi-yo Chiang
163ece5b55 Merge "Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE" 2022-10-18 06:57:24 +00:00
Treehugger Robot
6974223827 Merge "Remove unnecesasry use of ZipClose()" 2022-10-17 22:49:48 +00:00
Jooyung Han
eb1182115b check_target_files_vintf: Support flattened apexes
Flattened apexes are extracted and copytree()'d to /apex directory to
simulate "activation" on device.

Bug: 242314000
Bug: 239055765
Test: m otapackage # target with "flattened" apexe
Change-Id: I90cc37b5f64ebad1e15f6fc5fa245d0f5955095d

Change-Id: I7e8c3fdf8e4620344d23cee0de509e574206ad9b
2022-10-18 07:46:14 +09:00
Treehugger Robot
0923b6fe09 Merge "Add 'dump_apex_info' to otatools package." 2022-10-17 20:27:47 +00:00
Devin Moore
62d0a739bb Restrict the framework manifest check against frozen files
This only needs to be done for GSI targets that need to remain
compatible with previously frozen manifests so they continue to work for
older upgrading devices.

Test: lunch aosp_cf_x86_64_phone && m
Test: lunch aosp_arm64 && m
Test: both tests with and without android.hidl.manager served on device
Bug: 218588089
Change-Id: I34862b08cd4ba4c554b5fe9db0eeacba60a0c33a
2022-10-17 19:48:46 +00:00
Baligh Uddin
67ab689271 Add 'dump_apex_info' to otatools package.
BUG: 253963880
Test: Treehugger.
Change-Id: I795e6f85bfb6924a073e00b77c83e83eee8e30fa
2022-10-17 17:17:42 +00:00
Kelvin Zhang
2e1ff6e262 Remove unnecesasry use of ZipClose()
ZipClose() was introduced to work with large zip without switching to
ZIP64. It is a hacky patch. Now we have moved to python3 and zip64
completely, no need to keep using it.

Test: th
Bug: 246504616
Change-Id: I1ff15171bb26887b819f655e32817627ecad1132
2022-10-17 10:04:45 -07:00
Devin Moore
cd91bec2ca Merge "Don't install omx service by default on new devices" 2022-10-17 15:21:31 +00:00
Dennis Song
a0f242ae87 Add GSI overlay for SystemUI
Use runtime resource overlay to override SystemUI resources
in case some legacy devices might have invalid settings,
and the invalid settings might cause unexpected SystemUI
errors when installing GSI on different devices.

Bug: 245806899
Test: Build and install GSI on Pixel
Change-Id: I704ba8f1a4a1d058e5e992d3ca18bdb4bda6610d
2022-10-17 16:42:16 +08:00
Treehugger Robot
09d7031f7d Merge "Skip flattened apexes while check_target_files_vintf" 2022-10-17 06:09:15 +00:00
Jooyung Han
62283b9649 Skip flattened apexes while check_target_files_vintf
Flattened apexes should be handled differently. For now just skip
flattened apexes to fix the build breakage.

Bug: 253669548
Bug: 253700117
Bug: 239055765
Test: m otapackage for targets with "flattened apexes"
Change-Id: I102a961fc1365f42881ca9ee6546e71246792d2a
2022-10-17 10:38:41 +09:00
Wei Li
ddfc1ebf14 Merge "Change function ZipDelete to use Python module zipinfo instead of command 'zip'." 2022-10-16 05:55:00 +00:00
Colin Cross
92c35bda12 Merge "Add java flags from external/robolectric-shadows/robotest.sh to tradefed template" 2022-10-15 01:55:57 +00:00
Wei Li
8895f9ecea Change function ZipDelete to use Python module zipinfo instead of command 'zip'.
'zip' is a host command, and it can not be provided as a dependency when some release tools are used in Bazel rules.

Test: atest --host releasetools_test
Bug: 243748589

Change-Id: Ie5f42eadbd316ccd018b19194c466a908971af82
2022-10-14 18:31:56 -07:00
Colin Cross
e34744890c Add java flags from external/robolectric-shadows/robotest.sh to tradefed template
Add the same flags as external/robolectric-shadows/robotest.sh to
robolectric_test_config_template.xml so they apply to tests run
with atest or the test infra too.

Test: atest --host MyRoboTests
Change-Id: Iaac2dc30b82e6fcdc028e9dcdfaf0b1c7e9a2ba3
2022-10-14 15:55:31 -07:00