Commit graph

71283 commits

Author SHA1 Message Date
satayev
2bcf499b56 Merge "Rename UpdatableBootJars to ApexBootJars." 2021-07-26 17:59:36 +00:00
Colin Cross
2c066b2aeb Merge "Rename T to Tiramisu" into sc-dev-plus-aosp 2021-07-26 16:30:33 +00:00
Colin Cross
47d36a96ad Fix build
Test: m out/target/product/bramble/obj/PACKAGING/vndk_intermediates/check-list-timestamp
Merged-In: I5745e9deb6eb6786fe4084a5b8e92925b70a8551
Change-Id: I5745e9deb6eb6786fe4084a5b8e92925b70a8551
(cherry picked from commit 980089dab4)
(cherry picked from commit ee3ddc7159)
2021-07-26 11:25:24 +09:00
Jiyong Park
d502a48dc4 Reland: *-ndk.so libraries are added to the VNDK set.
We will replace the ndk_platform backend with the ndk backend. The
former hasn't been deleted yet because there already are references to
it. When the existing references are all replaced with the ndk backend,
we will remove the ndk_platform backend and the corresponding libraries
will be removed from this list.

Bug: 161456198
Test: m
Merged-In: I4c45fdfd64159370813c40c8fa5554744b630746
Change-Id: I4c45fdfd64159370813c40c8fa5554744b630746
(cherry picked from commit ebe0e06055)
2021-07-26 11:25:04 +09:00
Colin Cross
ee3ddc7159 Fix build
Test: m out/target/product/bramble/obj/PACKAGING/vndk_intermediates/check-list-timestamp
Merged-In: I5745e9deb6eb6786fe4084a5b8e92925b70a8551
Change-Id: I5745e9deb6eb6786fe4084a5b8e92925b70a8551
(cherry picked from commit 980089dab4)
2021-07-26 09:28:44 +09:00
Jiyong Park
fa50d58e0a Reland: *-ndk.so libraries are added to the VNDK set.
We will replace the ndk_platform backend with the ndk backend. The
former hasn't been deleted yet because there already are references to
it. When the existing references are all replaced with the ndk backend,
we will remove the ndk_platform backend and the corresponding libraries
will be removed from this list.

Bug: 161456198
Test: m
Merged-In: I4c45fdfd64159370813c40c8fa5554744b630746
Change-Id: I4c45fdfd64159370813c40c8fa5554744b630746
(cherry picked from commit ebe0e06055)
2021-07-26 09:28:31 +09:00
Kelvin Zhang
a58990b338 Merge "Add an option for VABC xor" am: 76e3fb0597 am: 7245294db3
Original change: https://android-review.googlesource.com/c/platform/build/+/1763225

Change-Id: Iff27cfbb742f1cb104549f45018838ac2008a192
2021-07-24 01:00:28 +00:00
Kelvin Zhang
7245294db3 Merge "Add an option for VABC xor" am: 76e3fb0597
Original change: https://android-review.googlesource.com/c/platform/build/+/1763225

Change-Id: I15359eee36478f420aee6be2832d8efad34fc469
2021-07-24 00:42:42 +00:00
Kelvin Zhang
76e3fb0597 Merge "Add an option for VABC xor" 2021-07-24 00:25:03 +00:00
Kalesh Singh
ca472cdf6c Merge "vndk-list: Add android.system.suspend-V1-ndk_platform.so" am: d29f7d5466 am: 0af82868c6
Original change: https://android-review.googlesource.com/c/platform/build/+/1772438

Change-Id: I261deca8f5c67095aa74a95e28060b57d52af880
2021-07-23 21:25:40 +00:00
Colin Cross
a45d0c890e Rename T to Tiramisu
PLATFORM_VERSION_CODENAME is being updated from T to Tiramisu.

Bug: 186121492
Bug: 194055070
Test: m checkbuild
Merged-In: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
Change-Id: I39a82c8ac3fd0b43bad06ec47b85aaeda6ef5cb4
2021-07-23 21:05:16 +00:00
Kalesh Singh
0af82868c6 Merge "vndk-list: Add android.system.suspend-V1-ndk_platform.so" am: d29f7d5466
Original change: https://android-review.googlesource.com/c/platform/build/+/1772438

