Commit graph

78484 commits

Author SHA1 Message Date
Colin Cross
2cd6b0fbf6 Merge changes I084158ff,I2f2ba905,Ic9af8761 am: ce3c48db58 am: e4c2fc9847 am: da2b3b3a5d
Original change: https://android-review.googlesource.com/c/platform/build/+/2035163

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

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

Change-Id: Ice10e4760a3e740472116a4e2d01bfc18b2e754d
2022-03-22 18:46:08 +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
Treehugger Robot
7ecab5ff11 Merge "Rebuild and copy recovery patch files when using vendor_otatools" am: 93d7c150c9 am: c4a7031063 am: 07326c0417
Original change: https://android-review.googlesource.com/c/platform/build/+/2036543

Change-Id: Ic5871105c9867d22ee3666e6be02c523c6c5b493
2022-03-22 18:05:26 +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
Iavor-Valentin Iftime
dd5ba7adff 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
(cherry picked from commit 246a5c069a)
Merged-In: I4a415417e0d7b1bcd548292ec8f3a12570ec65f0
2022-03-22 17:57:51 +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
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
e39d6af2de Merge "Make build support vendor_kernel_boot image" am: 8842016b30 am: 2dc9c52861 am: 3afd8feae8
Original change: https://android-review.googlesource.com/c/platform/build/+/2018599

Change-Id: I6fa0c4681ab6f974c97ac8112ad398de9f62d6a0
2022-03-22 14:33:50 +00:00
Lucas Wei
3afd8feae8 Merge "Make build support vendor_kernel_boot image" am: 8842016b30 am: 2dc9c52861
Original change: https://android-review.googlesource.com/c/platform/build/+/2018599

Change-Id: Iaf23543498e42321658e5409ed3b8d428545003c
2022-03-22 14:17:18 +00:00
Lucas Wei
2dc9c52861 Merge "Make build support vendor_kernel_boot image" am: 8842016b30
Original change: https://android-review.googlesource.com/c/platform/build/+/2018599

Change-Id: I7789e6570061b8808e661a1748dc7c8385820289
2022-03-22 14:02:52 +00: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
Etienne Ruffieux
5be591a6f6 Removing audio defaults from platform
Audio defaults have a lot of dependencies, and to reduce
the number of libs exposed in platform we need to remove
these audio defaults.

Bug: 220306859
Test: atest
Tag: #feature
Change-Id: Iee2e347e6dceec4232e408145e97024476744455
2022-03-22 10:41:09 +00:00
Yi-yo Chiang
f3309640bd Merge "Rename init_boot properties to ro.init_boot.*" am: e5ed34824f am: f773aa245f am: c69d4ddf3d
Original change: https://android-review.googlesource.com/c/platform/build/+/2026283

Change-Id: I256d377d8c18c557d9b6ecd4a484f2eaf8bca3ca
2022-03-22 10:32:04 +00:00
Yi-yo Chiang
c69d4ddf3d Merge "Rename init_boot properties to ro.init_boot.*" am: e5ed34824f am: f773aa245f
Original change: https://android-review.googlesource.com/c/platform/build/+/2026283

Change-Id: Ie684c49fb6048ad50fbe4ff1f5953ee3ec4f8cbb
2022-03-22 10:13:44 +00:00
Yi-yo Chiang
f773aa245f Merge "Rename init_boot properties to ro.init_boot.*" am: e5ed34824f
Original change: https://android-review.googlesource.com/c/platform/build/+/2026283

Change-Id: Ie004b08d4d2fec412199f2bf3742c6b9dfb69d6d
2022-03-22 09:50:44 +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
6eb6966189 [automerger skipped] Merge "Remove iorapd from base product packages" am: 00ba4d5ea0 am: b7179ce86d am: 30872255e4 -s ours
am skip reason: Merged-In I17491f42ca7a0b73de0b3a3c588a90c8e3e3f3e9 with SHA-1 113da5984a is already in history

Original change: https://android-review.googlesource.com/c/platform/build/+/2025084

Change-Id: Ie89fcc311c2c4adc0218d9dd9157cca32f81c277
2022-03-22 05:11:17 +00:00
Treehugger Robot
30872255e4 Merge "Remove iorapd from base product packages" am: 00ba4d5ea0 am: b7179ce86d
Original change: https://android-review.googlesource.com/c/platform/build/+/2025084

