StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
80,565 Commits 1 Branch 0 Tags
62d0a739bbce94f3f3721e036ca9b2df94e18ba1
Commit Graph

7846 Commits

Author SHA1 Message Date
David Anderson
94ad5bb5ef build_image: Remove mkerofsimage.sh. 
These wrapper scripts are difficult to maintain and there's not really
any value add. The argument strings don't match and every new build flag
has to be connected in an extra place.

Bug: 222715577
Test: make with EROFS enabled
Change-Id: Ie0e51cc30aa08b004d5d8345a2a2d885e193ffa9
 2022-03-04 11:07:43 -08:00
Iavor-Valentin Iftime
63cde0fd92 Allow vendor_otatools arg to be file or folder 
Required by signer script when using "--vendor_otatools" argument.

Bug: 220126689
Bug: 186097910

Test: sign_target_files_apks \
        --vendor_otatools=otatools_vendor_dir \
	--vendor_partitions=vendor,odm \
	merged-target_files.zip \
	signed-target_files.zip

Change-Id: Iaa596f95f9db1e1e423b8306e9590fe27acb76e7
 2022-03-04 16:02:46 +00:00
Treehugger Robot
18a9f74bae Merge "Phony target to report all library names." am: f2a0110d36 am: 578d7b2492 am: 3248b76fa1 
Original change: https://android-review.googlesource.com/c/platform/build/+/2002324

Change-Id: I803e67a57afde5fb3ceb6fd04f908caf0cfa165d
 2022-03-04 03:44:03 +00:00
Treehugger Robot
f2a0110d36 Merge "Phony target to report all library names." 2022-03-04 02:23:38 +00:00
Treehugger Robot
a9c76aba9f Merge "Allow missing key for misc_info lookups." am: 54188ba009 am: 39ec08569c am: c817796067 
Original change: https://android-review.googlesource.com/c/platform/build/+/2007930

Change-Id: I113922f56adf00dc49ef7f0399e416568d399722
 2022-03-04 01:01:26 +00:00
Daniel Norman
c44f964a5a Allow missing key for misc_info lookups. 
This broke the TV-VF build in ab/8246202.

Change-Id: Ifbf76a3c43c46fcd4280180e45ad23fcbed9346d
 2022-03-03 19:42:32 +00:00
Treehugger Robot
16992da933 Merge "Add SPL downgrade option help text" am: 0b6921be2b am: 075daf7363 am: 701b9ea802 
Original change: https://android-review.googlesource.com/c/platform/build/+/2005090

Change-Id: I86bdade3ca5ed88873c7bbf4870cb75f68bbd8c5
 2022-03-03 19:11:10 +00:00
Treehugger Robot
0b6921be2b Merge "Add SPL downgrade option help text" 2022-03-03 17:56:41 +00:00
Bob Badour
77570059cd Phony target to report all library names. 
Bug: 68860345
Bug: 151177513
Bug: 151953481

Test: m nothing reportallnoticelibrarynames

Change-Id: I0f791e2d92b8135d6af3a6c93f0db348fc69f5a1
 2022-03-02 22:32:37 -08:00
Treehugger Robot
1d737629d0 Merge "Clean up merge_target_files" am: 5b48aeccb2 am: 168ea6a2b9 am: 6fd34f2965 
Original change: https://android-review.googlesource.com/c/platform/build/+/2002319

Change-Id: Ieecc6bca70148a544ae77bf7c525a103d0581098
 2022-03-03 01:01:46 +00:00
Treehugger Robot
5b48aeccb2 Merge "Clean up merge_target_files" 2022-03-02 23:51:31 +00:00
Treehugger Robot
6756539e27 Merge "Fix releasetools OWNERS for merge." am: 92c59c42d3 am: 7f0a03e6cc am: 945140a4b4 
Original change: https://android-review.googlesource.com/c/platform/build/+/2004390

Change-Id: Iacefea9a320c292c88c4357fa57343d7a533de82
 2022-03-02 02:14:29 +00:00
Treehugger Robot
92c59c42d3 Merge "Fix releasetools OWNERS for merge." 2022-03-02 01:32:34 +00:00
Colin Cross
ae4550ecd6 Merge "Add PLATFORM_DISPLAY_VERSION" am: 1fa84f1135 am: 552c2d1c81 am: 400a979b88 
Original change: https://android-review.googlesource.com/c/platform/build/+/2002322

