Commit graph

75758 commits

Author SHA1 Message Date
Cole Faust
62878a2cef Remove regex functionality from rbcrun
As a first step to making .rbc files compatible with bazel,
remove regex support since bazel doesn't have it.

Fixes: 227384703
Test: ./out/rbcrun ./build/make/tests/run.rbc
Change-Id: I8b946c20cc42897a47a5516a167732f4e16b6158
2022-03-30 12:00:15 -07:00
Treehugger Robot
d3a9957616 Merge "Add fake_packages to the list of exceptions to INSTALLED_FILES_OUTSIDE_PACKAGES" 2022-03-26 03:45:21 +00:00
Colin Cross
41e93ea093 Add fake_packages to the list of exceptions to INSTALLED_FILES_OUTSIDE_PACKAGES
Don't depend on fake_packages, they are already expanded into their
required modules.

Bug: 225187583
Bug: 226573153
Test: check dependency path to out/target/product/coral/system/apex/com.android.vndk.current.apex
Change-Id: Id7a646fe0368051a4a4719f846a158de07be9d20
2022-03-25 17:31:49 -07:00
Trevor Radcliffe
d1bb5919e3 Merge "Add DeviceProduct product varible to Soong" 2022-03-25 14:34:23 +00:00
Treehugger Robot
4f3937ac74 Merge "Remove snapuserd from vendor ramdisk" 2022-03-25 01:39:05 +00:00
Cole Faust
e721764192 Merge "Fix single value inheritance" 2022-03-24 20:46:33 +00:00
Kelvin Zhang
8a7277df41 Remove snapuserd from vendor ramdisk
When BOARD_MOVE_RECOVERY_RESOURCES_TO_VENDOR_BOOT is set,
snapuserd.recovery will be installed to vendor ramdisk, which we don't
want. To remove snapuserd from vendor ramdisk, remove
snapuserd.recovery. And only include it if dedicated recovery partition
is enabled. For non-dedicated recovery case, boot partition contains
snapuserd.

Test: th
Test: acloud create --local-image --local-instance, install OTA, reboot
Change-Id: Ib8173f68a1f43b736fe609977a36ad4851e0c367
2022-03-24 10:43:37 -07: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
Melisa Carranza Zúñiga
fb042449e0 Merge "Adding sepolicy sign params to sign_target_files_apks." 2022-03-22 18:00:43 +00:00
Treehugger Robot
dd7dbbfe7b Merge "Remove the oudated kernel from INTERNAL_EMULATOR_PACKAGE_FILES" 2022-03-22 17:39:38 +00:00
Treehugger Robot
93d7c150c9 Merge "Rebuild and copy recovery patch files when using vendor_otatools" 2022-03-22 17:06:50 +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
Iavor-Valentin Iftime
246a5c069a Rebuild and copy recovery patch files when using vendor_otatools
Rebuild recovery and copy recovery patch/install files when building vendor images using vendor otatools. Fixes ota_from_target_files failure.

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: I4a415417e0d7b1bcd548292ec8f3a12570ec65f0
2022-03-22 13:51:10 +00: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
Treehugger Robot
00ba4d5ea0 Merge "Remove iorapd from base product packages" 2022-03-22 04:09:42 +00:00
Melisa Carranza Zuniga
e6d4fb5ae6 Adding sepolicy sign params to sign_target_files_apks.
Bug: b/217570541
Test: sign_target_files_apks --sepolicy_key=build/make/tools/releasetools/testdata/testkey_RSA4096.key
--sepolicy_cert=build/make/tools/releasetools/testdata/testkey.x509.pem target_files.zip target_out.zip
Change-Id: I4ae9f2a3297d10de68c6444dea1cd9996ad9dd11

Change-Id: I4a1ac7009ae0d6bb53c74bd34f8c74f12ea0a3b8
2022-03-21 22:56:33 +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
Treehugger Robot
f16854d5f8 Merge "Re-land "Enable CFI for Bluetooth in new home"" 2022-03-21 15:02:11 +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
Treehugger Robot
2546bd70ab Merge "Fix typo -- no _gz on notice file name." 2022-03-18 22:21:36 +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
ed21d0f56a Merge "Roll-forward the VNDK snapshot list of GSI to 32" 2022-03-18 09:09:35 +00:00
Yi-yo Chiang
1d7c7f674e Roll-forward the VNDK snapshot list of GSI to 32
Bug: 216414337
Test: Presubmit
Merged-In: Ic6cec82357cec8f4ad7bee62a4eaf2f7685b730f
Change-Id: I76026d6f518c51966bc652eeb617b61967af77a7
2022-03-18 04:50:48 +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
Treehugger Robot
6b3e5294db Merge "Copy vendor & odm .map files when using vendor_otatools" 2022-03-17 17:51:51 +00:00
Myles Watson
d0a9ac08b9 Re-land "Enable CFI for Bluetooth in new home"
This reverts commit 2b0dd3bcbd.

Reason for revert: Fix landed at CL # 2029417
Bug: 221893030
Test: cert/run
Tag: #gd-refactor

Change-Id: I22799c8f898233851a5f2ae54add8e4f71541c94
2022-03-17 16:44:06 +00:00
Iavor-Valentin Iftime
880e4432b9 Copy vendor & odm .map files when using vendor_otatools
Copy IMAGES/vendor.map and IMAGES/odm.map files when building vendor images
using vendor otatools. Fixes validate_target_files failure.

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: Iaf904c90761b3830cf81af2561695c81bfc6c70d
2022-03-17 14:02:30 +00:00
Bram Bonné
ce8629fdbf Merge "Cherry pick sdk_sandbox dev keys." 2022-03-17 12:31:30 +00:00
Colin Cross
503b779266 Merge "Track licenses of dexpreopted bootjars" 2022-03-17 01:48:47 +00:00
Beth Thibodeau
cdd28862c3 Merge "Revert "Enable CFI for Bluetooth in new home"" 2022-03-17 00:49:07 +00:00
Beth Thibodeau
2b0dd3bcbd Revert "Enable CFI for Bluetooth in new home"
This reverts commit 6c7cce123c.

Reason for revert: DroidMonitor: Potential culprit for b/225059300 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted

Change-Id: I0f790404ba95ec2ba343c31faa58f4eb7c198758
2022-03-17 00:21:02 +00:00