Commit Graph

7790 Commits

Author SHA1 Message Date
Yi-yo Chiang
a8295a5513 Merge "Bump GSI PRODUCT_SHIPPING_API_LEVEL to 31" am: 90b0039a9d am: bd3a3bc919 am: eb921708da am: 7b42795949
Original change: https://android-review.googlesource.com/c/platform/build/+/1913441

Change-Id: I71b5b53fe0bb4179e3d6a4fb76375a9994bbe13d
2021-12-14 12:49:45 +00:00
Yi-yo Chiang
7b42795949 Merge "Bump GSI PRODUCT_SHIPPING_API_LEVEL to 31" am: 90b0039a9d am: bd3a3bc919 am: eb921708da
Original change: https://android-review.googlesource.com/c/platform/build/+/1913441

Change-Id: Ibff899fa9a190da527da6c9cef4ddc5dfdf1c4b2
2021-12-14 12:32:56 +00:00
Yi-yo Chiang
eb921708da Merge "Bump GSI PRODUCT_SHIPPING_API_LEVEL to 31" am: 90b0039a9d am: bd3a3bc919
Original change: https://android-review.googlesource.com/c/platform/build/+/1913441

Change-Id: Ie54ddd87020a272e6e3ec0494c4faeaa7c116840
2021-12-14 12:11:16 +00:00
Yi-yo Chiang
90b0039a9d Merge "Bump GSI PRODUCT_SHIPPING_API_LEVEL to 31" 2021-12-14 11:39:03 +00:00
Rafay Kamran
4b08c049dc Merge "Created supplemental_process certificate and private key" 2021-12-13 14:19:07 +00:00
Akilesh Kailash
e4173f3167 Merge "Enable userspace snapshots for OTA" am: 3f5f0b306d am: 7260b087ea am: 1b14617cdb am: 3791ff3cf6
Original change: https://android-review.googlesource.com/c/platform/build/+/1912666

Change-Id: I349cc833f3517aeac9ccba2db1c236dbff30dc86
2021-12-10 20:51:05 +00:00
Akilesh Kailash
3791ff3cf6 Merge "Enable userspace snapshots for OTA" am: 3f5f0b306d am: 7260b087ea am: 1b14617cdb
Original change: https://android-review.googlesource.com/c/platform/build/+/1912666

Change-Id: I96e2ec314768bf9899bd3ea83e9bcbed0ccdc648
2021-12-10 20:32:55 +00:00
Akilesh Kailash
1b14617cdb Merge "Enable userspace snapshots for OTA" am: 3f5f0b306d am: 7260b087ea
Original change: https://android-review.googlesource.com/c/platform/build/+/1912666

Change-Id: I9fe57a883f46b38c1fb891777e8d2a06c33466dc
2021-12-10 20:15:43 +00:00
Akilesh Kailash
3f5f0b306d Merge "Enable userspace snapshots for OTA" 2021-12-10 19:44:48 +00:00
Yi-Yo Chiang
8d96c7303c Bump GSI PRODUCT_SHIPPING_API_LEVEL to 31
Bug: 209563751
Fixes: 209563751
Test: Presubmit
Change-Id: Ifcfe39c14a9459d75a5f8656820e1b20031ef3be
2021-12-09 06:00:07 +00:00
Yi-Yo Chiang
392a0db18d Roll-forward the VNDK snapshot list of GSI
The latest stable SDK version is 31, so add 31 to the list of VNDK
snapshots.

Bug: 196806844
Test: Presubmit
Change-Id: Ia9aab527d9c1fe1d1eb6c72ebc184a3fccad6a22
Merged-In: Ia9aab527d9c1fe1d1eb6c72ebc184a3fccad6a22
(cherry picked from commit 33fc244de5)
2021-12-08 18:12:47 +08:00
Akilesh Kailash
bfdd246130 Enable userspace snapshots for OTA
Bug: 202784018

Test: Full/Incremental OTA tested on CF, Pixel

OTA Merge time performance on Pixel (bramble)

==========================================================

Incremental - OTA - 389M

