StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
87,306 Commits 1 Branch 0 Tags
e80e8b4c5cbde72338ee6e88d3b51a5f36656be2
Commit Graph

8345 Commits

Author SHA1 Message Date
Kelvin Zhang
6b10e15acc Support generating partial OTAs from extracted target_files 
This allows the build system to potentially paralleize generation of OTA
package and zipping of target files

Bug: 262185376
Bug: 227848550
Change-Id: I90b6c25761683ebe3803b22fc8e23540a5282c66
 2023-05-02 20:48:14 -07:00
Mårten Kongstad
867a349ed9 aconfig: add project scaffolding 
Introduce a new tool, aconfig, to manage build time configurations, such
as feature flags.

This CL adds a project skeleton. Later CLs will add the actual
implementation.

Note: there is no need for an explicit TEST_MAPPING file;
rust_test_host are automatically included in host-unit-tests and
explicitly adding these tests via TEST_MAPPING will cause an error.

Bug: 279485059
Test: m aconfig && aconfig
Test: atest aconfig.test
Change-Id: I94047a19a55ae4d45b4fd7a0c8105a91ddcdfd79
 2023-05-02 17:36:30 +02:00
Treehugger Robot
8583eae383 Merge "Use misc_info.txt to check for VABC" am: ed1ab26f5d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2572975

Change-Id: I2ef6cf286ed259dafc20f8bb1f4b0388a32b5fda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 22:41:40 +00:00
Treehugger Robot
ed1ab26f5d Merge "Use misc_info.txt to check for VABC" 2023-05-01 22:30:19 +00:00
Alex Buynytskyy
927e5096b6 Merge "Set next sdk_int to previous sdk_int + 1." am: f12a969445 
Original change: https://android-review.googlesource.com/c/platform/build/+/2575210

Change-Id: I3beb16122db4a76f6230913fc6b801cca714b9fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 19:48:02 +00:00
Alex Buynytskyy
d03be09214 Set next sdk_int to previous sdk_int + 1. 
OS and the finalization scripts use sdk_int - 1 in way too many places.

Bug: 275409981
Test: run locally
Change-Id: If4896a3eb0a6afadac5dbfd6ad455427d1c23d41
 2023-05-01 18:56:26 +00:00
Kelvin Zhang
e634bde6bd Use misc_info.txt to check for VABC 
Change-Id: I77f23a51ddb027254ccda8d7ab17e64205522300
 2023-04-28 23:59:43 -07:00
Alex Buynytskyy
75a8134b59 Merge "Correct if statement." am: 56f81f3d64 
Original change: https://android-review.googlesource.com/c/platform/build/+/2572939

Change-Id: I390029878186f26b357ce04229afeea9b0338b4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 00:48:14 +00:00
Alex Buynytskyy
01db2a97da Correct if statement. 
Bug: 275409981
Test: run locally
Change-Id: If6b8052748f816713cd16328ad1525dcd90ded69
 2023-04-29 00:06:39 +00:00
Cole Faust
cdb1a45ac2 Update sdk finalizer for change to api_levels_released_versions 
Change the starlark file, not the soong one.

Bug: 279095899
Test: manually ran this snippet
Change-Id: If7b93096743f79a5303db4330fc03cbc8fb5bae3
 2023-04-28 14:23:46 -07:00
Alex Buynytskyy
308059d67f Merge "Change CI API level to keep linter happy." am: a2a2f40414 
Original change: https://android-review.googlesource.com/c/platform/build/+/2569570

Change-Id: I360fe4bb66fdead79c3b55af7221b6ca411f7ae5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 23:09:48 +00:00
Alex Buynytskyy
5d205dc016 Change CI API level to keep linter happy. 
Bug: 275409981
Test: run locally
Change-Id: I99d2ef4974a70f435f528c7a9358990fa41c9f5e
 2023-04-27 15:30:19 -07:00
Alex Buynytskyy
aee2075ece Merge "Update Android Studio Version Number." am: ba71daa94e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2568552

Change-Id: I319e3712ed079d0988d9d63f3a00d17a097e0f79
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 19:26:34 +00:00
Alex Buynytskyy
d873b0e46b Update Android Studio Version Number. 
Bug: 275409981
Test: run locally
Change-Id: I0d62ac8178f6d69f66adde8c5889ff86bcfad0ed
 2023-04-27 18:18:57 +00:00
Treehugger Robot
f8f099a3db Merge "Let the finalization script create ABI dumps for all architectures" am: 99dc1341d1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2564374

Change-Id: Ic212e9fc3f4e18aa305c56db5c17e50ef22ffcf7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 06:32:25 +00:00
Treehugger Robot
99dc1341d1 Merge "Let the finalization script create ABI dumps for all architectures" 2023-04-27 05:52:25 +00:00
Po Hu
09de31418f Fix merge_target_files in GRF case 
aosp/2525591 remove SYSTEM/build.prop from vendor target_files,
and cause the same error reported in aosp/1836120.

