Commit Graph

76365 Commits

Author SHA1 Message Date
Jiakai Zhang
11f44e2802 Always turn on TARGET_BUILD_USE_PREBUILT_SDKS for unbundled build.
Before this change, TARGET_BUILD_USE_PREBUILT_SDKS was turned on only if
TARGET_BUILD_APPS or TARGET_BUILD_UNBUNDLED_IMAGE is set. After this
change, TARGET_BUILD_USE_PREBUILT_SDKS is always turned on if
TARGET_BUILD_UNBUNDLED is set.

We need this change because we need to build ART services on the thin
manifest, and ART's build script only sets TARGET_BUILD_UNBUNDLED.

Bug: 177273468
Test: (on aosp-master-art) . ./build/envsetup.sh && lunch arm_krait-eng && art/tools/buildbot-build.sh --target
Change-Id: I1b5f63043d518ac8306bd172ef8afd69ab3ae8e5
2022-03-29 16:11:12 +01:00
Sam Delmerico
ef43149136 add flag to skip soong tests for b command
Sometimes it is very handy during testing to temporarily skip Soong
tests, but there is not easy method to allow this without changing the
envsetup.sh file and re-sourcing before/after enabling/disabling the
skip-tests flag.

Test: b build '...' --skip-soong-tests
Change-Id: I6dcad3ba0336cfd1c4d2c4357b852900792445c3
2022-03-29 14:39:33 +00:00
Lucas Wei
b235b690a0 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.

Signed-off-by: Lucas Wei <lucaswei@google.com>
Change-Id: I38c57cc6dad7d762adc001351322c0614e69ed98
2022-03-29 18:01:58 +08:00
Cole Faust
db13a58184 Add implementation of dir function
mk2rbc was already emitting conversions of the dir
function, but its implementation didn't exist.

Bug: 227245326
Test: Manually
Change-Id: I3348c022a0ff84e6d3a5be6b18e45c439f1db802
2022-03-28 16:31:26 -07:00
Treehugger Robot
486c2e88ee Merge "Add fake_packages to the list of exceptions to INSTALLED_FILES_OUTSIDE_PACKAGES" am: d3a9957616 am: a2fefe18bd
Original change: https://android-review.googlesource.com/c/platform/build/+/2043302

Change-Id: I39165bf40b18b3118f7746a894108aa25bd8d73a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-26 04:22:57 +00:00
Treehugger Robot
a2fefe18bd Merge "Add fake_packages to the list of exceptions to INSTALLED_FILES_OUTSIDE_PACKAGES" am: d3a9957616
Original change: https://android-review.googlesource.com/c/platform/build/+/2043302

Change-Id: Ib68463c01ec65b841630b59dda8fd5887d1a1fe3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-26 04:06:47 +00: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
7c3ef9b405 Merge "Add DeviceProduct product varible to Soong" am: d1bb5919e3 am: b40d50e902
Original change: https://android-review.googlesource.com/c/platform/build/+/2037483

Change-Id: Ibb702c42fa3f42f4dd8ae6086498ccd8249e5da6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 17:16:28 +00:00
Trevor Radcliffe
b40d50e902 Merge "Add DeviceProduct product varible to Soong" am: d1bb5919e3
Original change: https://android-review.googlesource.com/c/platform/build/+/2037483

Change-Id: Ib7a45856074c5174c88af2ab496739cfd2aedc95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 16:59:04 +00:00
Trevor Radcliffe
d1bb5919e3 Merge "Add DeviceProduct product varible to Soong" 2022-03-25 14:34:23 +00:00
Treehugger Robot
6f829843e1 Merge "Remove snapuserd from vendor ramdisk" am: 4f3937ac74 am: a0041bba5e
Original change: https://android-review.googlesource.com/c/platform/build/+/2042523

Change-Id: Ice3ba8bfbcb70da58b45f6bca75be32d9a135e23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 02:27:17 +00:00
Treehugger Robot
a0041bba5e Merge "Remove snapuserd from vendor ramdisk" am: 4f3937ac74
Original change: https://android-review.googlesource.com/c/platform/build/+/2042523

Change-Id: I0a0b4691c687acfa26bf5df412336fc9c3fae8f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25 02:02:23 +00:00
Treehugger Robot
4f3937ac74 Merge "Remove snapuserd from vendor ramdisk" 2022-03-25 01:39:05 +00:00
Cole Faust
08e78b9fa4 Update paths to mk2rbc/rbcrun
They're now directly under the out folder instead
of out/soong.

Bug: 226677850
Test: Manually
Change-Id: I6f2d017736323a5a60b0a8d7face723862c0b0b3
2022-03-24 17:32:39 -07:00
Cole Faust
d332c248cd Merge "Fix single value inheritance" am: e721764192 am: aa1a0218c0
Original change: https://android-review.googlesource.com/c/platform/build/+/2036932

Change-Id: Ia6f366adb9880b0c677dcc5219d7d9302e50372d
Signed-off-by: Automerger Merge Worker
2022-03-24 21:18:47 +00:00
Cole Faust
aa1a0218c0 Merge "Fix single value inheritance" am: e721764192
Original change: https://android-review.googlesource.com/c/platform/build/+/2036932

Change-Id: Iebeae3ae179c8050aec710f16b6d2a00d2965c3f
Signed-off-by: Automerger Merge Worker
2022-03-24 21:02:09 +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
f74478b33b Merge "Support OUT_DIR for license graph." am: bc8d61f17b am: 443a7b25e3
Original change: https://android-review.googlesource.com/c/platform/build/+/2036930