Change-Id: Ib3921c70e5ba472126c9579d0ec3db3111a04635
 2022-03-02 00:55:39 +00:00
Colin Cross
1fa84f1135 Merge "Add PLATFORM_DISPLAY_VERSION" 2022-03-02 00:01:05 +00:00
Kelvin Zhang
e174c323e1 Add SPL downgrade option help text 
Test: th
Change-Id: I71f916642f6327acad1d0c163a204718002f876d
 2022-03-01 15:59:08 -08:00
Daniel Norman
5177fcb28d Fix releasetools OWNERS for merge. 
My extra _ meant that OWNERS was removed for merge_target_files.

Change-Id: I15f89b9edf31d126df19b66998520e8545cdfbd0
 2022-03-01 17:58:34 +00:00
Yi-yo Chiang
848c69ac7c Merge changes from topic "gki-avb-vts" am: 9d164b6300 am: e93bc67cf8 am: 4e8705b181 
Original change: https://android-review.googlesource.com/c/platform/build/+/1999071

Change-Id: I52ab0dc87855a1822bdb50d014544cecf67d7431
 2022-03-01 05:57:34 +00:00
Yi-yo Chiang
9d164b6300 Merge changes from topic "gki-avb-vts" 
* changes:
  releasetools: Update T GKI certification scheme
  Update T GKI certification scheme
 2022-03-01 04:47:47 +00:00
Treehugger Robot
65386afc4b Merge "Add to OWNERS for merge tooling." am: 171c1e168e am: 0e0e961191 am: 6dde81f3f5 
Original change: https://android-review.googlesource.com/c/platform/build/+/2003097

Change-Id: Idd60080d0a87d9f59fcf4f050f53aa0464b44396
 2022-03-01 03:10:20 +00:00
Treehugger Robot
1b9b2c14f0 Merge "Remove product debug files" am: fb3cdf5fc8 am: 7a8db6594e am: 675fc37660 
Original change: https://android-review.googlesource.com/c/platform/build/+/2002318

Change-Id: I0e91c0fbda2e7ed332187cf881f51d2d4c145447
 2022-03-01 03:10:12 +00:00
Treehugger Robot
171c1e168e Merge "Add to OWNERS for merge tooling." 2022-03-01 02:32:17 +00:00
Colin Cross
a492544a03 Add PLATFORM_DISPLAY_VERSION 
Add PLATFORM_DISPLAY_VERSION to version_defaults.mk that will propagate
to the ro.build.version.release_or_preview_display property and
be shown as the Android version for preview releases by Settings.

Bug: 221950960
Test: manual
Change-Id: I697cc59f77f92aa98a8a2573662797e6d3bd2042
 2022-02-28 18:01:35 -08:00
Daniel Norman
0374741b7b Clean up merge_target_files 
Summary of changes:
- Rename extract_items args to be more generic.
- For many other functions, replace large argument lists with
  the OPTIONS shared object.
- Rename process_* functions to merge_* to be more clear about
  the purpose of the function.
- Remove verbose code in merge_ab_partitions_txt().
- Extract certain logic from merge_misc_info_txt() and place it
  into other existing functions: dynamic partition and selinux
  keys are now processed in their own functions.
- Remove verbose code in merge_package_keys_txt().
- Remove verbose code in create_file_contexts_copies().
- Handle extracting from META directly in merge_meta_files(),
  rather than doing this extraction in create_merged_package()
- Storing the set of framework and vendor partitions in OPTIONS
  so it can be reused by multiple functions without needing to
  be parsed again.

Bug: 221858722
Test: atest test_merge_target_files
Test: Use merge_target_files to merge some builds
Change-Id: I8aa429c8fbb05223127b116aab84b2678ac264a8
 2022-02-28 16:48:27 -08:00
Cole Faust
e23ae981cc Remove product debug files 
These files are difficult to support in the Starlark product
configuration. They also aren't really a good representation
of products even with Makefiles, because they only display
information from products that have been imported with
import-nodes, but generate empty files for the other products
that are included from the imported ones.

