Commit Graph

30078 Commits

Author SHA1 Message Date
Android Build Coastguard Worker
e344c83b92 Version bump to SP2A.220505.002 [core/build_id.mk]
Change-Id: I16f7585f7de23caa8e039e15bc37a0d5633a92c1
2022-03-24 18:38:01 +00:00
Treehugger Robot
bc8d61f17b Merge "Support OUT_DIR for license graph." 2022-03-24 00:43:58 +00:00
Treehugger Robot
477b8e0561 Merge "Revert "Rename init_boot properties to ro.init_boot.*"" 2022-03-23 23:27:02 +00:00
Cole Faust
31fce2f404 Fix single value inheritance
Single-value product variables resolve to the first
instance of that variable in prefix order. What we
have right now is taking the value from the current
makefile if it's set, but if it's not, we take it
from the last child, not the first.

Fixes: 226206409
Test: Manually
Change-Id: Id23f7c269ff9a352bf0b67cb57156b72449f978e
2022-03-23 15:28:48 -07:00
Bob Badour
d8f8910780 Merge "Test suite notices using dependencies." 2022-03-23 21:14:59 +00:00
Bob Badour
c778e4cba4 Support OUT_DIR for license graph.
Bug: 226066987

Test: OUT_DIR=/tmp/outdir m all listshare checkshare htmlnotice rtrace dumpgraph dumpresolutions compliancenotice_bom compliancenotice_shippedlibs
Test: OUT_DIR=/tmp/outdir m /tmp/outdir/target/product/bonito/obj/NOTICE.xml.gz
Test: m all listshare checkshare htmlnotice rtrace dumpgraph dumpresolutions compliancenotice_bom compliancenotice_shippedlibs
Test: m out/target/product/bonito/obj/NOTICE.xml.gz

Change-Id: I6282c647a389c5935d5ce7c79193f86d32c76365
2022-03-23 14:12:12 -07:00
Kelvin Zhang
8250d2cd9e Revert "Rename init_boot properties to ro.init_boot.*"
This reverts commit 411fac84d6.

Reason for revert: b/226318737

Change-Id: Ie1cf0e79b3ac11b91e031a479898a54856020500
2022-03-23 19:46:09 +00:00
Bob Badour
42f00c7b61 Test suite notices using dependencies.
Switch from combine-notice-files to html-notice-rule and
text-notice-rule.

Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m cts reportmissinglicenses
Change-Id: I59d78553f15f0fd6be87228c933693b63e2ebf04
2022-03-23 11:18:39 -07:00
Treehugger Robot
3c51ee3122 Merge "Add fsck.erofs to INTERNAL_OTATOOLS_MODULES" 2022-03-23 12:14:08 +00:00
Woody Lin
e416419c0a Add fsck.erofs to INTERNAL_OTATOOLS_MODULES
The latest build_image.py requires fsck.erofs to execute. Adds
fsck.erofs to INTERNAL_OTATOOLS_MODULES so it can be packed into
otatools.zip.

Bug: 225756733
Signed-off-by: Woody Lin <woodylin@google.com>
Change-Id: Ib88dbb6cce5e9424d1e80173da34b503d32d0fd3
2022-03-23 10:33:35 +00:00
Colin Cross
ce3c48db58 Merge changes I084158ff,I2f2ba905,Ic9af8761
* changes:
  Depend on PRODUCT_COPY_FILES that are not in images
  Remove ALL_ORIGINAL_DYNAMIC_BINARIES
  Remove ALL_GENERATED_SOURCES
2022-03-22 22:24:39 +00:00
Trevor Radcliffe
d94bb431aa Add DeviceProduct product varible to Soong
For some modules, it is necessary to access the product name from
Soong. In particular, the use case we have identified is that the
product name needs to be appended to the artifact name in the dist
copy.

Bug: 224561567
Test: Unit Tests and build relevant target/modules
Change-Id: Iaa0bfee8ef0d1201d8af02f7fc9e6ef081175da7
2022-03-22 19:04:03 +00:00
Treehugger Robot
dd7dbbfe7b Merge "Remove the oudated kernel from INTERNAL_EMULATOR_PACKAGE_FILES" 2022-03-22 17:39:38 +00:00
Colin Cross
79a76ec581 Depend on PRODUCT_COPY_FILES that are not in images
If0e4b958b3dfaa02771a5da70f970379635f904e made `droidcore` stop
depending on `files` so that installed files from unbuilt images
would not be built.  That also disabled the dependency on installed
files that were not in any image, but the vendor notice file had
overly broad dependencies that caused them to still be built.
Icdb11d3c72b180cd02231e8dc98ae500d6566a98 made the vendor notice
file dependencies less broad, exposing the missing `droidcore`
dependencies.

Track the list of installed device files that are not included in any
image, built or unbuilt, and add them as a dependency for `droidcore`.

