tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
87998 commits 1 branch 0 tags 119 MiB
Commit graph

8328 commits

Author SHA1 Message Date
Mårten Kongstad
fe753f5365 aconfig: add support for cargo 
Officially, aconfig is build using the Android tool-chain. However, to
speed up the local development cycle, add support for building with
cargo.

While it is possible to tell cargo to place the build artifacts outside
the source tree, there is no way to tell it to not generate the cargo
lock file in the same directory as Cargo.toml. Add a .gitignore to
ignore Cargo.lock and the target directory.

The way the Android build system and cargo generates code from the
protobuf files is slightly different. Tell cargo to enable the "cargo"
feature and introduce src/protos.rs to hide this difference from the
rest of the aconfig source.

Bug: 279485059
Test: m aconfig && aconfig
Test: atest aconfig.test
Test: cargo build
Test: cargo test
Change-Id: I85741f58cadae353ed95c124f566e4f4a7484186
 2023-05-03 09:41:11 +02:00
Mårten Kongstad
7b9a0b649c Merge "aconfig: add project scaffolding" am: e7a850e942 
Original change: https://android-review.googlesource.com/c/platform/build/+/2563154

Change-Id: I88c6b05de525f296d879805e099f020f7c5e4fb4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-03 07:07:49 +00:00
Mårten Kongstad
e7a850e942 Merge "aconfig: add project scaffolding" 2023-05-03 06:18:02 +00:00
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
5d041c07fc Merge "Use misc_info.txt to check for VABC" am: ed1ab26f5d am: 8583eae383 am: 764d7c01e7 am: 8359a9fc2a am: 24652b0778 am: b4c745c2a2 
Original change: https://android-review.googlesource.com/c/platform/build/+/2572975

Change-Id: I8042206e83407c39984e0e9b62bfb4a1faf4eab4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-02 02:42:57 +00:00
Alex Buynytskyy
b365e730f6 Merge "Set next sdk_int to previous sdk_int + 1." am: f12a969445 am: 927e5096b6 am: efe28cea09 am: c849c4e022 am: 73043ca0d1 am: 3985cc5740 
Original change: https://android-review.googlesource.com/c/platform/build/+/2575210

Change-Id: Ic18d27bc25e1730f7fe03ce8846b571132f255fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-05-01 22:48:49 +00: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
1820746e36 Merge "Correct if statement." am: 56f81f3d64 am: 75a8134b59 am: ba84a920f0 am: 1b9030b161 am: 68a09af71a am: 598d6e7c2e 
Original change: https://android-review.googlesource.com/c/platform/build/+/2572939

Change-Id: I112516ba9c62f24a325d969553f015120c26bfc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 03:57:55 +00: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
980d19294a Merge "Change CI API level to keep linter happy." am: a2a2f40414 am: 308059d67f am: 3bcee42853 am: e4cdcfa339 am: 57c062f1da 
Original change: https://android-review.googlesource.com/c/platform/build/+/2569570

Change-Id: I92b1bc4b5f2fe08f1d81c7588fbe52da84bdaa28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 03:48:15 +00:00
Alex Buynytskyy
b080277bed Merge "Update Android Studio Version Number." am: ba71daa94e am: aee2075ece am: 2831547825 am: d945acdcc9 am: 44bb0a18be 
Original change: https://android-review.googlesource.com/c/platform/build/+/2568552

Change-Id: I9b47d373d9555a0029ed2e10336c208f8bb8d308
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 01:34:36 +00:00
Treehugger Robot
23a791c5d2 Merge "Let the finalization script create ABI dumps for all architectures" am: 99dc1341d1 am: f8f099a3db am: e73841dec6 am: 9ebe6bdddd am: 9d9df478e1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2564374

Change-Id: I3b7c82eb653ef4cd566a1614e096515fc132811d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 00:54:07 +00:00
Daniel Zheng
e1d50c0c4a Merge "Add --max_threads to OTA generation" am: 15c296958b am: fe2a0816b6 am: ea71ab22cf am: 88918594ea am: 340819636b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2563130

Change-Id: Ia8a4b654766603d8d17859eb53415934ce90f09e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-28 00:19:28 +00: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
Daniel Zheng
88918594ea Merge "Add --max_threads to OTA generation" am: 15c296958b am: fe2a0816b6 am: ea71ab22cf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2563130