Change-Id: I236a1405da8c3ce645ceb752bd2773a89db9ea3b
2021-07-23 20:56:44 +00:00
Colin Cross
f79ec6e4ab Merge "Remove Fuchsia support from Make" am: 046531066c am: 49e7e9d203
Original change: https://android-review.googlesource.com/c/platform/build/+/1773208

Change-Id: I9bda1c3a34cfa88f44cfa1f026a2efa35c3272f5
2021-07-23 18:38:34 +00:00
Bowgo Tsai
5f3598bb2f [automerger skipped] Sets BOOT_SECURITY_PATCH for the generic boot.img am: 008599f7e9 -s ours
am skip reason: Merged-In I3909cccd0eae7c142d3c01d0ecb2c249286b9ebe with SHA-1 81a23fed56 is already in history

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

Change-Id: I45124866ae379f7b96aa55df35f32cedc9acfc82
2021-07-23 18:13:56 +00:00
Colin Cross
49e7e9d203 Merge "Remove Fuchsia support from Make" am: 046531066c
Original change: https://android-review.googlesource.com/c/platform/build/+/1773208

Change-Id: I7feaf3c79ff718354b3bd4029338b8c2cbdf18cd
2021-07-23 18:11:38 +00:00
Kalesh Singh
d29f7d5466 Merge "vndk-list: Add android.system.suspend-V1-ndk_platform.so" 2021-07-23 17:16:28 +00:00
Colin Cross
046531066c Merge "Remove Fuchsia support from Make" 2021-07-23 17:15:45 +00:00
Jose "Pepe" Galmes
3f51d7ec7a Merge "Support for dexopt postprocessing in merge_target_files." am: 81005b13f7 am: 7386f15fbb
Original change: https://android-review.googlesource.com/c/platform/build/+/1774125

Change-Id: Iec6e9339afdd0da153ffe30b5914de8b18614a3c
2021-07-23 05:22:21 +00:00
Jose "Pepe" Galmes
7386f15fbb Merge "Support for dexopt postprocessing in merge_target_files." am: 81005b13f7
Original change: https://android-review.googlesource.com/c/platform/build/+/1774125

Change-Id: I6c76277c26f90ef38dfe6f6546a5afda36aad578
2021-07-23 05:02:23 +00:00
Jose "Pepe" Galmes
81005b13f7 Merge "Support for dexopt postprocessing in merge_target_files." 2021-07-23 04:42:43 +00:00
Bowgo Tsai
008599f7e9 Sets BOOT_SECURITY_PATCH for the generic boot.img
This is for GKI 1.0 devices to pass VtsHalKeymasterV4_0TargetTest.

For GKI 2.0 devices, they will use device-specific
BOOT_SECURITY_PATCH to sign a prebuilt GKI boot.img to
override this value.
See https://r.android.com//1711437 for details.

Bug: 192513934
Test: `lunch gsi_arm64-user` then `make bootimage`
Test: `avbtool info_image --image $OUT/boot-4.19-gz.img`, checks
      com.android.build.boot.security_patch exists
Change-Id: I3909cccd0eae7c142d3c01d0ecb2c249286b9ebe
Merged-In: I3909cccd0eae7c142d3c01d0ecb2c249286b9ebe
(cherry picked from commit 81a23fed56)
2021-07-23 11:48:26 +08:00
Treehugger Robot
0d3f6e6f11 Merge "Sets BOOT_SECURITY_PATCH for the generic boot.img" am: 94bd6d7d5b am: e4348ac729
Original change: https://android-review.googlesource.com/c/platform/build/+/1773887

Change-Id: I25c2482ce5b9e62d72bf2182d36ec12368acf00d
2021-07-23 02:20:11 +00:00
Treehugger Robot
e4348ac729 Merge "Sets BOOT_SECURITY_PATCH for the generic boot.img" am: 94bd6d7d5b
Original change: https://android-review.googlesource.com/c/platform/build/+/1773887

Change-Id: I33f1bf5c285675dc721b2cad2aac3e8d8b815048
2021-07-23 02:01:50 +00:00
Treehugger Robot
94bd6d7d5b Merge "Sets BOOT_SECURITY_PATCH for the generic boot.img" 2021-07-23 01:41:31 +00:00
Tianjie Xu
17d0217737 Merge "Amend owner files for releasetool scripts" am: 58d0484e97 am: dbceb9b97e
Original change: https://android-review.googlesource.com/c/platform/build/+/1773794

