Commit graph

83706 commits

Author SHA1 Message Date
Cole Faust
474f5f2742 Merge "Add BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" am: cd70c8d107
Original change: https://android-review.googlesource.com/c/platform/build/+/2212539

Change-Id: I106a75087660ace09f0ae658d1d2fc9893795fa3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 07:04:02 +00:00
Cole Faust
ce3615c9e3 Merge "Don't install jni libs for uninstallable modules" am: c3eb995eef
Original change: https://android-review.googlesource.com/c/platform/build/+/2462473

Change-Id: Ifdb261e2f296b89743aa50a5a7c9073028006c88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 07:03:35 +00:00
Cole Faust
cd70c8d107 Merge "Add BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES" 2023-03-10 06:37:24 +00:00
Cole Faust
c3eb995eef Merge "Don't install jni libs for uninstallable modules" 2023-03-10 06:36:03 +00:00
Wei Li
0939a08e0c Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." am: 4e2aed055b
Original change: https://android-review.googlesource.com/c/platform/build/+/2374663

Change-Id: Id1de64f1e6f73184ee8d0b84b32b643557e2e004
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 04:59:41 +00:00
Wei Li
4e2aed055b Merge "Generate SBOM of the target product in file sbom.spdx in product out directory." 2023-03-10 04:47:47 +00:00
Jooyung Han
774c439bd8 Merge "Remove the old output of conv_linker_config" am: 580af1bab9
Original change: https://android-review.googlesource.com/c/platform/build/+/2479575

Change-Id: Ice95d80620a66221e373b2ec4b476700fedba51e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 02:41:31 +00:00
Jooyung Han
580af1bab9 Merge "Remove the old output of conv_linker_config" 2023-03-10 02:13:49 +00:00
Rob Seymour
58d63254dc Merge "Add test cases for APEX VINTF." am: 578e1bb073
Original change: https://android-review.googlesource.com/c/platform/build/+/2242995

Change-Id: I0613b84cdc1b9901da5e386409861c037679b6ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-10 01:16:38 +00:00
Rob Seymour
578e1bb073 Merge "Add test cases for APEX VINTF." 2023-03-10 00:34:36 +00:00
Wei Li
02797aa70e Generate SBOM of the target product in file sbom.spdx in product out directory.
Test: m sbom
Test: m dist
Bug: 266726655
Change-Id: I6464fa2dc416dea62c5cf688c923d6b496f044f5
2023-03-09 15:27:58 -08:00
Cole Faust
189905be98 Add BUILD_BROKEN_USES_SOONG_PYTHON2_MODULES
See other cl in this topic for more details.

Bug: 203436762
Test: m nothing
Change-Id: I76725afece50a022aec611091ef4dead5ad3449a
2023-03-09 11:55:29 -08:00
Rob Seymour
9492da59e3 Add test cases for APEX VINTF.
Add test cases to cover HAL definition found in embedded APEX.

Bug: 249086047
Test: releasetools_test
Change-Id: I5639b9b800a89164317740f64306ae10bf41343e
2023-03-09 17:00:06 +00:00
Jooyung Han
49bf691c65 Remove the old output of conv_linker_config
With 3397b6a2aadf8c2eb808fa38f7d6c07d5c82f320 in build/soong,
conv_linker_config fails when the output exists.

For system/vendor partitions, linker.config.pb files are built by
a custom rule, which is missing the removal of the old output. It would
fail with incremental build.

We could fix this by adding --force to overwrite. But I just added `rm`
following the convention in Makefile.

Bug: n/a
Test: m && (touch input of /vendor/etc/linker.config.pb)
      m (again)
Change-Id: Iaeaf861e90b9535394d94c6b16229a4f566789d5
2023-03-09 16:47:32 +09:00
Treehugger Robot
75b9affb1a Merge changes I674ad741,I908043ba am: cee4ebf1c3
Original change: https://android-review.googlesource.com/c/platform/build/+/2476065

Change-Id: Ie9625b4ef8b213bb5b95b286fd13539f3ff1376c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 02:12:07 +00:00
Jooyung Han
741d079d3c Merge "Add dependency to /vendor/etc/linker.config.pb" am: cd10355f3e
Original change: https://android-review.googlesource.com/c/platform/build/+/2473687

Change-Id: I3f8addf829fafda072aff26f3e9d63a1f5c09394
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 02:11:51 +00:00
Treehugger Robot
cee4ebf1c3 Merge changes I674ad741,I908043ba
* changes:
  Disable VABC xor if COW isn't compressed
  Fix secondary payload generation