Change-Id: Ie3de224106af5642195f24c3fd96af7319f3eb3e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-27 17:45:04 +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
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
Alex Buynytskyy
3ef95f5173 Mark master as VIC development branch. 
Test: ./build-step-1-and-m.sh
Bug: 279615150
Change-Id: Idb485846345ea146c04c5ecf6eb4ab6eea122f9b
(cherry picked from commit 576ca9f162)
 2023-04-26 17:59:28 +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
Alex Buynytskyy
576ca9f162 Mark master as VIC development branch. 
Test: ./build-step-1-and-m.sh
Bug: 279615150
Change-Id: Idb485846345ea146c04c5ecf6eb4ab6eea122f9b
 2023-04-26 15:19:36 +00: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
Treehugger Robot
702bdcc590 Merge "Support to merge PREBUILT_IMAGES" am: dd62b0da0f am: 5939a80763 am: c42fcf9acd am: f56f8e3d0d am: 2e56f6d4c4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2512522

Change-Id: I36a64dc3b338465806069ea94bcd2f0d337fddb3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 08:59:41 +00:00
Treehugger Robot
f56f8e3d0d Merge "Support to merge PREBUILT_IMAGES" am: dd62b0da0f am: 5939a80763 am: c42fcf9acd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2512522

Change-Id: I3ad19fd878f5da9131ec76944a90022633d69c1d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-25 07:23:35 +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
Treehugger Robot
5d0bc13791 Merge "Fix incremental OTA generation failures" am: 5ca02ff114 am: 5970bf338b am: 898373872f am: b09c838d8d am: eee7d9820b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2553374

Change-Id: Id63486a372b59a63a5f040679fe77eefc6a78998
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-22 04:48:10 +00:00
Treehugger Robot
b09c838d8d Merge "Fix incremental OTA generation failures" am: 5ca02ff114 am: 5970bf338b am: 898373872f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2553374

Change-Id: Ida75b9db4381d44db7e97940543354aef2bf3953
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-22 03:27:49 +00:00
Treehugger Robot
1a3f168f75 Merge "Don't skip vndk finalization." am: 315e8b52ef am: dba8e6640f am: b6f380a35f am: b99d8aa994 am: 24234f700c 
Original change: https://android-review.googlesource.com/c/platform/build/+/2555112

Change-Id: I7135161826fa2654b34e3b98dc2dd81a0df945e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-22 02:39:09 +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
b99d8aa994 Merge "Don't skip vndk finalization." am: 315e8b52ef am: dba8e6640f am: b6f380a35f 
Original change: https://android-review.googlesource.com/c/platform/build/+/2555112

Change-Id: I28ae43cb67f5bf8f0f9d7c25d9ddc7924993840e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-22 01:18:41 +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
Treehugger Robot
abcaa4f540 Merge "Update generateSPDXNamespace to generate a unique spdx doc namespace" am: fad3925959 am: db5ae5b97a am: 8b4d141c5a am: 9461d52447 am: 06736f5ffd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2540830

Change-Id: Icc03503a49ee4f639ba09670cefc86cd0a760365
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 23:32:08 +00:00
Treehugger Robot
9461d52447 Merge "Update generateSPDXNamespace to generate a unique spdx doc namespace" am: fad3925959 am: db5ae5b97a am: 8b4d141c5a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2540830

Change-Id: I7e2f5d4d9e983392397b65db665f9c9effbc5f61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 21:57:33 +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
Treehugger Robot
8b4d141c5a Merge "Update generateSPDXNamespace to generate a unique spdx doc namespace" am: fad3925959 am: db5ae5b97a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2540830

Change-Id: Ie874d0a5c9332c69e5c5696ff0b802cd7225b680
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 17:58:11 +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
641c2161d7 Merge "Cleanup the list of Soong prebuilt module types." am: 269248add6 am: 6a2b03bae8 am: 6117ec0e8d am: a774901872 am: 2bbbe6d506 
Original change: https://android-review.googlesource.com/c/platform/build/+/2548552

Change-Id: Idac975a1328aa6527d7ed512c78434c939354efb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-21 05:00:23 +00: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
Treehugger Robot
837078be7a Merge "Allow ota_from_target_file to work entirely on directories" am: ece71703f8 am: 3de45a7b2b am: 4f600c2a34 am: c30753213c am: 8329956277 
Original change: https://android-review.googlesource.com/c/platform/build/+/2542170

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