Change-Id: I7b7b293a728e96cbe126ce0b0fd0256c4b4d3013
2021-07-22 22:05:15 +00:00
Tianjie Xu
dbceb9b97e Merge "Amend owner files for releasetool scripts" am: 58d0484e97
Original change: https://android-review.googlesource.com/c/platform/build/+/1773794

Change-Id: I49e9515f398fe7653a49d6ea574b584a4c2c2516
2021-07-22 21:51:48 +00:00
Tianjie Xu
58d0484e97 Merge "Amend owner files for releasetool scripts" 2021-07-22 21:37:04 +00:00
Jose Galmes
9c8f6eb7e1 Support for dexopt postprocessing in merge_target_files.
When using the VSDK, dexopt is not applied during the vendor build.
To avoid a first-boot time regression, dexopt is applied during the
merge stage, by running dexopt on the vendor apps and rebuilding
the vendor image.

Bug: 188179859
Test: Tested in keystone with VSDK target
Change-Id: Ie8e2d0a82850a2901fa6f250433bcbb43f0a97f2
2021-07-22 13:39:10 -07:00
TreeHugger Robot
18eac2c301 Merge "Don't use mainline prebuilts for coverage builds." into sc-dev am: d932280147
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15358466

Change-Id: If8a86300a70199380b8bf2885eeac909480e743d
2021-07-22 17:21:47 +00:00
TreeHugger Robot
d932280147 Merge "Don't use mainline prebuilts for coverage builds." into sc-dev 2021-07-22 16:37:03 +00:00
TreeHugger Robot
922a3d0086 Merge "Don't use prebuilt modules for sanitizer builds." into sc-dev am: 34828f27c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/15358465

Change-Id: Ic33048fac01e258912f94cd44d29b54c764f9cba
2021-07-22 16:14:50 +00:00
TreeHugger Robot
34828f27c7 Merge "Don't use prebuilt modules for sanitizer builds." into sc-dev 2021-07-22 15:43:13 +00:00
Mathew Inwood
31167aeaf4 Don't use mainline prebuilts for coverage builds.
Test: TH
Bug: 192556458
Bug: 159241638
Change-Id: Id29e273c1df1fa27a038ebdcff1a17acca58bd46
2021-07-22 12:10:57 +01:00
Mathew Inwood
2c2e1b5a1e Don't use prebuilt modules for sanitizer builds.
Prebuilt modules do not provide sanitizer binaries to using them in this
context is unsafe.

Bug: 194067130
Test: TH
Change-Id: I3682ae9ad963a8cd13bb395fe84dae515dc6d30f
2021-07-22 12:01:19 +01:00
Jooyung Han
f9be5eeb44 cleanup: remove unnecessary steps in apex_utils
`zipalign` before `signapk -a 4096` is unnecessary step since `signapk
-a 4096` does the same thing.

And, compressed APEX files don't need entries to be aligned.

Bug: 193362313
Test: atest --host releasetools_test
Change-Id: I0758d1162f7c3eb8cc9c73978b5ae5484f007a3a
2021-07-22 18:37:02 +09:00
Bowgo Tsai
81a23fed56 Sets BOOT_SECURITY_PATCH for the generic boot.img
This is for GKI 1.0 devices to pass VtsHalKeymasterV4_0TargetTest.

For GKI 2.0 devices, they will use device-specific
BOOT_SECURITY_PATCH to sign a prebuilt GKI boot.img to
override this value.
See https://r.android.com//1711437 for details.

Bug: 192513934
Test: `lunch gsi_arm64-user` then `make bootimage`
Test: `avbtool info_image --image $OUT/boot-4.19-gz.img`, checks
      com.android.build.boot.security_patch exists
Change-Id: I3909cccd0eae7c142d3c01d0ecb2c249286b9ebe
2021-07-22 16:09:05 +08:00
Tianjie
35ec7561d0 Amend owner files for releasetool scripts
Test: th
Change-Id: Ia77586f634609e5f3a8868e7d1237776052aab30
2021-07-21 16:10:53 -07:00
satayev
cc6576613d [automerger skipped] Merge "Rename PRODUCT_UPDATABLE_BOOT_JARS to PRODUCT_APEX_BOOT_JARS." am: 97aea02065 am: 5e2f6241d1 -s ours
am skip reason: Merged-In I0a559db462d1e1f67003ac54d1e27a89110d802a with SHA-1 11079b3d3f is already in history

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