Change-Id: I305c5312b687e39f49fc6d486f15faf97c87e3db
2022-03-24 04:38:43 +00:00
Treehugger Robot
7895babcad Merge "Revert "Rename init_boot properties to ro.init_boot.*"" am: 477b8e0561 am: 5e294a92bf
Original change: https://android-review.googlesource.com/c/platform/build/+/2039666

Change-Id: If815dd2ffd3addb569cf3bf5440eb61c4be1c07f
2022-03-24 04:35:07 +00:00
Treehugger Robot
443a7b25e3 Merge "Support OUT_DIR for license graph." am: bc8d61f17b
Original change: https://android-review.googlesource.com/c/platform/build/+/2036930

Change-Id: Ie6dee3f5a14b529f257ba166a9c44c0fcf14fb16
2022-03-24 04:13:02 +00:00
Treehugger Robot
5e294a92bf Merge "Revert "Rename init_boot properties to ro.init_boot.*"" am: 477b8e0561
Original change: https://android-review.googlesource.com/c/platform/build/+/2039666

Change-Id: I716d9c2409869f598673825564cb14dab41e044d
2022-03-24 04:09:42 +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
Bob Badour
b751e56046 Merge "Test suite notices using dependencies." am: d8f8910780 am: 70c11407ed
Original change: https://android-review.googlesource.com/c/platform/build/+/2032649

Change-Id: I8a051c66735b6a5ca008dad321e20b866d1429ea
2022-03-23 23:00:39 +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
70c11407ed Merge "Test suite notices using dependencies." am: d8f8910780
Original change: https://android-review.googlesource.com/c/platform/build/+/2032649

Change-Id: If50166ae671d05b7766a077b665fb317d3d7cc4b
2022-03-23 21:56:59 +00: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
10f38b6840 Merge "Add fsck.erofs to INTERNAL_OTATOOLS_MODULES" am: 3c51ee3122 am: 2874c1d5cf
Original change: https://android-review.googlesource.com/c/platform/build/+/2033823

Change-Id: Ia49ba8492d121d6526336f762b0d70d1ef96e552
2022-03-23 12:53:59 +00:00
Treehugger Robot
2874c1d5cf Merge "Add fsck.erofs to INTERNAL_OTATOOLS_MODULES" am: 3c51ee3122
Original change: https://android-review.googlesource.com/c/platform/build/+/2033823

Change-Id: I6603e441b456c2d6e9b09e6242df15c1a12e204b
2022-03-23 12:39:36 +00: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
da2b3b3a5d Merge changes I084158ff,I2f2ba905,Ic9af8761 am: ce3c48db58 am: e4c2fc9847
Original change: https://android-review.googlesource.com/c/platform/build/+/2035163

Change-Id: I403885fd6c137b27e492ea6604792000115b0ec6
2022-03-22 23:42:11 +00:00
Colin Cross
e4c2fc9847 Merge changes I084158ff,I2f2ba905,Ic9af8761 am: ce3c48db58
Original change: https://android-review.googlesource.com/c/platform/build/+/2035163

Change-Id: I94a3a362fac5b6d82a892a5120e9df3b24f6a0b4
2022-03-22 23:19:08 +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
a2db49becd Merge "Adding sepolicy sign params to sign_target_files_apks." am: fb042449e0 am: bd8c313275
Original change: https://android-review.googlesource.com/c/platform/build/+/2028269

Change-Id: I253d25f4ea34369fe8da5904cabcd6afbf40c7d1
2022-03-22 18:29:23 +00:00
Treehugger Robot
3f5a084147 Merge "Remove the oudated kernel from INTERNAL_EMULATOR_PACKAGE_FILES" am: dd7dbbfe7b am: 38b2618e6a
Original change: https://android-review.googlesource.com/c/platform/build/+/2032634

Change-Id: Id8d7e482fd5802d97b234b6c26fdbd9694fee4fd
2022-03-22 18:29:15 +00:00
Melisa Carranza Zúñiga
bd8c313275 Merge "Adding sepolicy sign params to sign_target_files_apks." am: fb042449e0
Original change: https://android-review.googlesource.com/c/platform/build/+/2028269

Change-Id: I1602444f91240a79957089780e7c3f4f7c0750b8
2022-03-22 18:27:23 +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
38b2618e6a Merge "Remove the oudated kernel from INTERNAL_EMULATOR_PACKAGE_FILES" am: dd7dbbfe7b
Original change: https://android-review.googlesource.com/c/platform/build/+/2032634

Change-Id: I80d57eef34ffa4236714e66e310a01cf6a4fe8c8
2022-03-22 17:56:31 +00:00
Treehugger Robot
07326c0417 Merge "Rebuild and copy recovery patch files when using vendor_otatools" am: 93d7c150c9 am: c4a7031063
Original change: https://android-review.googlesource.com/c/platform/build/+/2036543

Change-Id: I012edbcc0f7e851686ac2f3576d7f36c3735eb54
2022-03-22 17:44:23 +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
c4a7031063 Merge "Rebuild and copy recovery patch files when using vendor_otatools" am: 93d7c150c9
Original change: https://android-review.googlesource.com/c/platform/build/+/2036543

Change-Id: Ica43825a4b887a421cdcd2bab70587c786afb7e9
2022-03-22 17:26:22 +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