Change-Id: I32f437bddaffb7838b8185ce609b0ee6f53d7ae1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-20 18:27:41 +00: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
9e9daaa8a5 Merge "Copy SBOM files of unbundled APKs to dist directory." am: 0ab788ee83 am: 54854098e9 am: b3565b4aa4 am: 4f8f32b14f am: c36d340610 
Original change: https://android-review.googlesource.com/c/platform/build/+/2534800

Change-Id: I6aefa0118b00b94b234fcc4cec3d3e221a0e6a37
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-19 21:08:44 +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
Po Hu
81c3f4a884 Support to merge PREBUILT_IMAGES 
For example, pvmfw.img comes from framework target files package
and dtbo.img comes from vendor target files package.

Test: merge_target_files
Change-Id: If2e6fac5ce3671e3387e801808a195fb7b2c55b5
 2023-04-19 08:23:40 +08:00
Wei Li
49af939a23 Copy SBOM files of unbundled APKs to dist directory. 
Bug: 266726655
Test: CIs
Test: tapas Browser2 Calendar arm userdebug && m dist
Change-Id: I82328dc4916451a99ad0bf6d7bb945c9b98d0bea
 2023-04-18 15:57:34 -07:00
Treehugger Robot
c2b6f0e27b Merge "Fix duplicate super_empty.img" am: 67ca3c05c7 am: 8670880361 am: 0e04817b44 am: 9362cc8e1c am: 44f41fa793 
Original change: https://android-review.googlesource.com/c/platform/build/+/2540970

Change-Id: Ibd7fa46fb5e7288b39e58985feb94a958e4a9599
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 23:51:34 +00:00
Treehugger Robot
53dc49bd49 Merge "Try with search_path for some avb path args" am: b7a45ea13d am: 56c66e00bf am: e313385cba am: e9b57353f7 am: 280bf796fb 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535380

Change-Id: I443de03d5627b2d1c335bbcb19f4e3f35e783e54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 23:50:25 +00:00
Treehugger Robot
9362cc8e1c Merge "Fix duplicate super_empty.img" am: 67ca3c05c7 am: 8670880361 am: 0e04817b44 
Original change: https://android-review.googlesource.com/c/platform/build/+/2540970

Change-Id: I10aaf2dd5d7f68307d081f0f23a5b1a9831f19e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 22:43:22 +00:00
Treehugger Robot
e9b57353f7 Merge "Try with search_path for some avb path args" am: b7a45ea13d am: 56c66e00bf am: e313385cba 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535380

Change-Id: Ib69a5ea56f160307cf9b36c5898545ac6b4c122c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 22:40:22 +00:00
Treehugger Robot
0e04817b44 Merge "Fix duplicate super_empty.img" am: 67ca3c05c7 am: 8670880361 
Original change: https://android-review.googlesource.com/c/platform/build/+/2540970

Change-Id: I01db0c5e3d039df6a61c880d7a1cfeaa8dba7967
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 22:05:20 +00:00
Treehugger Robot
e313385cba Merge "Try with search_path for some avb path args" am: b7a45ea13d am: 56c66e00bf 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535380

Change-Id: I10d545710dcdbd4b0c203ae316f72a88cf7d7ac4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 22:03:36 +00:00
Treehugger Robot
67ca3c05c7 Merge "Fix duplicate super_empty.img" 2023-04-17 21:19:13 +00:00
Treehugger Robot
b7a45ea13d Merge "Try with search_path for some avb path args" 2023-04-17 20:43:12 +00:00
Alex Buynytskyy
bde8607d49 Merge "Finalization script fixes." am: 2ba40b5be6 am: 510ada3933 am: d0b8fd305b am: cf2e6a745e am: bdd3fa5751 
Original change: https://android-review.googlesource.com/c/platform/build/+/2538137

Change-Id: I89d2cca1af4b336f1ab61ae1cf3f688ed09e79ba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 18:12:46 +00:00
Alex Buynytskyy
cf2e6a745e Merge "Finalization script fixes." am: 2ba40b5be6 am: 510ada3933 am: d0b8fd305b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2538137

Change-Id: I2eae33dc683564b7022194d9e84d0f0c5608aa87
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 16:59:18 +00:00
Kelvin Zhang
aecdc18222 Fix duplicate super_empty.img 
When calling add_img_to_target_files twice, super_empty.img will be
written twice, and resulting zip would contain duplicate entries.

Test: th
Bug: 278522974
Change-Id: I2419d0c4f8b04f876a8cc69a1517f59cab94d75d
 2023-04-17 09:52:39 -07:00