For example, lunching aosp_arm64 then running
`m out/products/build/make/target/product/core_64_bit.mk.txt`
would generate a file full of empty variable assignments.

Bug: 221312856
Test: Presubmits
Change-Id: I18613a628968acc25b57b44e229de7df1b2476ef
 2022-02-28 14:43:18 -08:00
Daniel Norman
4cf1e03c1c Add to OWNERS for merge tooling. 
Includes more folks to increase "bus factor" for these files,
as well as including the merge test.

Change-Id: I8a5e8d1600fd4e03f75338193609f496a964f790
 2022-02-28 22:30:49 +00:00
Treehugger Robot
3c79dfd87c Merge "Ignore cleanup errors." am: afe0e76c28 am: 4d083132f9 am: 270ebd7f68 
Original change: https://android-review.googlesource.com/c/platform/build/+/2000465

Change-Id: I234b4d319d5a9490a33774a72f3013c84fdaeb85
 2022-02-26 07:04:48 +00:00
Baligh Uddin
be2d7d0ce1 Ignore cleanup errors. 
Certain binaries may have restrictive permissions.

BUG: 221492085
Test: TH
Change-Id: I56f3c172d9e2c3947e513bdf0b2072457061c547
 2022-02-26 02:35:25 +00:00
Tianjie Xu
a7bd77307f Merge "Update owner" am: 42b91dcb79 am: 9c27ebcbfe am: 0e51d63c78 
Original change: https://android-review.googlesource.com/c/platform/build/+/2000493

Change-Id: Ifacb7c1e7681c37ea1b8260f25597a658c4b4a56
 2022-02-25 20:51:59 +00:00
Tianjie Xu
45714a047e Update owner 
Change-Id: I11931bcc51408db3ea8d75db67691ee3eb6e0194
Test: N/A
 2022-02-25 19:21:48 +00:00
Jooyung Han
dc24373bc8 Merge "Replace pvmfw embedded public key" am: 4d0af554ce am: 474339443f am: ba28c6a1f5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1990892

Change-Id: I3a4aa38e87bff56823e4b395af688964aa5260da
 2022-02-25 07:52:54 +00:00
Jooyung Han
4d0af554ce Merge "Replace pvmfw embedded public key" 2022-02-25 06:39:20 +00:00
Treehugger Robot
b11b8cbeaf Merge "Fix ota_from_target_files error in non-AB VF" am: bc5a49b504 am: 5547a546d5 am: 9372077478 
Original change: https://android-review.googlesource.com/c/platform/build/+/1996191

Change-Id: Iee181ddc735f5138650e96aeb077c0737b7f362e
 2022-02-25 04:24:33 +00:00
Treehugger Robot
bc5a49b504 Merge "Fix ota_from_target_files error in non-AB VF" 2022-02-25 03:03:17 +00:00
Treehugger Robot
dfd216f164 Merge "Remove catch + sys.exit idiom" am: 14ec6f4157 am: f5d885e873 am: 385e673a58 
Original change: https://android-review.googlesource.com/c/platform/build/+/1991316

Change-Id: I9477c0a8e94dda10a78de74c9a0bb99cb26ac1b7
 2022-02-25 01:48:50 +00:00
Treehugger Robot
14ec6f4157 Merge "Remove catch + sys.exit idiom" 2022-02-25 00:35:45 +00:00
Yi-Yo Chiang
24da1a43bb releasetools: Update T GKI certification scheme 
Companion change of I143680b1cab50a6915df56c8273f8741beaf1180.
Basically does the same thing as the other change.

Bug: 211741246
Test: m dist
Test: ./boot_signature_info.sh boot-5.10.img
Change-Id: I40c4d5866c74a9a2d525f9455969b8a71f22bdbb
 2022-02-24 21:50:18 +08:00
Melisa Carranza Zúñiga
8fe9e3a2c7 Merge "Adding flags and logic to sign updateable SEPolicy in APEX" am: 77c1dfa6d9 am: 5a0d81a0be am: 54e08307dc 
Original change: https://android-review.googlesource.com/c/platform/build/+/1982226

Change-Id: Ia474f3f805e762a5021868848646c5ea553d9c19
 2022-02-23 17:36:01 +00:00
