10056 Commits

Author SHA1 Message Date
Treehugger Robot
39603ad5c5 Merge "Update diff allowlist for soong system image build" into main am: 53c4ec42ad
Original change: https://android-review.googlesource.com/c/platform/build/+/3241532

Change-Id: Ia3b78cb0f99afe17c9cd1be80d76a48ed2ea7251
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-28 17:24:20 +00:00
Zhi Dou
bca30dd13f Implement SipHasher
This change implements SipHasher in rust and java to make sure same
bytes array will be hashed into the same u64.

The implementation is needed, thus when rust, and java code read the
same flag file, they can find the same entry based on the same key.

Test: atest aconfig_storage_file.test.java aconfig_storage_file.test.cpp
Bug: 352078117
Change-Id: I2ce470039213a09a1df7637e60f4649b053fb2ea
2024-08-28 16:02:42 +00:00
Justin Yun
0fa47f4a54 Update diff allowlist for soong system image build
We already resolved files in system etc.
Remove them from the allowlist.

Bug: 346873717
Test: lunch aosp_cf_x86_64_phone-trunk_staging-userdebug && m
Change-Id: Ia38796aebe0e2e9a5d55e16f9c509c68214f687f
2024-08-28 06:22:25 +00:00
Spandan Das
3d509d8ca1 Merge "Remove some files from packaging allowlist" into main am: 03b680d4ba am: 259692c6f3
Original change: https://android-review.googlesource.com/c/platform/build/+/3241405

Change-Id: I28a231ae27bab800850c0a7f8476f51774c17ba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 23:37:53 +00:00
Spandan Das
259692c6f3 Merge "Remove some files from packaging allowlist" into main am: 03b680d4ba
Original change: https://android-review.googlesource.com/c/platform/build/+/3241405

Change-Id: I7b3ac632a4eabc19702c5d9460ec7d6ca3606fdf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 23:29:20 +00:00
Spandan Das
03b680d4ba Merge "Remove some files from packaging allowlist" into main 2024-08-26 23:26:10 +00:00
Spandan Das
0e695737e4 Remove some files from packaging allowlist
These files are symlinks. With https://r.android.com/3200722, these
should be available in the soong built system image.

Test: presubmits
Change-Id: I4acb05ed8498dc8b7aac76e4c91b9173ed3d6574
2024-08-26 21:29:24 +00:00
Treehugger Robot
b0b79f838e Merge "Revert "Fix problem of RepackApexPayload when using option --signing_args"" into main am: 1dbf5fb045 am: 17874e0299
Original change: https://android-review.googlesource.com/c/platform/build/+/3242201

Change-Id: I43f619e1711628dafeb00705011727e4ae6cd52c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 17:04:26 +00:00
Treehugger Robot
17874e0299 Merge "Revert "Fix problem of RepackApexPayload when using option --signing_args"" into main am: 1dbf5fb045
Original change: https://android-review.googlesource.com/c/platform/build/+/3242201

Change-Id: Id9e9606fd5f01c47a281a7aba6b056dcd394d90b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-26 16:55:57 +00:00
Treehugger Robot
1dbf5fb045 Merge "Revert "Fix problem of RepackApexPayload when using option --signing_args"" into main 2024-08-26 16:47:43 +00:00
Aaron Homer
58992a6052 Revert "Fix problem of RepackApexPayload when using option --signing_args"
This reverts commit 5ebc4febe6.

Reason for revert: This is causing the signing args to be improperly passed to apexer, treating them as if they are not specified as all.

Change-Id: Ifa0f8444a4a1871802316511b0ff0735f3350b2c
Bug: 361784913
2024-08-26 15:21:26 +00:00
Zhi Dou
3b8df957d8 Merge "Remove local copy of the flag file" into main am: 4fe368382d am: c0c37bb742
Original change: https://android-review.googlesource.com/c/platform/build/+/3236943

Change-Id: I5224ebdcc0e66ccf9c824e88d032119b8cf9727c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-23 14:35:17 +00:00
Zhi Dou
c0c37bb742 Merge "Remove local copy of the flag file" into main am: 4fe368382d
Original change: https://android-review.googlesource.com/c/platform/build/+/3236943

Change-Id: Ie18ba103ed07e1ae4b3fa83fb9c555f9f82443f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-23 14:27:20 +00:00
Zhi Dou
99023d6160 Remove local copy of the flag file
This change removes the local copy of the flag file in PackageTable, and
FlagValueList.

PackageTable copied the entire flag file into memory, and the
FlagValueList copied the entire flag value list into memory. In this
change FlagValueList directly access the flag value list in the memory.
PackageTable will iterate the file, and find the target package node.

