StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
96,226 Commits 1 Branch 0 Tags
2a19321e3d86f23f35bf67c22885c64dae7b51d8
Commit Graph

9037 Commits

Author SHA1 Message Date
Alex Buynytskyy
d98c43c8dd Script updates. 
- add a mode to disable finalization steps if they were already merged,
- add the extension version into commit message.

Bug: 243966946
Test: local run
Change-Id: I51505e5d5715b56f3b385d714e1aabaae06f58ed
 2023-04-11 16:51:03 +00:00
Dennis Song
066b7a7062 Merge "Support merging target files from directory" am: a0ffed1fa1 am: 609dd3b00f am: 7ffe8ab317 
Original change: https://android-review.googlesource.com/c/platform/build/+/2525591

Change-Id: Ie9c358e544d5b82a6a2529570bf969c4f8c0ee82
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-11 07:21:21 +00:00
Dennis Song
7ffe8ab317 Merge "Support merging target files from directory" am: a0ffed1fa1 am: 609dd3b00f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2525591

Change-Id: I4fe623e0f07875ca112b593e83c00c048ceb436d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-11 06:51:03 +00:00
Dennis Song
a0ffed1fa1 Merge "Support merging target files from directory" 2023-04-11 05:40:05 +00:00
Treehugger Robot
21e87330e6 Merge "Allow setting future api level before REL" am: 52fdcf5457 am: 9358c91d08 am: fab0963700 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527081

Change-Id: I38131fc6b2933bd408caf0e31cdb9df39bcbedd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-11 01:52:55 +00:00
Treehugger Robot
fab0963700 Merge "Allow setting future api level before REL" am: 52fdcf5457 am: 9358c91d08 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527081

Change-Id: I9d22b49d076d6bf57b409c2871b01da79294ab70
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-11 01:20:50 +00:00
Treehugger Robot
52fdcf5457 Merge "Allow setting future api level before REL" 2023-04-11 00:09:23 +00:00
Treehugger Robot
d3384fd665 Merge "Check if an installed file exists and report error if not." am: 0bbde41728 am: 9d38ce9784 am: 7c93b50eca 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529028

Change-Id: I76befd44c7d9b0f9894019c7b08abc6edc06f0f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 19:49:29 +00:00
Treehugger Robot
7c93b50eca Merge "Check if an installed file exists and report error if not." am: 0bbde41728 am: 9d38ce9784 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529028

Change-Id: If6ae7c5d886b560a9e6bc67690e30e8c18b2459b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 19:17:50 +00:00
Dennis Song
5bfa43e5eb Support merging target files from directory 
Expand `merge_target_files.py` API capabilities so that
`--framework-target-files` and `--vendor-target-files`
can be either zip archives or directories.

Test: Create a merged package by vendor target files folder
Test: atest --host releasetools_test
Bug: 276068400
Change-Id: I200be2a458ae59a61e05bfd7c78ab66093db32eb
 2023-04-10 17:07:03 +08:00
Justin Yun
870ea2e188 Allow setting future api level before REL 
At the dev stage, devices may set ro.board.(first_)api_level to the
future API level

Bug: 276927022
Test: test_post_process_props.py
Change-Id: I85c29af74ed8daa780278f64b023480bb6659781
 2023-04-10 15:37:19 +09:00
Wei Li
3bcd0bca6f Check if an installed file exists and report error if not. 
So far there is only one case happened in b/277039235 that an installed file in that product is moved to another directory in LOCAL_POST_INSTALL_CMD. The team agreed to convert to Android.bp, but better to add a check and report the error.

Resend this to check symlinks using os.path.islink(), which doesn't follow the link. os.path.isfile() follows symlinks and returns false since the symlinks are for devices and could not be resolved on host file systems.

Bug: 277039235
Test: m sbom
Test: build/soong/tests/sbom_test.sh
Change-Id: Ia9f1cd24dc974a3e41487bc17c9c76a26d419395
 2023-04-07 16:36:30 -07:00
Wei Li
8b6849f55d Merge "Revert "Check if an installed file exists and report error if not."" am: 0bb86d0515 am: 3b488ddaac am: a4c29b4ecc 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529026

Change-Id: I6743ab4b12302ee62fe3c57225c947e277d31adc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 23:08:22 +00:00
Treehugger Robot
4f2cb2a3fd Merge "Add comments explaining how secondary OTA works" am: d8e23f9519 am: a1c42f5b17 am: 579e5d2dcd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527438

Change-Id: I24e6a828ae8dd44cd39229fd86e917a8bc8e70bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 23:07:21 +00:00
Wei Li
a4c29b4ecc Merge "Revert "Check if an installed file exists and report error if not."" am: 0bb86d0515 am: 3b488ddaac 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529026

Change-Id: I5f4574afa7e9899a75834975c47e9fba644dceca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 22:37:55 +00:00
Treehugger Robot
579e5d2dcd Merge "Add comments explaining how secondary OTA works" am: d8e23f9519 am: a1c42f5b17 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527438

