StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
83,933 Commits 1 Branch 0 Tags
609dd3b00f51066f45c24db7a5e2afb497ca28e3
Commit Graph

83933 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Dennis Song
609dd3b00f Merge "Support merging target files from directory" am: a0ffed1fa1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2525591

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

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

Change-Id: Id2cea3cfa9d23671c659070bd505005b254b170d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 18:25:34 +00:00
Treehugger Robot
0bbde41728 Merge "Check if an installed file exists and report error if not." 2023-04-10 17:49:32 +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
Jooyung Han
ac31a9eee0 Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable" am: c3610a1ae7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2508495

Change-Id: If536c973715525433053fa48cb42a456256db41a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-10 08:19:40 +00:00
Jooyung Han
c3610a1ae7 Merge "Add TARGET_USES_AOSP_FOR_WLAN soong variable" 2023-04-10 08:00:51 +00: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
Jooyung Han
06075e6543 Add TARGET_USES_AOSP_FOR_WLAN soong variable 
It's set and used in many .mk files. Adding this to "wifi" soong config
namespace helps migration of those .mk files into .bp files.

Bug: 273376293
Test: m libwifi-hal libwifi-hal-qcom
Merged-In: Ie0fad26305d50f70076b7e538fd1a7fa03e397cb
Change-Id: Ie0fad26305d50f70076b7e538fd1a7fa03e397cb
 2023-04-10 04:02:06 +00:00
Treehugger Robot
85d032fb46 Merge "Remove device.mk" am: 3665d8dfa8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529027

Change-Id: I0ccce688a70e04bca2cf832db4447b949b007c06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-08 04:08:09 +00:00
Treehugger Robot
3665d8dfa8 Merge "Remove device.mk" 2023-04-08 03:30:16 +00: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
Cole Faust
5752005ee4 Remove device.mk 
It just consisted of unused functions/variables, and had no edits
since the initial publish of android to git. It appears like it was
panned to have a device config similar to product config but was never
completed.

Test: Presubmits
Change-Id: I0ffcef1ae8bfd0611f1bede387f0c3e01fe53581
 2023-04-07 16:03:58 -07:00
Wei Li
3b488ddaac Merge "Revert "Check if an installed file exists and report error if not."" am: 0bb86d0515 
Original change: https://android-review.googlesource.com/c/platform/build/+/2529026

Change-Id: I43b48c58deda34e371f9572504a2540db75ed671
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 21:52:00 +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
Treehugger Robot
a1c42f5b17 Merge "Add comments explaining how secondary OTA works" am: d8e23f9519 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527438

Change-Id: Ib43745870dbb47aa9d8d79aacac7ead9937739a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 21:37:05 +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
1b3b6ff8b2 Merge "Check if an installed file exists and report error if not." am: bd5a6e882d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527433

Change-Id: I3d81aad580af9cec10ca61ae9e9baeb6f68103ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 18:07:03 +00:00
Treehugger Robot
bd5a6e882d Merge "Check if an installed file exists and report error if not." 2023-04-07 17:39:09 +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
Treehugger Robot
d7de9d7a9d Merge "Add partition compatibility symlinks to installed file list." am: 4ae1b2e2b1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2514021

Change-Id: I3f753b33271b8c67cfc6e91276d731ba849c6239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 03:30:03 +00:00
Treehugger Robot
4ae1b2e2b1 Merge "Add partition compatibility symlinks to installed file list." 2023-04-07 02:45:45 +00:00
Inseob Kim
c32b330031 Merge "Remove 28.0 compat support" am: 3875d6c82f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2519775

Change-Id: I4b49e53280c58f2e71fd9479b9479cac3ffbe753
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 01:18:49 +00:00
Inseob Kim
3875d6c82f Merge "Remove 28.0 compat support" 2023-04-07 00:52:30 +00:00
Alex Buynytskyy
fc5ca8ba20 Merge "Minor renaming and documentation." am: 0fce469f2d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2526606

Change-Id: Ia81fe45c00af64542757847b29c35c64727e9121
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-07 00:06:39 +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
Treehugger Robot
166753a939 Merge "Adapt to rearranged NDK sysroot." am: 40472c2371 
Original change: https://android-review.googlesource.com/c/platform/build/+/2518135

Change-Id: Ied98c79a80e58530ea88a175cf6afb0053fdbaa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 21:12:27 +00:00
Treehugger Robot
40472c2371 Merge "Adapt to rearranged NDK sysroot." 2023-04-06 20:46:41 +00:00
Alex Buynytskyy
ddc0d018e8 Merge "Copy ABI dumps from current/64 to FINAL_PLATFORM_SDK_VERSION/64" am: f5b6dd80ef 
Original change: https://android-review.googlesource.com/c/platform/build/+/2527080

Change-Id: I566b18cdea420c719fc4e14c70bfbd12dd0279ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 20:15:32 +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
10bc93a66e Merge "Specify list_files to be built with embedded launcher" am: 0c76cab34e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2526959

Change-Id: Ie9daa5fbe022330bdcc8c8293760be330035b494
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-06 17:32:54 +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
Treehugger Robot
7171df5985 Merge "Quote the value of product mfr in case it contains space." am: 557a4d56c9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2524438

Change-Id: Ia91a20cf443d0a6a7c2cd72b9329319620718150
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 21:52:00 +00:00
Treehugger Robot
557a4d56c9 Merge "Quote the value of product mfr in case it contains space." 2023-04-05 21:20:18 +00:00
Ibrahim Kanouche
ac35dfa24a Merge "Added Document Fields to SBOM generator" am: aeeea61aa0 
Original change: https://android-review.googlesource.com/c/platform/build/+/2521055

Change-Id: Id8010c266ac0d7f915b093276e40b9f4c828d92d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 20:50:59 +00:00
Ibrahim Kanouche
aeeea61aa0 Merge "Added Document Fields to SBOM generator" 2023-04-05 20:37:04 +00:00
Treehugger Robot
f2188a7994 Merge "Make android_certificate_directory public" am: 42bc8b9809 
Original change: https://android-review.googlesource.com/c/platform/build/+/2523277

Change-Id: I74a369c22d2427f871b01bd3cfc977cc46d688a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 20:34:48 +00:00
Treehugger Robot
42bc8b9809 Merge "Make android_certificate_directory public" 2023-04-05 19:40:51 +00:00
Wei Li
e64367cf29 Add partition compatibility symlinks to installed file list. 
Bug: 272358980
Test: CIs
Test: build/soong/tests/sbom_test.sh
Change-Id: If7c6b218a13dccc2cb74358b01dd9d5db52998fc
 2023-04-05 11:06:40 -07:00
Wei Li
5bb735bd95 Quote the value of product mfr in case it contains space. 
Bug: 277015970
Test: m sbom
Change-Id: Id18d5b60549a12d71f0eda626bb2a539025aafea
 2023-04-05 10:24:12 -07:00
Kelvin Zhang
c8e58a10a0 Merge "Fix choosing wrong diff tool for recovery-from-boot patch" am: 3aa4644117 
Original change: https://android-review.googlesource.com/c/platform/build/+/2501818

Change-Id: Id42a2d155af74eb7f885199d8761507216ceed03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 17:18:11 +00:00
Kelvin Zhang
3aa4644117 Merge "Fix choosing wrong diff tool for recovery-from-boot patch" 2023-04-05 16:40:36 +00:00
Juho Kim
3d396b837e Merge "Revert "Copy SBOM to dist directory when running "m dist"."" am: 79e77ec4b5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2524655

Change-Id: I65f143ea09fadea705973a639be296e39600d374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-05 08:32:33 +00:00