OTA Operations:

system - Copy-ops: 34060 Zero-ops: 678 Replace-ops: 93846 Xor-ops: 75490

product - Copy-ops: 241742 Zero-ops: 1970 Replace-ops: 292890 Xor-ops: 80763

vendor - Copy-ops: 110285 Zero-ops: 660 Replace-ops: 62163 Xor-ops: 23474

system_ext_b - Copy-ops: 44509 Zero-ops: 426 Replace-ops: 39475 Xor-ops: 44628

====================================================================

1: VAB - Compression with dm-snapshot (on Android S)

Merge-time = 344 seconds (~5.7 minutes)

2: VAB - Compression with user-snapshot (on Android T)

Merge-time = 53 seconds

3: VAB - Without compression (using kernel COW format)

Merge-time = 33 seconds

Compared to Android S, merge time improves by 84% with user-snapshots on Android T.

The 20 seconds difference between (2) and (3) is because of two phase merge during compression which essentially serializes merge start time between partitions.

On (3), there is no two phase merge as all the partition starts merge at the same time.

When there is no two phase merge involved, (2) and (3) are nearly identical.

============================================================

Full OTA - 1.8G

1: VAB - Compression with dm-snapshot (on Android S)

Merge-time = 40 seconds

2: VAB - Compression with user-snapshot (on Android T)

Merge-time = 32 seconds

3: VAB - Without compression (using kernel COW format)

Merge-time = 32 seconds

===============================================================

Presubmit OTA testing enabled on Cuttlefish for ~1 Week with
the feature enabled.

https://v2-dot-atp.googleplex.com/tests/asit/ota/incremental_mixed_resume

Signed-off-by: Akilesh Kailash <akailash@google.com>
Change-Id: I88d15b94a48799996f38755063319269a3d70723
2021-12-07 20:38:29 +00:00
Daeho Jeong
3d7741b8f3 Merge "Add erofs tools in target" am: 9a26cdbccd am: 3bda74b77e am: 5748c5679e am: dbfaf3bbe3
Original change: https://android-review.googlesource.com/c/platform/build/+/1908037

Change-Id: I7ff26537e93bef9ed81ba140670dfacd8be9f4b4
2021-12-04 06:09:07 +00:00
Daeho Jeong
dbfaf3bbe3 Merge "Add erofs tools in target" am: 9a26cdbccd am: 3bda74b77e am: 5748c5679e
Original change: https://android-review.googlesource.com/c/platform/build/+/1908037

Change-Id: Ib7ef9e7abeaf044ea5f3c96091cf74cd63f3e9fc
2021-12-04 05:50:29 +00:00
Daeho Jeong
5748c5679e Merge "Add erofs tools in target" am: 9a26cdbccd am: 3bda74b77e
Original change: https://android-review.googlesource.com/c/platform/build/+/1908037

Change-Id: I8fb56c8b23d395eabaa2652ebb8f4d8c2f1dfb25
2021-12-04 05:37:49 +00:00
Daeho Jeong
3bda74b77e Merge "Add erofs tools in target" am: 9a26cdbccd
Original change: https://android-review.googlesource.com/c/platform/build/+/1908037

Change-Id: Idfce5a9c0945b59833ba12117e07d2e685768934
2021-12-04 05:21:07 +00:00
Daeho Jeong
99f5c768c7 Add erofs tools in target
Bug: 201685920
Test: mm fsck.erofs
Signed-off-by: Daeho Jeong <daehojeong@google.com>
Change-Id: I43ebe6c40c705526e205a08fe8fcd34d265d0245
2021-12-03 19:37:46 +00:00
Jiyong Park
160149e42d Merge "Reland: Add NEED_AIDL_NDK_PLATFORM_BACKEND" 2021-12-03 10:56:52 +00:00
TreeHugger Robot
a8f1651584 Merge "Add android.hardware.bluetooth.audio-V1-ndk.so" 2021-12-03 01:11:14 +00:00
Jiyong Park
c99f65fa6c Reland: Add NEED_AIDL_NDK_PLATFORM_BACKEND
The config variable is used to force the generation of the AIDL
ndk_platform backend which will eventually be removed in favor of the
ndk backend. The switch is needed as an escape hatch for some devices
whose BSP (outsourced and thus hardly modifiable) depends on the
ndk_backend libraries.