Change-Id: Id766c28b71a54290b266cc5f3f404f5c82590da2
Test: atest aconfig_storage_file.test.java aconfig_storage_read_api.test.java
Bug: 352078117
2024-08-22 19:56:48 +00:00
Treehugger Robot
be37d3f911 Merge "Fix problem of RepackApexPayload when using option --signing_args" into main am: 2f0d0b861b am: 213b09e38a
Original change: https://android-review.googlesource.com/c/platform/build/+/3221018

Change-Id: I5fe9070820813c788e1cbd079528d8e746162120
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 18:19:01 +00:00
Treehugger Robot
213b09e38a Merge "Fix problem of RepackApexPayload when using option --signing_args" into main am: 2f0d0b861b
Original change: https://android-review.googlesource.com/c/platform/build/+/3221018

Change-Id: Ic808716b0265425e19d0a71a9ef1f7c610655270
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 18:12:03 +00:00
Treehugger Robot
2f0d0b861b Merge "Fix problem of RepackApexPayload when using option --signing_args" into main 2024-08-22 18:01:13 +00:00
Treehugger Robot
714862cfe9 Merge "Re-generate 4K boot OTAs using signed boot.img during signing process" into main am: 939326d3be am: f574cfe03c
Original change: https://android-review.googlesource.com/c/platform/build/+/3236656

Change-Id: I9553ea87761d440e84a03c34373bd0a5e0d1069e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 17:24:00 +00:00
Treehugger Robot
f574cfe03c Merge "Re-generate 4K boot OTAs using signed boot.img during signing process" into main am: 939326d3be
Original change: https://android-review.googlesource.com/c/platform/build/+/3236656

Change-Id: Iddf44f50417927611bc9a7094da657c06a6f211f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-22 17:17:39 +00:00
Treehugger Robot
939326d3be Merge "Re-generate 4K boot OTAs using signed boot.img during signing process" into main 2024-08-22 17:09:06 +00:00
Kelvin Zhang
b707ea0206 Re-generate 4K boot OTAs using signed boot.img during signing process
Currently, dev option OTAs are generated using dev-key signed boot.img
On release-key devices, OTA will install successfully, but user would be
using dev-key signed boot image after reverting to 4K mode, and
subsequent OTAs would fail. This CL re-generates 4K boot OTA using
release-key signed boot.img , which allows normal OTAs after toggling
dev options.

Test: th
Bug: 354019928
Change-Id: I40811d6ed7a37f50edea77d245bf559b66da5a71
2024-08-21 10:36:57 -07:00
Jerome Gaillard
bf87744078 Merge "Add overlay files to layoutlib res.zip" into main am: d93f559871 am: b0a67ce2df
Original change: https://android-review.googlesource.com/c/platform/build/+/3228769

Change-Id: I5c1b10f0424a4b4727792e80e90a591426c4be36
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 09:07:55 +00:00
Jerome Gaillard
b0a67ce2df Merge "Add overlay files to layoutlib res.zip" into main am: d93f559871
Original change: https://android-review.googlesource.com/c/platform/build/+/3228769

Change-Id: Ie112b2e3818b497a2feae30f83f3c15a704e21ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-21 09:02:23 +00:00
Jerome Gaillard
c97c0b4a7c Add overlay files to layoutlib res.zip
This adds resource overlay files to the res.zip file created by
layoutlib_data.mk. This also updates the script generating the
corresponding SBOM file.

Bug: 335355919
Test: m layoutlib
Change-Id: I2427be23720324eb03bd428d220b8777e3bf49bb
2024-08-20 13:37:41 +01:00
Zhi Dou
79115dbfc3 Revert^2 "DO NOT MERGE: manually cherry pick" am: 36d279f781
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28848929

Change-Id: I70fa87df77e888687087f8bc6b85b257a57ff008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-16 20:20:47 +00:00
Hieu Nguyen
5ebc4febe6 Fix problem of RepackApexPayload when using option --signing_args
The apex_util -> deapexer transition still passes signing args in as 1
huge string, just without the double qoutes. Once deapexer receives
the arugment, deapexer would attempt to shlex it, but double
quotes prevents proper shlexing, hence remove the double quotes.
As we added to log to monitor args parser when run apexer from
RepackApexPayload