Bug: 225187583
Test: m checkbuild
Test: check dependency path to encryptionkey.img
Change-Id: I084158ffb52b353e9a3eca9ad06a68c80d3bd371
2022-03-22 09:25:58 -07:00
Colin Cross
c6d6306771 Remove ALL_ORIGINAL_DYNAMIC_BINARIES
Nothing ever reads the value, stop collecting it.

Test: m checkbuild
Change-Id: I2f2ba905c7c45c0da36606710b30864cd5822d91
2022-03-22 09:25:58 -07:00
Colin Cross
a1de5df4bd Remove ALL_GENERATED_SOURCES
ALL_GENERATED_SOURCES contains the generated sources of modules
defined in Make.  They always have a path inside the intermediates
directories.  The only readers of ALL_GENERATED_SOURCES are filtering
for files in the output directories, and will never match anything.

Test: m checkbuild
Change-Id: Ic9af8761d445fa90088f838c385bd2aea3bc3048
2022-03-22 09:25:58 -07:00
Lucas Wei
8842016b30 Merge "Make build support vendor_kernel_boot image" 2022-03-22 13:48:34 +00:00
Yi-yo Chiang
e5ed34824f Merge "Rename init_boot properties to ro.init_boot.*" 2022-03-22 09:13:32 +00:00
Roman Kiryanov
b0eac167d9 Remove the oudated kernel from INTERNAL_EMULATOR_PACKAGE_FILES
The kernel referened is too old and we switched
to the GKI kernel which is located in kernel/prebuilts.

Bug: 225203974
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I02bd9cad70fafcdfda9a7540aa7f05b397023841
2022-03-21 11:18:09 -07:00
Trevor Radcliffe
0e3ed13950 Merge "Set Soong Config Vars for messaging conversion" 2022-03-21 17:08:08 +00:00
Nicolas Geoffray
412185256f Merge "Add /system/etc/preloaded-classes in the list of files with fsv_meta." 2022-03-21 08:35:18 +00:00
Bob Badour
d25bf1ec38 Merge "Add COVERAGE_ZIP to system notice deps." 2022-03-18 23:41:51 +00:00
Bob Badour
7358398647 Fix typo -- no _gz on notice file name.
Test: m nothing reportmissinglicenses
Change-Id: I133950489a17d1bd30a7fb3bc1a96ff6699d475b
2022-03-18 12:12:43 -07:00
Bob Badour
f252972462 Add COVERAGE_ZIP to system notice deps.
Fixes http://b/225282564

Test: lunch gki_arm64-user; make dist

Bug: 225282564
Change-Id: Iba0ea3ee53d3abbce9afff9a005e887ea64f63d1
2022-03-18 11:34:03 -07:00
Nicolas Geoffray
13f2821712 Add /system/etc/preloaded-classes in the list of files with fsv_meta.
Test: m
Bug: 162110941
Change-Id: Idbc0d602bbce9a3cbd68a84f0cc8e2dae05c8c1e
2022-03-18 17:28:14 +00:00
Treehugger Robot
cc0671f6bf Merge "Apps-only notice file" 2022-03-18 00:31:57 +00:00
Bob Badour
dbb8d7a3d4 Apps-only notice file
Bug: 225050939
Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m alllicensemetadata reportmissinglicenses

Change-Id: I5564c59686277398e05bb59b30d548b2ed678eab
2022-03-17 13:55:15 -07:00
Trevor Radcliffe
dbf8a9a050 Set Soong Config Vars for messaging conversion
Bug: 222292035
Test: See attached CL
Change-Id: I3fdbaed4f040dab8d49a41ec003db4349a8eea27
2022-03-17 18:00:42 +00:00
Colin Cross
503b779266 Merge "Track licenses of dexpreopted bootjars" 2022-03-17 01:48:47 +00:00
Colin Cross
c6f0d967cb Track licenses of dexpreopted bootjars
Propagate the license metadata for dexpreopted bootjars.  Requires
rewriting the generated module to look more like as Soong module so
that it can use LOCAL_SOONG_LICENSE_METADATA.

Bug: 224612665
Test: m alllicensemetadata reportmissinglicenses
Change-Id: Ibd3269594462a0c38a3427d0c7838620a9b84551
2022-03-16 14:21:08 -07:00
Treehugger Robot
dd780ca8d0 Merge "Notice files and non-module targets." 2022-03-16 20:05:07 +00:00
Colin Cross
6dc51855a4 Merge "Use Make path for system_linker_config" 2022-03-16 17:24:00 +00:00
Lucas Wei
f57333f7fc Make build support vendor_kernel_boot image
Add vendor_kernel_boot image for vendors whose bootloader support
extra first stage booting kernel modules ramdisks. This benefit
kernel repo to build kernel-artifacts only image without Andorid
artifacts dependency.