2023-03-08 02:03:33 +00:00
Jooyung Han
cd10355f3e Merge "Add dependency to /vendor/etc/linker.config.pb" 2023-03-08 01:34:23 +00:00
Treehugger Robot
5a776518a1 Merge "Fix sparse image detection" am: 135eb025f7
Original change: https://android-review.googlesource.com/c/platform/build/+/2467460

Change-Id: I829f295b9a112bbaaf64c146f63bcb6beab16793
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 23:53:09 +00:00
Treehugger Robot
135eb025f7 Merge "Fix sparse image detection" 2023-03-07 23:41:43 +00:00
Evgenii Stepanov
fd3a7181df Merge "Add armv9-a arch variant." am: e497e7dfba
Original change: https://android-review.googlesource.com/c/platform/build/+/2471731

Change-Id: If684ebdabe50db2c7c78692e861aab8717e5afc1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 23:34:08 +00:00
Evgenii Stepanov
e497e7dfba Merge "Add armv9-a arch variant." 2023-03-07 22:58:10 +00:00
Kelvin Zhang
88043be8c3 Disable VABC xor if COW isn't compressed
XOR only saves space if COW data is compressed. If compression parameter
is set to none, disable XOR as it does not save anything but still costs
CPU cycles.

Test: th
Change-Id: I674ad74140570ce4740c290d1adb9e9b5a08426e
2023-03-07 14:42:18 -08:00
Kelvin Zhang
49fadf41eb Fix secondary payload generation
Secondary payload is already handled by creating a new instance of
PayloadGenerator, when creating PayloadGenerator for primary payload,
we should not include the OPTIONS.secondary parameter.

Bug: 270100752
Test: ota_from_target_files --include_secondary
Change-Id: I908043bad11aa6d47dc4dc9b61da460fcfa4f0b9
2023-03-07 14:35:42 -08:00
Jooyung Han
63975d73b1 Add dependency to /vendor/etc/linker.config.pb
The rule for the file should depend on vendor files. Otherwise, the rule
can be fired before installation of those stub libraries in /vendor/lib.

Bug: 244531518
Test: m (with a vendor lib with stubs)
Test: check /vendor/etc/linker.config.pb (should have the lib)
    $ conv_linker_config print -s $OUT/vendor/etc/linker.config.pb
Change-Id: If7a81e26a7a105234201b10cd58825c67a1d5967
2023-03-07 18:28:18 +09:00
Treehugger Robot
cf0325c0c0 Merge "Create vendor/etc/linker.config.pb with STUB_LIBRARIES" am: 8cd77dcec6
Original change: https://android-review.googlesource.com/c/platform/build/+/2470880

Change-Id: I0ba37422a26b7f3a51faee969eef14039690fe22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 19:11:54 +00:00
Treehugger Robot
8cd77dcec6 Merge "Create vendor/etc/linker.config.pb with STUB_LIBRARIES" 2023-03-06 18:36:10 +00:00
Treehugger Robot
3814dfeb2d Merge "Force all temp artifacts to out/dist." am: abfe1fa152
Original change: https://android-review.googlesource.com/c/platform/build/+/2471734

Change-Id: I1a4a0a79521dc1200413a598a2ac7cc2c02e1557
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-06 17:17:09 +00:00
Treehugger Robot
abfe1fa152 Merge "Force all temp artifacts to out/dist." 2023-03-06 16:31:01 +00:00
Alex Buynytskyy
0645253ceb Force all temp artifacts to out/dist.
This way they don't end up in the final build, and will be in a single
predictable place.

+bump the extension SDK version to 7

Bug: 271806061
Test: run locally
Change-Id: Iaf4d918a269cdb7c79a53b7df9592bf8205e0305
2023-03-06 12:59:57 +00:00
Evgenii Stepanov
3148fe365b Add armv9-a arch variant.
Bug: b/263283855
Test: none
Change-Id: I0e9fd48305ad1a26a708ecb2f0d3e7a07e14dbc8
2023-03-05 14:38:12 -08:00
Jooyung Han
8c119032f4 Create vendor/etc/linker.config.pb with STUB_LIBRARIES
system/etc/linker.config.pb is automatically populated with
STUB_LIBRARIES. We do the same for vendor/etc/linker.config.pb.

Bug: 244531518
Test: m vendorimage
Change-Id: If930ca07fcf7c6830b70a0332dae05365b90db12
2023-03-04 08:32:34 +09:00
Alex Buynytskyy
9b810df310 Merge "Don't stop on bump sdk failures." am: e54084b5d1
Original change: https://android-review.googlesource.com/c/platform/build/+/2467468