Change-Id: I56d60c850c851f47905d5c23a5543b3e67b29008
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 22:37:28 +00:00
Wei Li
0bb86d0515 Merge "Revert "Check if an installed file exists and report error if not."" 2023-04-07 21:40:09 +00:00
Wei Li
fd559f89b5 Revert "Check if an installed file exists and report error if not." 
This reverts commit f049389e2e.

Reason for revert: the check includes more files that should not be excluded.

Change-Id: I7f7d260218826cc8fd033400b2cfaf40e4c280d0
 2023-04-07 21:35:13 +00:00
Treehugger Robot
d8e23f9519 Merge "Add comments explaining how secondary OTA works" 2023-04-07 20:57:36 +00:00
Treehugger Robot
f66ded0141 Merge "Check if an installed file exists and report error if not." am: bd5a6e882d am: 1b3b6ff8b2 am: 0ce108c06e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527433

Change-Id: Ibdb87f346766f2d24d0cf4ccd6da55cbd646c53a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 19:11:23 +00:00
Treehugger Robot
0ce108c06e Merge "Check if an installed file exists and report error if not." am: bd5a6e882d am: 1b3b6ff8b2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527433

Change-Id: I287adc2e6ac3642368e46d09fc0468819d599783
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 18:37:05 +00:00
Kelvin Zhang
bd111ccae2 Add comments explaining how secondary OTA works 
Test: th
Change-Id: I72f890e3dcb6f8369dea8071da040b4c27877a2b
 2023-04-07 09:47:04 -07:00
Wei Li
f049389e2e Check if an installed file exists and report error if not. 
So far there is only one case happened in b/277039235 that an installed file in that product is moved to another directory in LOCAL_POST_INSTALL_CMD. The team agreed to convert to Android.bp, but better to add a check and report the error.

Bug: 277039235
Test: m sbom
Test: build/soong/tests/sbom_test.sh
Change-Id: I9a2302ced6dd605e60e54c49a8778426444dcc4f
 2023-04-07 07:33:11 +00:00
Alex Buynytskyy
33707ef488 Merge "Minor renaming and documentation." am: 0fce469f2d am: fc5ca8ba20 am: 7807b77323 
Original change: https://android-review.googlesource.com/c/platform/build/+/2526606

Change-Id: I0433b874d7d5a522032f0984e323b54d688fc3b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 01:04:20 +00:00
Alex Buynytskyy
7807b77323 Merge "Minor renaming and documentation." am: 0fce469f2d am: fc5ca8ba20 
Original change: https://android-review.googlesource.com/c/platform/build/+/2526606

Change-Id: I40840fd9119090bd1aaef0ba24121dabba086412
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 00:34:03 +00:00
Alex Buynytskyy
0fce469f2d Merge "Minor renaming and documentation." 2023-04-06 23:38:33 +00:00
Alex Buynytskyy
307d9bcfdf Minor renaming and documentation. 
Bug: 276752264
Test: local run
Change-Id: I75814313a81ca041fa1461e48733bd40a020b777
 2023-04-06 15:28:39 -07:00
Alex Buynytskyy
3919502913 Merge "Copy ABI dumps from current/64 to FINAL_PLATFORM_SDK_VERSION/64" am: f5b6dd80ef am: ddc0d018e8 am: f6729d2255 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527080

Change-Id: Ib581eb457cf2bedcca340256d7cd44d10269a7cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 21:12:11 +00:00
Alex Buynytskyy
f6729d2255 Merge "Copy ABI dumps from current/64 to FINAL_PLATFORM_SDK_VERSION/64" am: f5b6dd80ef am: ddc0d018e8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527080

Change-Id: I3dc73e46ea6d20c9c168663947f910ef5b7ba5df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 20:43:51 +00:00
Alex Buynytskyy
f5b6dd80ef Merge "Copy ABI dumps from current/64 to FINAL_PLATFORM_SDK_VERSION/64" 2023-04-06 19:52:00 +00:00
Jihoon Kang
b9feb06b56 Merge "Specify list_files to be built with embedded launcher" am: 0c76cab34e am: 10bc93a66e am: 398a89be8a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2526959

Change-Id: I1a0a94ca2b46dcbbffa9336c1a851d61df0b23e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 18:26:20 +00:00
Jihoon Kang
398a89be8a Merge "Specify list_files to be built with embedded launcher" am: 0c76cab34e am: 10bc93a66e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2526959

Change-Id: I57a7cf94a8cf5c48ee69a0f75b348087341d62e1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 17:59:40 +00:00
Jihoon Kang
0c76cab34e Merge "Specify list_files to be built with embedded launcher" 2023-04-06 16:54:02 +00:00
Hsin-Yi Chen
ebce0d9501 Copy ABI dumps from current/64 to FINAL_PLATFORM_SDK_VERSION/64 
Because prebuilts/abi-dumps/ndk/current contains additional ABI dumps
that are not included in the finalization process, the script copies
only the subdirectory to the finalized ABI dump directory.