Bug: 214409109
Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: If07218b86a7751b3d452a172610af960f5f9ec74
2022-03-16 23:13:19 +08:00
Bob Badour
70c07dda93 Notice files and non-module targets.
Bug: 68860345
Bug: 151177513
Bug: 151953481
Bug: 213388645
Bug: 210912771

Test: m nothing reportmissinglicenses

Change-Id: Icdb11d3c72b180cd02231e8dc98ae500d6566a98
Merged-in: Icdb11d3c72b180cd02231e8dc98ae500d6566a98
2022-03-16 05:57:41 -07:00
Treehugger Robot
8131404331 Merge "Clear OS version and patch level fields for GKI boot images" 2022-03-16 05:37:43 +00:00
Treehugger Robot
9a21773efe Merge "More non-module targets." 2022-03-16 03:15:32 +00:00
Treehugger Robot
b945cd2890 Merge "Add ota_extractor to otatools.zip" 2022-03-15 23:17:20 +00:00
Colin Cross
d4a054fb40 Use Make path for system_linker_config
Use the Make path for system_linker_config instead of a variable
exported by Soong so that the license information is correctly
associated.

Test: m alllicensemetadata reportmissinglicenses
Change-Id: I3d375220d829b2ef88b500ef6c1ea6bf8f46e6ac
2022-03-15 15:07:07 -07:00
Treehugger Robot
423e117fa2 Merge "Package llvm-cov in llvm-profdata.zip (take 2)" 2022-03-15 21:37:55 +00:00
Cole Faust
2089403223 Merge "Make inherit-product loop over all files passed to it" 2022-03-15 19:31:35 +00:00
Kelvin Zhang
83eb9f7fb1 Add ota_extractor to otatools.zip
This is a newly added binary for extracting device images out of full
OTA package. Add to otatools.zip so that go/bts-image-sharing project
can use it.

Test: th
Bug: 221875271
Change-Id: If2bf85e89a2a12cc00f709dfd21a453c2d805d4f
2022-03-15 11:31:36 -07:00
Android Build Coastguard Worker
48346b8491 Make change and version bump to SP2A.220505.001
Change-Id: I6010b413bbba0004c29440019a2e54a7e158d36d
2022-03-15 18:18:04 +00:00
Steve Berbary
a25ecc3ac0 Update Security String to 2022-05-05
Bug: 223313197
Change-Id: I5a35451e14cba5f115ab66926d62c4fa4556a267
(cherry picked from commit 825ae00092)
Merged-In: I5a35451e14cba5f115ab66926d62c4fa4556a267
2022-03-15 18:15:59 +00:00
Yi-Yo Chiang
411fac84d6 Rename init_boot properties to ro.init_boot.*
Right now they're named ro.bootimage.* which is really confusing.
Change it so that if generic ramdisk is in boot.img, then name the
properties as ro.bootimage.*, otherwise if generic ramdisk is in
init_boot.img, then name the prop as ro.init_boot.*.

Bug: 211823573
Test: m dist
Change-Id: Icff3c7be04b9a3c6490fbf49ba4f05565b029890
2022-03-15 18:08:10 +08:00
Pirama Arumuga Nainar
4e3d6334da Package llvm-cov in llvm-profdata.zip (take 2)
Bug: http://b/214396112

It is needed for code coverage smoke test.  Retain the
`llvm-profdata.zip` name since it is used in Tradefed.

This fixes aosp/2017370 which incorrectly packaged llvm-profdata twice.

Test: `CLANG_COVERAGE=true m dist` and inspect llvm-profdata.zip
Change-Id: Ic1cbebff3f6fbea04a6c58c6d57557d0ffde14ae
2022-03-14 22:25:11 -07:00
James Chen
1b8a1490a9 Merge "Revert "Package llvm-cov in llvm-profdata.zip"" 2022-03-15 05:09:55 +00:00
James Chen
ccf5111f4a Revert "Package llvm-cov in llvm-profdata.zip"
This reverts commit bd4f7c7ce7.

Reason for revert: b/224640947

Change-Id: I0eee5e9b75ac39513e43448c3bb63f18545cbc49
2022-03-15 02:13:40 +00:00
Treehugger Robot
e50553da9b Merge "Remove SOONG_CONFIG_art_module_source_build fallback" 2022-03-14 19:33:55 +00:00
Pirama Arumuga Nainar
72815bdf00 Merge "Package llvm-cov in llvm-profdata.zip" 2022-03-14 16:11:21 +00:00
Bowgo Tsai
662a2c610a Clear OS version and patch level fields for GKI boot images
GKI boot images will not set system version & SPL value in the
boot image header. They can be set by the device manufacturer
in the AVB properties instead.

Bug: 211741246
Test: build and `unpack_bootimg`
Change-Id: Ib357184636cb0c0c9b2a380ab3e3da7621d21790
2022-03-14 18:03:00 +08:00