Alex Buynytskyy
d0b8fd305b Merge "Finalization script fixes." am: 2ba40b5be6 am: 510ada3933 
Original change: https://android-review.googlesource.com/c/platform/build/+/2538137

Change-Id: I19bbf7043b8869d9b17b102e1dd8182d3d11e605
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-17 16:26:32 +00:00
Alex Buynytskyy
b87452f596 Merge "Switch master to "half-finalized" mode in sync with udc-dev." 2023-04-17 15:29:44 +00:00
Alex Buynytskyy
2ba40b5be6 Merge "Finalization script fixes." 2023-04-17 15:26:16 +00:00
Alex Buynytskyy
9e91d2db1d Switch master to "half-finalized" mode in sync with udc-dev. 
Bug: 275409981
Test: run locally
Change-Id: Ia3301ac93ae51ce7236ea007000d48ba72b15405
 2023-04-17 04:26:32 +00:00
Alex Buynytskyy
f7a5e2fa4b Finalization script fixes. 
- actually do the first step instead of just logging a message,
- make sure extension SDK bump gets picked up by the topic,
- fix the resources_sdk_int in first step, and unfix in the second.

Bug: 278246368
Fixes: 278246368
Test: local run
Change-Id: I0d0f4e2ec7f0b584b9fc14a545cfec73a9fcbdea
 2023-04-16 21:15:18 -07:00
Treehugger Robot
f5c3e08271 Merge "Fix the following issues mentioned in Pixel SBOM review." am: 3fb8d2bad8 am: 42cfbe4f1a am: d488ea8f83 am: d6ff8ca1c5 am: 4fe023a263 
Original change: https://android-review.googlesource.com/c/platform/build/+/2538946

Change-Id: Idc09c4541cc219192b888f6b2bcd6d3911192a5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 23:24:21 +00:00
Treehugger Robot
d6ff8ca1c5 Merge "Fix the following issues mentioned in Pixel SBOM review." am: 3fb8d2bad8 am: 42cfbe4f1a am: d488ea8f83 
Original change: https://android-review.googlesource.com/c/platform/build/+/2538946

Change-Id: Ib1a3f63826d04e16d879c51789e7beca08f5fd1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 22:11:17 +00:00
Treehugger Robot
d488ea8f83 Merge "Fix the following issues mentioned in Pixel SBOM review." am: 3fb8d2bad8 am: 42cfbe4f1a 
Original change: https://android-review.googlesource.com/c/platform/build/+/2538946

Change-Id: I623a58bf133b2f869044bb4414d58ba1a0f83d32
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 21:41:12 +00:00
Treehugger Robot
3fb8d2bad8 Merge "Fix the following issues mentioned in Pixel SBOM review." 2023-04-15 20:34:52 +00:00
David Anderson
1da5082c13 Merge "ota_from_target_files: Disable XOR on <T vendor." am: 23c2df71bc am: 70e4fa03b7 am: 236b709dcd am: e78f998ebf am: 050dac8b3b 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535094

Change-Id: Ic532571cc0e0265268106509368f1b9391bfb60b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 08:06:52 +00:00
David Anderson
e78f998ebf Merge "ota_from_target_files: Disable XOR on <T vendor." am: 23c2df71bc am: 70e4fa03b7 am: 236b709dcd 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535094

Change-Id: I1aaa20e89e874992ba7525da3df7d7cc3175575b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 06:49:27 +00:00
Wei Li
5290825452 Fix the following issues mentioned in Pixel SBOM review. 
1) PackageSupplier should be NOASSERTION if there is no homepage
   information in METADATA file of source packages
2) PackageDownloadLocation of upstream packages should be NOASSERTION if
   there is no code repository URL in METADATA file of source packages

Test: CIs
Test: atest --host sbom_writers_test
Change-Id: I8a0298b7bacc2f96555f9d7dde0d21ada8c6b564
 2023-04-15 06:05:32 +00:00
David Anderson
236b709dcd Merge "ota_from_target_files: Disable XOR on <T vendor." am: 23c2df71bc am: 70e4fa03b7 
Original change: https://android-review.googlesource.com/c/platform/build/+/2535094

Change-Id: I87172391727ae2b8fe4735aa1f7c1c9bef11098c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-15 06:01:17 +00:00
David Anderson
23c2df71bc Merge "ota_from_target_files: Disable XOR on <T vendor." 2023-04-15 04:52:46 +00:00