Commit graph

80816 commits

Author SHA1 Message Date
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
Muhammad Haseeb Ahmad
2f07ac4eba Merge "Add make commands for haiku-java-host and haiku-java-device" 2022-10-14 20:53:37 +00:00
Treehugger Robot
b215d93833 Merge "Ensure line numbers are preserved in default Proguard config" 2022-10-14 19:16:24 +00:00
Rob Seymour
0a00cd27d2 Merge "Add APEX data to checkvintf for compatibility check." 2022-10-14 18:04:46 +00:00
Muhammad Haseeb Ahmad
e3a8940c1e Add make commands for haiku-java-host and haiku-java-device
Bug: 246398305
Test: SANITIZE_TARGET="fuzzer hwaddress" build/soong/soong_ui.bash --make-mode -j86 haiku-java-device dist DIST_DIR="/usr/local/google/home/mhahmad/Desktop/android2/OUT"
SANITIZE_HOST="fuzzer address" build/soong/soong_ui.bash --make-mode -j86 haiku-java-host dist DIST_DIR="/usr/local/google/home/mhahmad/Desktop/android2/OUT"

Change-Id: I9dcf5e136e036d04e483722e286c08d20fa1508a
2022-10-14 17:40:28 +00:00
Devin Moore
a835eb9810 Don't install omx service by default on new devices
On devices launching after Android U, we no longer install the HIDL OMX
service. It is deprecated.

Test: Build and run Cuttlefish with SHIPING_API_LEVEL 33 and 34
Bug: 218588089
Change-Id: I9a6dbffd381bdad5428e9c365bd50445a9b14a67
2022-10-14 15:51:49 +00:00
Treehugger Robot
01c828eaec Merge "Remove extra semicolons from event log tag generated files" 2022-10-14 15:40:23 +00:00
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
Cole Faust
43d2d682a8 Remove extra semicolons from event log tag generated files
To avoid an errorprone error.

Test: Presubmits
Change-Id: I5d5eefd5e54e6e862755894dd0b2f34e9e7fad89
2022-10-13 17:47:42 -07:00
Jared Duke
dd1fd79728 Ensure line numbers are preserved in default Proguard config
Explicitly keep the `LineNumberTable,SourceFile` attributes, ensuring
positional information is preserved for stack traces. While this isn't
required in R8's Proguard compat mode (still the default in soong), it
is needed for R8's full mode or when optimizations are enabled.

Bug: 215530220
Test: m
Change-Id: If1994e92f694c1a82317d79267714ad8114f3d99
2022-10-13 16:31:45 -07: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
Yi-Yo Chiang
06c6273073 Remove deprecated BOARD_BUILD_SYSTEM_ROOT_IMAGE
This variable is always false or empty now, so clean up remaining
references of the variable.

Remove "buildvariant=" kernel commandline as it was used by
system-as-root kernels to determine the system build variant. It is
unsupported now.

Bug: 241346584
Test: Presubmit
Change-Id: I0f97b6e0bf8b03429f65366119ff78f9c7983516
2022-10-13 16:08:53 +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