Bug: 161456198
Test: m

Merged-In: Iba8633263ae649af783e94b01f5c1b5c6e042948
Change-Id: I8b73a6a1e5169c35daf333316857b3c3b110a0f7
2021-12-02 13:16:13 +09:00
Jiakai Zhang
6280c563e7 Merge "Add a variable to specify standalone system server jars." am: 1ecb2f952c am: 4207daaf8e am: bfa878e9de am: 459584be7f
Original change: https://android-review.googlesource.com/c/platform/build/+/1874113

Change-Id: I431fc53f33c64893efdbf7574d87e82592626f75
2021-12-01 13:13:19 +00:00
Kedar Chitnis
913b6e9381 Merge "Add dumpstate device AIDL HAL packages to target/product/gsi/current.txt" am: 161c7aa777 am: 517ac35b68 am: 0ef40dbf78 am: 0ec384a277
Original change: https://android-review.googlesource.com/c/platform/build/+/1894958

Change-Id: I6e29d0fab27e58e8b4a61c388ea50f5b7067a23d
2021-12-01 13:12:58 +00:00
Jiakai Zhang
459584be7f Merge "Add a variable to specify standalone system server jars." am: 1ecb2f952c am: 4207daaf8e am: bfa878e9de
Original change: https://android-review.googlesource.com/c/platform/build/+/1874113

Change-Id: Ieb8d2df9e9e7e6d6746f0cbb8c86d13ad6f7e148
2021-12-01 13:00:01 +00:00
Kedar Chitnis
0ec384a277 Merge "Add dumpstate device AIDL HAL packages to target/product/gsi/current.txt" am: 161c7aa777 am: 517ac35b68 am: 0ef40dbf78
Original change: https://android-review.googlesource.com/c/platform/build/+/1894958

Change-Id: I5abf92a77847613a62911d12b6b95557f20a715f
2021-12-01 12:59:46 +00:00
Jiakai Zhang
bfa878e9de Merge "Add a variable to specify standalone system server jars." am: 1ecb2f952c am: 4207daaf8e
Original change: https://android-review.googlesource.com/c/platform/build/+/1874113

Change-Id: I78d1c4e2f39f90263d52aa06d0b1a33466f8918e
2021-12-01 12:43:17 +00:00
Kedar Chitnis
0ef40dbf78 Merge "Add dumpstate device AIDL HAL packages to target/product/gsi/current.txt" am: 161c7aa777 am: 517ac35b68
Original change: https://android-review.googlesource.com/c/platform/build/+/1894958

Change-Id: I0127304961cd75704c6195e88676ebde967d5eb1
2021-12-01 12:43:03 +00:00
Jiakai Zhang
4207daaf8e Merge "Add a variable to specify standalone system server jars." am: 1ecb2f952c
Original change: https://android-review.googlesource.com/c/platform/build/+/1874113

Change-Id: I1ba1cedc1da159c654675f7895e31c4ac8d6e92a
2021-12-01 12:37:48 +00:00
Kedar Chitnis
517ac35b68 Merge "Add dumpstate device AIDL HAL packages to target/product/gsi/current.txt" am: 161c7aa777
Original change: https://android-review.googlesource.com/c/platform/build/+/1894958

Change-Id: I5f891e113b6a88136bf710f550f1e6edda01e981
2021-12-01 12:30:31 +00:00
Jiakai Zhang
1ecb2f952c Merge "Add a variable to specify standalone system server jars." 2021-12-01 12:29:37 +00:00
Kedar Chitnis
161c7aa777 Merge "Add dumpstate device AIDL HAL packages to target/product/gsi/current.txt" 2021-12-01 12:16:33 +00:00
Jiakai Zhang
44ffb21e53 Add a variable to specify standalone system server jars.
This is the list of jars that system_server loads dynamically using
separate classloaders. We will rely on this variable to decide which
jars to preopt in the build system and on the device for system_server.