Change-Id: I82e4b5637ff99892c34e5e3b75cdaa6f0dff5814
2022-03-22 04:49:35 +00:00
Treehugger Robot
b7179ce86d Merge "Remove iorapd from base product packages" am: 00ba4d5ea0
Original change: https://android-review.googlesource.com/c/platform/build/+/2025084

Change-Id: I6b7895d9998a00c03cf6983be5881973bc0f3741
2022-03-22 04:28:05 +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
429521e6db Merge "Set Soong Config Vars for messaging conversion" am: 0e3ed13950 am: 4dfef48db0 am: fc7475ac2c
Original change: https://android-review.googlesource.com/c/platform/build/+/2018277

Change-Id: If25601636ad57b498b614868d95e27b1bd07c7e6
2022-03-21 18:01:28 +00:00
Trevor Radcliffe
fc7475ac2c Merge "Set Soong Config Vars for messaging conversion" am: 0e3ed13950 am: 4dfef48db0
Original change: https://android-review.googlesource.com/c/platform/build/+/2018277

Change-Id: Ib333b571b930d8f034670ea19a8abd1ca35c44e7
2022-03-21 17:45:33 +00:00
Trevor Radcliffe
4dfef48db0 Merge "Set Soong Config Vars for messaging conversion" am: 0e3ed13950
Original change: https://android-review.googlesource.com/c/platform/build/+/2018277

Change-Id: I901a5550787a9598cc44a9a6abe491dedb8ca748
2022-03-21 17:26:14 +00:00
Trevor Radcliffe
0e3ed13950 Merge "Set Soong Config Vars for messaging conversion" 2022-03-21 17:08:08 +00:00
Treehugger Robot
b132c85eed Merge "Re-land "Enable CFI for Bluetooth in new home"" am: f16854d5f8 am: 670f673ec1 am: 7022c5a63e
Original change: https://android-review.googlesource.com/c/platform/build/+/2030703

Change-Id: I57e265aaf5f47ceb6891d9481822e9750d4d7613
2022-03-21 15:51:13 +00:00
Treehugger Robot
7022c5a63e Merge "Re-land "Enable CFI for Bluetooth in new home"" am: f16854d5f8 am: 670f673ec1
Original change: https://android-review.googlesource.com/c/platform/build/+/2030703

Change-Id: Ided4b5406344e283ff9332212a33b1914773af9a
2022-03-21 15:32:06 +00:00
Treehugger Robot
670f673ec1 Merge "Re-land "Enable CFI for Bluetooth in new home"" am: f16854d5f8
Original change: https://android-review.googlesource.com/c/platform/build/+/2030703

Change-Id: Ibabb587dba411ff1b14ec1b6192a497e2be163ed
2022-03-21 15:15:22 +00:00
Treehugger Robot
f16854d5f8 Merge "Re-land "Enable CFI for Bluetooth in new home"" 2022-03-21 15:02:11 +00:00
Artur Satayev
caad215a98 Merge "Expand KNOWN_CODENAMES to cover all entries in Build.VERSION_CODES." into tm-dev 2022-03-21 13:45:09 +00:00
Nicolas Geoffray
b6bbdd546c Merge "Add /system/etc/preloaded-classes in the list of files with fsv_meta." am: 412185256f am: d021f26024 am: 802ae18bad
Original change: https://android-review.googlesource.com/c/platform/build/+/2032067

Change-Id: Iccf3ddc80a1f5491da956a5e194d56c39bd1e1c1
2022-03-21 10:06:58 +00:00
Nicolas Geoffray
802ae18bad Merge "Add /system/etc/preloaded-classes in the list of files with fsv_meta." am: 412185256f am: d021f26024
Original change: https://android-review.googlesource.com/c/platform/build/+/2032067

Change-Id: Ieb3561281f76c2ee46dabb6049161c8f0d5b6f2d
2022-03-21 09:33:40 +00:00
Nicolas Geoffray
d021f26024 Merge "Add /system/etc/preloaded-classes in the list of files with fsv_meta." am: 412185256f
Original change: https://android-review.googlesource.com/c/platform/build/+/2032067

Change-Id: Ib6fa9251a67ffbe63105467d690e66d88239b823
2022-03-21 08:58:36 +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