Change-Id: I394cb5ef26cce30c612113f54a75dfa7319bb67a
2021-07-21 19:00:51 +00:00
satayev
5e2f6241d1 Merge "Rename PRODUCT_UPDATABLE_BOOT_JARS to PRODUCT_APEX_BOOT_JARS." am: 97aea02065
Original change: https://android-review.googlesource.com/c/platform/build/+/1768426

Change-Id: I36c30b68bde1bcdc97d4b3499d878b6206211b00
2021-07-21 18:00:47 +00:00
satayev
97aea02065 Merge "Rename PRODUCT_UPDATABLE_BOOT_JARS to PRODUCT_APEX_BOOT_JARS." 2021-07-21 17:48:10 +00:00
satayev
8bc189e39f Rename UpdatableBootJars to ApexBootJars.
Note that ART apex boot jars and core-icu4j are exceptions here as they
are not part of ApexBootJars. ART apex boot jars are defined in their
own variable, while core-icu4j is treated as a regular non-updatable
boot jar.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I5f5feb7344941d0154f384e3c06279d49b490768
2021-07-21 14:14:44 +01:00
Treehugger Robot
569ee774eb Merge "signapk: --align-file-size flag" am: da7ca70cd0 am: 7c5a69f51a
Original change: https://android-review.googlesource.com/c/platform/build/+/1762580

Change-Id: Ifccc1eeeb18a9b766ecffe9be9d17345fb0a1753
2021-07-21 00:51:08 +00:00
Treehugger Robot
7c5a69f51a Merge "signapk: --align-file-size flag" am: da7ca70cd0
Original change: https://android-review.googlesource.com/c/platform/build/+/1762580

Change-Id: I3f0160008af8d5a7390b0f267c386f3597f7b21f
2021-07-21 00:36:25 +00:00
Treehugger Robot
da7ca70cd0 Merge "signapk: --align-file-size flag" 2021-07-21 00:23:08 +00:00
Jooyung Han
ebe9afeb4a signapk: --align-file-size flag
A new flag tells that the resulting file size should be aligned as well.

For example, signapk -a 4096 --align-file-size ... generates the output
file of 4K-aligned sized.

Bug: 192991318
Test: check built APEX file size.
  APEX files should be sized as 4K-aligned.
Change-Id: I1c287e7219b4551bbb3e5957bdb64d80adfd3c39
2021-07-21 00:19:07 +00:00
Kalesh Singh
43014449a5 vndk-list: Add android.system.suspend-V1-ndk_platform.so
Bug: 170260236
Test: m
Change-Id: Ibebad08a196504da32d733213226de78a30f0cd1
2021-07-20 23:31:05 +00:00
Colin Cross
12b809af0c Remove Fuchsia support from Make
Bug: 194215932
Test: m checkbuild
Change-Id: I0f6fe8629beb10020d36a347e9f9385dda3e2684
2021-07-20 13:17:47 -07:00
satayev
11079b3d3f Rename PRODUCT_UPDATABLE_BOOT_JARS to PRODUCT_APEX_BOOT_JARS.
Regardless of an "updatable" property of individual, list all apex boot
jars in the same variable. This is less confusing for devs, especially
since they shouldn't care about things like boot images.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I0a559db462d1e1f67003ac54d1e27a89110d802a
2021-07-20 16:48:13 +00:00
satayev
65e68bb263 Rename PRODUCT_UPDATABLE_BOOT_JARS to PRODUCT_APEX_BOOT_JARS.
Regardless of an "updatable" property of individual, list all apex boot
jars in the same variable. This is less confusing for devs, especially
since they shouldn't care about things like boot images.

Bug: 191127295
Test: atest CtsClasspathsTestCases
Change-Id: I0a559db462d1e1f67003ac54d1e27a89110d802a
Merged-In: I0a559db462d1e1f67003ac54d1e27a89110d802a
2021-07-20 15:46:53 +01:00
Treehugger Robot
3e3ed691ed [automerger skipped] Merge "Fix typo in MODULE_BUILD_FROM_SOURCE variable." am: 37e6196c4e am: b7353b4acc -s ours
am skip reason: Merged-In I2056b198bc0b944a6736ff21077b902df13c1479 with SHA-1 2d6bfdb30c is already in history

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

Change-Id: I4cd780beac3d665f1511274b02ff06504058e68b
2021-07-20 11:57:42 +00:00