Bug: 192422274
Change-Id: I3af33e44e395002a9cf26cf93677ff84c2c26207
 2023-04-27 10:41:25 +08:00
Alex Buynytskyy
31dd5afd9b Merge "Mark master as VIC development branch." am: d878cdf692 
Original change: https://android-review.googlesource.com/c/platform/build/+/2564671

Change-Id: I1c028547cf50b02c66099c7f75a38e6738605437
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 00:34:01 +00:00
Alex Buynytskyy
d878cdf692 Merge "Mark master as VIC development branch." 2023-04-26 23:39:11 +00:00
Daniel Zheng
fe2a0816b6 Merge "Add --max_threads to OTA generation" am: 15c296958b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2563130

Change-Id: Ibd5d90c7661ecf3367485cf43b887c2cefcde544
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-26 22:27:31 +00:00
Daniel Zheng
15c296958b Merge "Add --max_threads to OTA generation" 2023-04-26 21:53:53 +00:00
Alex Buynytskyy
0fc39526a1 Mark master as VIC development branch. 
Test: ./build-step-1-and-m.sh
Bug: 279615150
Change-Id: Idb485846345ea146c04c5ecf6eb4ab6eea122f9b
Merged-In: Idb485846345ea146c04c5ecf6eb4ab6eea122f9b
 2023-04-26 18:15:59 +00:00
Daniel Zheng
a30989bafa Add --max_threads to OTA generation 
Adding an option to configure max number of threads used during
ota_from_target_files

Bug: 277794445
Test: tested ota_from_target_files
Change-Id: I9bae92ee43c21926434ab04563a2b4f0678b73eb
 2023-04-26 10:52:12 -07:00
Hsin-Yi Chen
139cc54d81 Let the finalization script create ABI dumps for all architectures 
The command that creates ABI dumps was written for testing purpose.
It creates the ABI dumps for aosp_arm64-user. The complete finalization
process should create ABI dumps for all supported architectures. This
commit removes the command parameters so that it will create all ABI
dumps by default.

Test: out/host/linux-x86/bin/create_reference_dumps
Bug: 276503801
Change-Id: Id6fbbac512a13d085ea74fec6e8b137485639467
 2023-04-26 17:11:20 +08:00
Alex Buynytskyy
44395a8138 Mark udc-dev as finalized branch. 
Ignore-AOSP-First: This CL is only meant internal udc-dev at this time.
Test: ./build-step-1-and-m.sh
Bug: 279615150
Change-Id: I9920da7605cf6861742607a62222287f0c79b003
 2023-04-26 06:00:24 +00:00
Treehugger Robot
5939a80763 Merge "Support to merge PREBUILT_IMAGES" am: dd62b0da0f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2512522

Change-Id: I67339cb1a8108577522bd3446e868adbe3385439
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 05:17:11 +00:00
Treehugger Robot
dd62b0da0f Merge "Support to merge PREBUILT_IMAGES" 2023-04-25 04:24:20 +00:00
Kelvin Zhang
657af614c6 Fix incremental OTA generation failures 
source_file might be a directory, use the _ReadApexInfo() helper
function to read it instead of go straight to zipfiles.