2024-07-30 12:42:03 - common.py - INFO    :   Individual args list:
['/home/hieu/aosp/out/host/linux-x86/bin/apexer', '--force',
'--payload_only', '--do_not_check_keyname', '--apexer_tool_path',
'/home/hieu/aosp/out/host/linux-x86/bin:/home/hieu/aosp/out/host/linux-x86/bin:/home/hieu/aosp/out/host/linux-x86/bin:/home/hieu/aosp/prebuilts/clang/host/linux-x86/llvm-binutils-stable:/home/hieu/aosp/prebuilts/asuite/acloud/linux-x86:/home/hieu/aosp/prebuilts/asuite/aidegen/linux-x86:/home/hieu/aosp/prebuilts/asuite/atest/linux-x86:/home/hieu/aosp/prebuilts/jdk/jdk17/linux-x86/bin:/home/hieu/aosp/build/bazel/bin:/home/hieu/aosp/development/scripts:/home/hieu/aosp/prebuilts/devtools/tools:/home/hieu/aosp/prebuilts/misc/linux-x86/dtc:/home/hieu/aosp/prebuilts/misc/linux-x86/libufdt:/home/hieu/aosp/prebuilts/android-emulator/linux-x86_64:/home/hieu/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/lib/wsl/lib:/mnt/c/Program Files/WindowsApps/MicrosoftCorporationII.WindowsSubsystemForLinux_2.2.4.0_x64__8wekyb3d8bbwe:/mnt/c/WINDOWS/system32:/mnt/c/WINDOWS:/mnt/c/WINDOWS/System32/Wbem:/mnt/c/WINDOWS/System32/WindowsPowerShell/v1.0/:/mnt/c/WINDOWS/System32/OpenSSH/:/mnt/c/Program Files/7-Zip:/mnt/c/Users/hnguy140/AppData/Local/Microsoft/WindowsApps:/snap/bin', '--manifest', '/tmp/tmpjk8as91m/apex_manifest.pb', '--build_info', '/tmp/tmpjk8as91m/apex_build_info.pb',
'--key', 'key_dir/avb.pem',
'--signing_args', '--signing_helper_with_files external/fnv/production-sign-tools/production-signing-scripts/IVIMB/signing_helper/avb_signing_helper.py',
'/tmp/tmpji2gvei4', '/tmp/tmpjk8as91m/apex_payload.img', '-v']

As monitor from the above log '--signing_helper_with_files
.../avb_signing_helper.py' is considered as a single argument which make
apexer to be confused. The correct ways of parsing arguments is
'--signing_helper_with_files' and '.../avb_signing_helper' should be
separate to 2 arguments instead merge it as one like current
implementation.

Change-Id: I913b6b3f2ff03d8ce2333b1c2c38178967766778
Signed-off-by: Hieu Nguyen <hnguy140@ford.com>
2024-08-16 17:43:08 +00:00
Priyanka Advani (xWF)
f361302456 Revert "DO NOT MERGE: manually cherry pick" am: eb8140f1f4
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/28848230

Change-Id: Ibab931ee861aedab6b765b53f0d5b243a5cae698
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-16 17:39:50 +00:00
Zhi Dou
36d279f781 Revert^2 "DO NOT MERGE: manually cherry pick"
eb8140f1f4

Change-Id: Ic714001c059599358cd3b972df34110625e18253
2024-08-16 17:30:25 +00:00
Priyanka Advani (xWF)
eb8140f1f4 Revert "DO NOT MERGE: manually cherry pick"
Revert submission 28822444-manually_cp

Reason for revert: Droidmonitor created revert due to b/360378804.

Reverted changes: /q/submissionid:28822444-manually_cp

Change-Id: I2ea993388efb4b22d91d19c8c3017f52e44235d3
2024-08-16 17:18:19 +00:00
Xin Li
d18271c0c2 Merge aosp-24Q3-ts-dev
Bug: 358400644
Merged-In: Ia1f94ba19bab1f2e3b129827ad5634023290dbc5
Change-Id: Id01fbfb019f65f082b0b26897224260d38e4db59
2024-08-16 10:15:02 -07:00
Zhi Dou
b218b19b6a Merge "DO NOT MERGE: manually cherry pick" into aosp-main-future 2024-08-16 15:45:14 +00:00
Jooyung Han
bfa9fa4fdf Merge "Add /odm/apex/ support." into main am: 113f1f5c7e am: f5d16e0a60
Original change: https://android-review.googlesource.com/c/platform/build/+/3217178

Change-Id: Ia1942920c06cdebec6fdf549aef0f8a401be4587
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-16 04:29:17 +00:00
Jooyung Han
f5d16e0a60 Merge "Add /odm/apex/ support." into main am: 113f1f5c7e
Original change: https://android-review.googlesource.com/c/platform/build/+/3217178

Change-Id: I4bfb322b0bb7ae1a605f1a98dc3d32048aefb5a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-16 04:00:29 +00:00
Jooyung Han
113f1f5c7e Merge "Add /odm/apex/ support." into main 2024-08-16 03:46:57 +00:00
Ted Bauer
9129783cd5 Merge "Parse protos in library" into main am: 91458b4cd4 am: d79db262a3
Original change: https://android-review.googlesource.com/c/platform/build/+/3222383