The list is supposed to be in sync with the code in SystemServer.java.
There will be a follow-up CL to add a comment in SystemServer.java to
remind developers to keep them in sync.

Bug: 203198541
Test: m nothing
Change-Id: I305a73218ef2d2c61ac3795d21026b2afe7007fd
2021-11-30 11:07:37 +00:00
Treehugger Robot
c88e6bc721 Merge "Use dex2oat64 on 64-bit-only builds" am: d373dd2938 am: 42294079a5 am: 97992fc8b5 am: a8f216fd8a
Original change: https://android-review.googlesource.com/c/platform/build/+/1904177

Change-Id: Iaf363e05633fcb546feaead33bda399bab20c209
2021-11-30 11:01:23 +00:00
Treehugger Robot
a8f216fd8a Merge "Use dex2oat64 on 64-bit-only builds" am: d373dd2938 am: 42294079a5 am: 97992fc8b5
Original change: https://android-review.googlesource.com/c/platform/build/+/1904177

Change-Id: I2fc3122607e66c1b9656c495203f38e61852ac7e
2021-11-30 10:41:56 +00:00
Treehugger Robot
97992fc8b5 Merge "Use dex2oat64 on 64-bit-only builds" am: d373dd2938 am: 42294079a5
Original change: https://android-review.googlesource.com/c/platform/build/+/1904177

Change-Id: I0f6ff3c75920e589a94a096ca17fb5a663906985
2021-11-30 10:28:58 +00:00
Roland Levillain
64c472aea7 Merge "Remove gdbserver from PRODUCT_PACKAGES_DEBUG in base_system.mk." am: 9bc6186a78 am: b70a78df2d am: a6272ae102 am: 0f77b684c4
Original change: https://android-review.googlesource.com/c/platform/build/+/1905270

Change-Id: I7bb622e82bbe389a5de47de44f6f2565c4eb8fb7
2021-11-30 10:28:24 +00:00
Roland Levillain
0f77b684c4 Merge "Remove gdbserver from PRODUCT_PACKAGES_DEBUG in base_system.mk." am: 9bc6186a78 am: b70a78df2d am: a6272ae102
Original change: https://android-review.googlesource.com/c/platform/build/+/1905270

Change-Id: I1620bf33b0e2f11e46cfeec618c7b9e6c43b2929
2021-11-30 10:16:41 +00:00
Treehugger Robot
42294079a5 Merge "Use dex2oat64 on 64-bit-only builds" am: d373dd2938
Original change: https://android-review.googlesource.com/c/platform/build/+/1904177

Change-Id: I2e9bad60dc12ca3cbdfb350b03bfd7274322b200
2021-11-30 10:05:58 +00:00
Roland Levillain
a6272ae102 Merge "Remove gdbserver from PRODUCT_PACKAGES_DEBUG in base_system.mk." am: 9bc6186a78 am: b70a78df2d
Original change: https://android-review.googlesource.com/c/platform/build/+/1905270

Change-Id: I059115b77c17c2e7a327bc8437356fc43168badc
2021-11-30 09:59:18 +00:00
Treehugger Robot
d373dd2938 Merge "Use dex2oat64 on 64-bit-only builds" 2021-11-30 09:48:09 +00:00
Roland Levillain
b70a78df2d Merge "Remove gdbserver from PRODUCT_PACKAGES_DEBUG in base_system.mk." am: 9bc6186a78
Original change: https://android-review.googlesource.com/c/platform/build/+/1905270