Test: ./finalize-sdk-rel.sh
Bug: 276503801
Change-Id: I76287cf110323baf40035a957564a1e8f39e8015
 2023-04-06 14:01:07 +00:00
Jihoon Kang
8f6edbbf04 Specify list_files to be built with embedded launcher 
In the current use case of list_files, the module is built with a
possibly incompatible host machine's python version. This change fixes
this by specifying module to be built with embedded launcher.

Test: m list_files
Bug: 277124374
Change-Id: Id894271042136c9db50e63852075a8c4ef36a71e
 2023-04-06 05:25:20 +00:00
Ibrahim Kanouche
ac89d51673 Merge "Added Document Fields to SBOM generator" am: aeeea61aa0 am: ac35dfa24a am: 52d2d30323 
Original change: https://android-review.googlesource.com/c/platform/build/+/2521055

Change-Id: Ied78deea3a00db96edf23110c302d2818cfa136c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 21:36:09 +00:00
Ibrahim Kanouche
52d2d30323 Merge "Added Document Fields to SBOM generator" am: aeeea61aa0 am: ac35dfa24a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2521055

Change-Id: I6714effcd6899c51feffe7f53b3247e17d3dcf7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 21:06:14 +00:00
Ibrahim Kanouche
aeeea61aa0 Merge "Added Document Fields to SBOM generator" 2023-04-05 20:37:04 +00:00
Kelvin Zhang
360ea743c6 Merge "Fix choosing wrong diff tool for recovery-from-boot patch" am: 3aa4644117 am: c8e58a10a0 am: 3dc5fb7392 
Original change: https://android-review.googlesource.com/c/platform/build/+/2501818

Change-Id: If7d132cb163e0b99940db1083c4daf17c1ec9013
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 18:32:17 +00:00
Kelvin Zhang
3dc5fb7392 Merge "Fix choosing wrong diff tool for recovery-from-boot patch" am: 3aa4644117 am: c8e58a10a0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2501818

Change-Id: Ic11be84be27ee80860202f387961de1e518f6ff4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:46:57 +00:00
Alex Buynytskyy
c3c48ca240 Set master finalization bug to 275409981. 
Ignore-AOSP-First: UpsideDownCake Finalization
Bug: 275409981
Test: builds
Change-Id: Iab70de07b5a46de0e2fd6b56c648c168ac0ebe6a
 2023-04-05 17:23:57 +00:00
Kelvin Zhang
3aa4644117 Merge "Fix choosing wrong diff tool for recovery-from-boot patch" 2023-04-05 16:40:36 +00:00
Ibrahim Kanouche
f89fc4aa9b Added Document Fields to SBOM generator 
Added functions to generate unique spdx doc namespace and generate a
clean document name

Test: m compliance_sbom

Bug: 265472710
Change-Id: I86ea9ddf50d066e139b757e8a093f98b8df8c81f
 2023-04-04 18:53:10 +00:00
Jihoon Kang
5ab24a7070 Merge "Create a python script to list files given a directory as an input" am: 155095a314 am: 3a99151087 
Original change: https://android-review.googlesource.com/c/platform/build/+/2516096

Change-Id: I219da8935b43c249ccad462ef0dd02d9f2db4fa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-04 00:26:04 +00:00
Jihoon Kang
155095a314 Merge "Create a python script to list files given a directory as an input" 2023-04-03 23:42:19 +00:00
Ibrahim Kanouche
a4c8c66a6e Merge "Revert "Revert "Updated SBOM generator module to generate JSON spdx utility bill of""" am: 960a4700e0 am: 0417e0417f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2518815

Change-Id: I01ea6aeb582477c61715eb18121b25e06a4f088b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-03 21:33:15 +00:00
Ibrahim Kanouche
960a4700e0 Merge "Revert "Revert "Updated SBOM generator module to generate JSON spdx utility bill of""" 2023-04-03 19:20:29 +00:00
Jihoon Kang
108379310d Create a python script to list files given a directory as an input 
The script will be used in generating a file that lists generated stub
files from metalava, which will be passed to soong_zip to extract
selected stub files when generating stubs from java_api_library modules
with incomplete api surface text files.

Test: build java_api_library modules in aosp/2487335
Change-Id: I36b830f14c714315f81e3fd8608d84c29f673f83
 2023-04-03 17:52:41 +00:00
Ibrahim Kanouche
91f2f9d851 Revert "Revert "Updated SBOM generator module to generate JSON spdx utility bill of"" 
This reverts commit 928ee9d9f7.

Reason for revert: Fixed the initial cause of the revert. Added spdx-tools to the missing branches. See b/276427351

Change-Id: I7bd0b3f194b27dc9a255ccadeb2a9a12a3d59f66
 2023-04-01 21:24:30 +00:00
Treehugger Robot
c8fb22c156 Merge "Move adb keys creation to CI-only step." am: 90206e3493 am: 32e87bddce 
Original change: https://android-review.googlesource.com/c/platform/build/+/2518355

Change-Id: I8cedaec529422aa8a6f861d817323192f4373fa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-01 04:13:44 +00:00