Change-Id: I53e5e853003efc6d1f6950d0673f493b6d2e8b09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-15 23:01:02 +00:00
Ted Bauer
d79db262a3 Merge "Parse protos in library" into main am: 91458b4cd4
Original change: https://android-review.googlesource.com/c/platform/build/+/3222383

Change-Id: Iaad2c4a2996d048bfd727708f1b6fd9acf8dac9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-15 22:35:30 +00:00
Ted Bauer
91458b4cd4 Merge "Parse protos in library" into main 2024-08-15 22:15:19 +00:00
Ted Bauer
6f12acb0da Parse protos in library
Bug: 342636474
Test: m
Change-Id: I4934fa2332b00084f73453945d6b4743566f6e48
2024-08-15 21:04:28 +00:00
Jihoon Kang
c22365f0ec Merge "Specify is_stubs_module property in selected aconfig library modules" into main am: 0c26850dba am: 887384e80f
Original change: https://android-review.googlesource.com/c/platform/build/+/3219855

Change-Id: Ic9b0356a4f4f9ae80f0962b0ebb14b562a7eda14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-15 18:33:32 +00:00
Jihoon Kang
887384e80f Merge "Specify is_stubs_module property in selected aconfig library modules" into main am: 0c26850dba
Original change: https://android-review.googlesource.com/c/platform/build/+/3219855

Change-Id: I7287eb40524849f37d26ae103b3eae50bdf5b0f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-15 17:43:57 +00:00
Jihoon Kang
0c26850dba Merge "Specify is_stubs_module property in selected aconfig library modules" into main 2024-08-15 16:45:16 +00:00
Jooyung Han
1e45baff6b Add /odm/apex/ support.
We now allow APEXes in /odm.

Bug: 162049873
Change-Id: I2af97504a8d6159e778f8f833335db49beee6873
2024-08-15 07:38:17 +00:00
Jihoon Kang
48f2b22b45 Specify is_stubs_module property in selected aconfig library modules
"fake_device_config" and "strict_mode_stub" provide stubs and do not
contain any implementation details. Specifying the property
"is_stubs_module" to these modules allow inter-container dependency on
these modules.

Test: m nothing
Bug: 354029496
Change-Id: Ia65ad36ca02c0594fc753935f9cc7c0af6caa20d
2024-08-14 22:23:08 +00:00
Chris Wiseman
abed4f0a6e Merge "Fix build error while creating CHD image" into main am: 3e0319275f am: 04d7e4684c
Original change: https://android-review.googlesource.com/c/platform/build/+/3217720

Change-Id: I5c69f434badcf5d0b072fced4f4fb6c55704b25a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-14 19:48:34 +00:00
Chris Wiseman
04d7e4684c Merge "Fix build error while creating CHD image" into main am: 3e0319275f
Original change: https://android-review.googlesource.com/c/platform/build/+/3217720

Change-Id: Ia35f3db49a26ec853b4058c13558fb508f834bb9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-14 19:31:41 +00:00
Zhi Dou
57a20538f4 DO NOT MERGE: manually cherry pick
Ignore-AOSP-First: manually cherry pick
Change-Id: I3ae88f6af6189b8b96bdf090b40c0942bfa37d01
Test: presubmit
Bug: n/a
2024-08-14 14:13:03 +00:00
JaeMan Park
b3795b7933 Fix build error while creating CHD image
While building CHD image, it failed with the error

KeyError: 'system_dlkm_base_fs_file'

Fix the build error by deleting proper props in the python code.

Bug: 359578756
Test: Building CHD image using build_cf_hybrid_device.py should not failed
Change-Id: Iae84ff080b8f6bf3b8d22b26865ea3e74815ac37
2024-08-14 14:11:15 +09:00
Treehugger Robot
2a2e2b544b Merge "Only read the use_new_storage_value flag once per process." into main am: bdaf14f9e2 am: a5b26acddc
Original change: https://android-review.googlesource.com/c/platform/build/+/3212787

Change-Id: If3af4aa5dd895cef38953a4ab7dbba6301bfd8da
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-13 19:43:03 +00:00
Treehugger Robot
a5b26acddc Merge "Only read the use_new_storage_value flag once per process." into main am: bdaf14f9e2
Original change: https://android-review.googlesource.com/c/platform/build/+/3212787

Change-Id: I3ac230d45a2b4decb0bd6efdeb3bd22f1541df3a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2024-08-13 19:22:59 +00:00
Treehugger Robot
bdaf14f9e2 Merge "Only read the use_new_storage_value flag once per process." into main 2024-08-13 19:02:08 +00:00