Melisa Carranza Zúñiga
77c1dfa6d9 Merge "Adding flags and logic to sign updateable SEPolicy in APEX" 2022-02-23 16:36:16 +00:00
Andrew Scull
bbc930b008 Replace pvmfw embedded public key 
The virt APEX payload public key needs to be embedded in pvmfw so that
is verifies the right set of images. As things are being resigned,
update that embedded key so that it matches the APEX.

Bug: 220018566
Test: sign_target_files_apks
Change-Id: I09be91275ec1d1aa6f921c54a96c5159571ddead
 2022-02-23 16:27:57 +00:00
Po Hu
760de672c7 Fix ota_from_target_files error in non-AB VF 
Add recovery-from-boot.p for device with
BOARD_USES_FULL_RECOVERY_IMAGE disabled

Bug: 219871887
Change-Id: Id4bafaa44afe28f57e0a35846012073307965940
Test: Used to merge non-AB VF device
 2022-02-23 07:29:24 +00:00
David Anderson
cd41556101 Merge "Revise partition size for system_other.img" am: c25bd3c8a0 am: 1af04ccab7 am: bf67d5cdf8 
Original change: https://android-review.googlesource.com/c/platform/build/+/1991771

Change-Id: I461f389969da908c7ba6b1c580e5691bbfb1d31d
 2022-02-19 02:29:10 +00:00
Treehugger Robot
9e6dc35908 Merge "Fix ota_from_target_files error in non-AB VF" am: 68f7e84519 am: cea047c023 am: 8cbb7f35a5 
Original change: https://android-review.googlesource.com/c/platform/build/+/1986310

Change-Id: Ie7f36ae3eb72225ea0b469cc3ab6fd61c300237f
 2022-02-19 02:29:04 +00:00
David Anderson
c25bd3c8a0 Merge "Revise partition size for system_other.img" 2022-02-19 01:28:24 +00:00
Treehugger Robot
68f7e84519 Merge "Fix ota_from_target_files error in non-AB VF" 2022-02-19 01:19:24 +00:00
Melisa Carranza Zuniga
46930d7a85 Adding flags and logic to sign updateable SEPolicy in APEX 
Verify with command:
sign_apex --container_key=testdata/testkey
--payload_key=testdata/testkey_RSA4096.key
--sepolicy_key=testdata/testkey_RSA4096.key
--sepolicy_cert=testdata/testkey.x509.pem
$OUT/system/apex/com.android.sepolicy.apex
$OUT/test/sepolicy.apex

Test: mma and run sign_apex
Change-Id: I8cc5bbc09058b57e463b1d40d4953d62e0438389
 2022-02-19 00:01:09 +01:00
Daniel Norman
2e6596e47f Merge changes I1d1ec878,I25c1dc20 am: 27cbdd9809 am: 9f48b3cf4a am: c4e0737684 
Original change: https://android-review.googlesource.com/c/platform/build/+/1991151

Change-Id: I40be1b37fe15f9f200fe71c67f023c54e9671dbc
 2022-02-18 22:10:40 +00:00
Treehugger Robot
0f8f497979 Merge "ota_utils: Don't fail if metadata proto doesn't exist" am: 07491322c3 am: 412eb36668 am: 0f24066987 
Original change: https://android-review.googlesource.com/c/platform/build/+/1879917

Change-Id: I4d016c9f5341c0a359d37a60826bc93d73599d32
 2022-02-18 22:10:34 +00:00
Treehugger Robot
123bf4de70 Merge "check_target_vintf: Properly glob Vintf file list" am: 3e77f44587 am: 05fc90f0fd am: ef29f976e7 
Original change: https://android-review.googlesource.com/c/platform/build/+/1889615

Change-Id: Ib19a16798f74a7456c191faf09f5da3d84ee99bd
 2022-02-18 22:10:28 +00:00
Treehugger Robot
7783c4a88b Merge "Emit warning when build.prop import can't be resolved" am: 52f1acbd93 am: a840a264a0 am: fd7777ef14 
Original change: https://android-review.googlesource.com/c/platform/build/+/1990572

Change-Id: I2f024335f4769de7c709d0e7bb09e2130e5bb44e
 2022-02-18 22:10:22 +00:00