Change-Id: Iea127e77d1b44d8acfdf117239b628778f76fa34
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 17:06:51 +00:00
Alex Buynytskyy
e54084b5d1 Merge "Don't stop on bump sdk failures." 2023-03-03 01:10:04 +00:00
Alex Buynytskyy
375ea3b457 Don't stop on bump sdk failures.
This is a known issue, fix is in progress.

Bug: 243966946
Test: run locally
Change-Id: Iafcfacc61654838bf0f9ca2321461058ca9afa5b
2023-03-02 21:16:48 +00:00
Kelvin Zhang
0452128f09 Fix sparse image detection
Instead of relying on image build flags, check the actual file to
determine if input is sparse image.

Test: th
Change-Id: I6e58603535039eb3c4e799c61ed9f4783f1888dd
2023-03-02 09:42:52 -08:00
Treehugger Robot
e26da42cf0 Merge "Can declare 1p without cycles." am: 04d5903f12
Original change: https://android-review.googlesource.com/c/platform/build/+/2464668

Change-Id: I29ff0ebc7918705924020ef196830709b685e7c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 04:31:31 +00:00
Treehugger Robot
be165422c0 Merge "Update GetTargetFilesZipForCustomImagesUpdates zip2zip call" am: d1f79d4e63
Original change: https://android-review.googlesource.com/c/platform/build/+/2462953

Change-Id: I1a9b3ce69949b6787bd01bc4e4edcb885144c211
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 04:30:50 +00:00
Treehugger Robot
04d5903f12 Merge "Can declare 1p without cycles." 2023-03-02 04:18:13 +00:00
Treehugger Robot
d1f79d4e63 Merge "Update GetTargetFilesZipForCustomImagesUpdates zip2zip call" 2023-03-02 03:55:31 +00:00
Treehugger Robot
6e6fb8291f Merge changes I7266c0cc,I3caba054 am: c986b3ada3
Original change: https://android-review.googlesource.com/c/platform/build/+/2464633

Change-Id: I741ebdb2cb8f1f77e99e50d1026dbe507b0ff7a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 23:53:52 +00:00
Treehugger Robot
b7ee2672ec Merge "BUILT_KERNEL_CONFIGS_FILE built by linux tools" am: 37600f4573
Original change: https://android-review.googlesource.com/c/platform/build/+/2464631

Change-Id: If539a9525ce219b9df192e6dba149db18bbbd67e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 23:53:19 +00:00
Bob Badour
7aee59482b Can declare 1p without cycles.
Test: m droid dist
Change-Id: I044f1832db36d685628faed569f87491a6789591
2023-03-01 15:51:24 -08:00
Treehugger Robot
c986b3ada3 Merge changes I7266c0cc,I3caba054
* changes:
  Assert copyright on log contents.
  Assert copyright on comments in file.
2023-03-01 23:23:30 +00:00
Treehugger Robot
37600f4573 Merge "BUILT_KERNEL_CONFIGS_FILE built by linux tools" 2023-03-01 23:05:30 +00:00
Bob Badour
df0f55e526 Assert copyright on log contents.
Test: m droid dist
Change-Id: I7266c0cc7c1517482e3aa66f8c7df3a6fbe484fe
2023-03-01 10:34:34 -08:00
Bob Badour
1d31e2d776 Assert copyright on comments in file.
Test: m droid dist
Change-Id: I3caba054f44e1dcc9896fd4121c3d6a1a5139158
2023-03-01 10:31:25 -08:00
Bob Badour
7cc4e334ca BUILT_KERNEL_CONFIGS_FILE built by linux tools
Doesn't qualify as 0p. Use kernel license text.

Test: m droid dist
Change-Id: Ideb88128b3c0f250d4c978291a028b2952b73ba9
2023-03-01 10:16:04 -08:00
Gregory Montoir
10e0dec463 Update GetTargetFilesZipForCustomImagesUpdates zip2zip call
This changes the generation of the target files with oem images to
operate in two passes. 1/ zip2zip is called without any filespec.
2/ oem images are replaced.

This allows to generate the target-files faster (as entries do not
need to be iterated one by one) and removes the need to escape
special file names.

Bug: 269397842
Change-Id: Ic1cf398b90344e01b2f1658079903d45bcc00b46
2023-03-01 14:44:56 +08:00
Cole Faust
a3763c18ef Don't install jni libs for uninstallable modules
Bug: 254205429
Test: Presubmits
Change-Id: I6739b71ce4a0141ad39d4b6046ae63c4c12e367d
2023-02-28 18:10:23 -08:00