Change-Id: I17783b1c384d8fcae9144b359f82c9bcc51ce099
2021-11-30 09:41:28 +00:00
Roland Levillain
3fed5bbbab Remove gdbserver from PRODUCT_PACKAGES_DEBUG in base_system.mk.
The `gdbserver` binaries have been removed from Android sources
(https://android-review.googlesource.com/c/platform/prebuilts/misc/+/1748908/).

Test: m
Change-Id: I8e3001508360906f3fe86830b81fb94b01a5ac74
2021-11-29 14:26:10 +00:00
Ulyana Trafimovich
3c7d3b3498 Merge "Sort PRODUCT_APEX_BOOT_JARS automatically." am: af78df0553 am: b128e28695 am: ca6e563ad0 am: c44c174958
Original change: https://android-review.googlesource.com/c/platform/build/+/1903170

Change-Id: Ie2b6e20d65ff180d89d2afed54223dc1a9826429
2021-11-29 12:41:22 +00:00
Ulyana Trafimovich
c44c174958 Merge "Sort PRODUCT_APEX_BOOT_JARS automatically." am: af78df0553 am: b128e28695 am: ca6e563ad0
Original change: https://android-review.googlesource.com/c/platform/build/+/1903170

Change-Id: Ie91742d07109af4d1e91eb1ac824a658747dd2c0
2021-11-29 12:28:42 +00:00
Ulyana Trafimovich
ca6e563ad0 Merge "Sort PRODUCT_APEX_BOOT_JARS automatically." am: af78df0553 am: b128e28695
Original change: https://android-review.googlesource.com/c/platform/build/+/1903170

Change-Id: Id22b9a6a233c2a87b7e9e219f4205bb0871a7a1e
2021-11-29 12:17:18 +00:00
Ulyana Trafimovich
b128e28695 Merge "Sort PRODUCT_APEX_BOOT_JARS automatically." am: af78df0553
Original change: https://android-review.googlesource.com/c/platform/build/+/1903170

Change-Id: I82cebfc087ff033f7852c0550fb4568640493021
2021-11-29 12:04:30 +00:00
Ulya Trafimovich
c9ec59c72a Sort PRODUCT_APEX_BOOT_JARS automatically.
This is a follow-up CL for https://r.android.com/1900565.

This is needed because product makefiles may need to add their own
APEX boot jars, and they cannot insert them in the correct alphabetical
order on the list. So it needs to be sorted automatically. Do this
after processing all product makefiles and populating the variable,
but before passing it to Soong.

Bug: 207474880
Test: lunch aosp_cf_x86_64_phone-userdebug && launch_cvd
      # cuttlefish device boots successfully
Change-Id: I86b58ef8aeac595e401d872f59a2936a67bedeec
2021-11-26 16:02:54 +00:00
Kevin Brodsky
1917e4e047 Use dex2oat64 on 64-bit-only builds
dexopt defaults to dex2oat32 unless instructed otherwise. Since
dex2oat32 doesn't exist on a 64-bit-only build, make sure dex2oat64
is selected instead.

Test: boot aosp_cf_x86_64_only_phone and check that installd doesn't
  try to use dex2oat32
Change-Id: Ia67e746894684a52a4e5b765bfde0f6dd0efbf6e
2021-11-26 15:59:33 +00:00
Kedar Chitnis
344c0bf0cd Add dumpstate device AIDL HAL packages to target/product/gsi/current.txt
Bug: 205760700
Test: VtsHalDumpstateTargetTest, dumpstate, dumpstate_test, dumpsys
Change-Id: I087b59e9adceaa93bdb076007bd2fb833162e235
2021-11-25 07:48:19 +00:00
Treehugger Robot
fc05da88f5 Merge "Sort PRODUCT_APEX_SYSTEM_SERVER_JARS automatically." am: 03aa6cd538 am: 3f8601901a am: 0d780c6218 am: 5186413206
Original change: https://android-review.googlesource.com/c/platform/build/+/1900565

Change-Id: I7168d3169a6c3814105269d007e87ee4cd71833e
2021-11-24 20:35:43 +00:00
Treehugger Robot
5186413206 Merge "Sort PRODUCT_APEX_SYSTEM_SERVER_JARS automatically." am: 03aa6cd538 am: 3f8601901a am: 0d780c6218
Original change: https://android-review.googlesource.com/c/platform/build/+/1900565

Change-Id: I267b439637979847adc595f9a5da1df4fe8222e7
2021-11-24 20:22:16 +00:00