Test: build incremental OTA for pixel
Bug: 279142680
Bug: 227848550
Bug: 277028723
(cherry picked from https://android-review.googlesource.com/q/commit:ca45d7a85d5eaf09ba8684f09440e8706ab190ca)
Merged-In: Ia0041e2c72c1a57123519c970f6e734194a81cd2
Change-Id: Ia0041e2c72c1a57123519c970f6e734194a81cd2
 2023-04-22 02:50:38 +00:00
Treehugger Robot
5970bf338b Merge "Fix incremental OTA generation failures" am: 5ca02ff114 
Original change: https://android-review.googlesource.com/c/platform/build/+/2553374

Change-Id: I17880a243562b821a634715b242677de52ba6d12
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-22 02:04:12 +00:00
Treehugger Robot
5ca02ff114 Merge "Fix incremental OTA generation failures" 2023-04-22 01:26:28 +00:00
Treehugger Robot
dba8e6640f Merge "Don't skip vndk finalization." am: 315e8b52ef 
Original change: https://android-review.googlesource.com/c/platform/build/+/2555112

Change-Id: I9e904fea56ee151042dd3f47b72da6e170f759f4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 23:55:05 +00:00
Alex Buynytskyy
f5897ecdb6 Don't skip vndk finalization. 
Bug: 275409981
Test: local run
Change-Id: I6651f29e3c5fd5f1ccb6ec07fd52491ba16f5086
 2023-04-21 19:08:50 +00:00
Xin Li
bd259b2f43 Merge "Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994" into stage-aosp-master 2023-04-21 17:40:21 +00:00
Kelvin Zhang
ca45d7a85d Fix incremental OTA generation failures 
source_file might be a directory, use the _ReadApexInfo() helper
function to read it instead of go straight to zipfiles.

Test: build incremental OTA for pixel
Bug: 279142680
Bug: 227848550
Bug: 277028723

Change-Id: Ia0041e2c72c1a57123519c970f6e734194a81cd2
 2023-04-21 17:30:50 +00:00
Treehugger Robot
fad3925959 Merge "Update generateSPDXNamespace to generate a unique spdx doc namespace" 2023-04-21 16:50:00 +00:00
Xin Li
d6b6d0102a Merge Android 13 QPR3 tm-qpr-dev-plus-aosp-without-vendor@9936994 
Bug: 275386652
Merged-In: I4b2ea3956c34aa56cc6f54bab7148f116c34759e
Change-Id: I900022a8e8f104b6dc52745211c428601be53ba6
 2023-04-21 09:49:08 -07:00
Treehugger Robot
a774901872 Merge "Cleanup the list of Soong prebuilt module types." am: 269248add6 am: 6a2b03bae8 am: 6117ec0e8d 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548552

Change-Id: Ie83e38188c3521c5a733839e5bb782cc17455862
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 03:36:05 +00:00
Treehugger Robot
6117ec0e8d Merge "Cleanup the list of Soong prebuilt module types." am: 269248add6 am: 6a2b03bae8 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548552

Change-Id: Iff7ebf5069833c03ae44e74bd7c67556a5d08f3c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 02:54:45 +00:00
Treehugger Robot
269248add6 Merge "Cleanup the list of Soong prebuilt module types." 2023-04-21 01:40:01 +00:00
Wei Li
6f407ba0a8 Cleanup the list of Soong prebuilt module types. 
Bug: 272356622
Test: CIs
Change-Id: I4031f0a73f5af1bbf1eb374bcd7d3a19b9609a46
 2023-04-20 14:13:58 -07:00
Ibrahim Kanouche
397a9cf430 Update generateSPDXNamespace to generate a unique spdx doc namespace 
Test: m compliance_sbom
Change-Id: Icc1e5aec0e1758ee32c43cfa79b5b49b3d1d9d30
 2023-04-20 17:43:12 +00:00
Treehugger Robot
c30753213c Merge "Allow ota_from_target_file to work entirely on directories" am: ece71703f8 am: 3de45a7b2b am: 4f600c2a34 
Original change: https://android-review.googlesource.com/c/platform/build/+/2542170

Change-Id: Id9d0a79469a15b3ff8149826ef523a155eacb840
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 17:26:53 +00:00
Treehugger Robot
4f600c2a34 Merge "Allow ota_from_target_file to work entirely on directories" am: ece71703f8 am: 3de45a7b2b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2542170

Change-Id: Ia718bce15427ad03c434f594b004429972623a88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 16:28:01 +00:00
Bob Badour
adaddab362 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: 9e9336f285 am: f59aae96fa am: 5339380948 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548370

Change-Id: I884b859011aca8dc2bbdd302160306f7122b550f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 15:47:11 +00:00
Treehugger Robot
ece71703f8 Merge "Allow ota_from_target_file to work entirely on directories" 2023-04-20 15:17:50 +00:00
Bob Badour
5339380948 Merge "[LSC] Add LOCAL_LICENSE_KINDS to build/make" am: 9e9336f285 am: f59aae96fa 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548370

Change-Id: Ic45413e8722599cb96fdcf05761fc3d83914f1c0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 15:05:41 +00:00
Wei Li
4f8f32b14f Merge "Copy SBOM files of unbundled APKs to dist directory." am: 0ab788ee83 am: 54854098e9 am: b3565b4aa4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2534800

Change-Id: I234246245c1c9d63a9c7758d9fab8196e8b8475e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 19:34:48 +00:00
Wei Li
b3565b4aa4 Merge "Copy SBOM files of unbundled APKs to dist directory." am: 0ab788ee83 am: 54854098e9 
Original change: https://android-review.googlesource.com/c/platform/build/+/2534800

Change-Id: I73b004a77e8cfa8f39dd2f901103be21855dcd31
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 18:21:26 +00:00
Bob Badour
ffba21bbae [LSC] Add LOCAL_LICENSE_KINDS to build/make 
Added SPDX-license-identifier-Apache-2.0 to:
  tools/sbom/Android.bp

Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m all
Change-Id: I1f8e5fd8e787a4c53bf4caf80a4000d46d0291e4
 2023-04-19 09:48:01 -07:00
Kelvin Zhang
9dbe2ce40f Allow ota_from_target_file to work entirely on directories 
When building android, build system will first zip target_file directory
into a .zip file, and then invoke ota_from_target_files. We
ota_from_target_files can work directly on top of directories, we can
parallelize OTA generation and target_file zipping, making builds
faster.

Bug: 227848550
Bug: 277028723
Test: th
Change-Id: Id72bd7cca708af0e1bae2db754f39b27777cd601
 2023-04-18 17:47:29 -07:00