Commit Graph

8527 Commits

Author SHA1 Message Date
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
Edwin
2cd7bb5126 Update current.txt for DRM AIDL changes
Add android.hardware.drm-V1-ndk.so to
VNDK-Core for converting drm HIDL to
AIDL interface.

Test: build
  m android.hardware.drm-update-api -j128 && m -j128

Bug: 200055138
Bug: 170964303
Change-Id: Idcd0a8e444abad978c38dee204e8a8c2db2e2762
2021-12-01 20:26:35 -08: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
Treehugger Robot
0d780c6218 Merge "Sort PRODUCT_APEX_SYSTEM_SERVER_JARS automatically." am: 03aa6cd538 am: 3f8601901a
Original change: https://android-review.googlesource.com/c/platform/build/+/1900565

Change-Id: I9ad6fe383299e876ac1ec2a6fe29cc17ed45662c
2021-11-24 20:02:59 +00:00
Treehugger Robot
3f8601901a Merge "Sort PRODUCT_APEX_SYSTEM_SERVER_JARS automatically." am: 03aa6cd538
Original change: https://android-review.googlesource.com/c/platform/build/+/1900565

Change-Id: I0ec4ccb90656eb52aca495a4da7ba64c033418df
2021-11-24 19:34:15 +00:00
RafayKamran
b044c90302 Created supplemental_process certificate and private key
Used ~/master/development/tools/make_key with the subject '/C=US/ST=California/L=Mountain View/
O=Android/OU=Android/CN=Android/emailAddress=android@android.com' to create the certificate and key

Bug: 203670791
Test: make, Device boots
Change-Id: Ib0cdf7786c7f74cf294c54187649114e8ec6d315
2021-11-24 16:19:34 +00:00
Ulya Trafimovich
00496c1683 Sort PRODUCT_APEX_SYSTEM_SERVER_JARS automatically.
This is needed because product makefiles may need to add their own
system server jars to this variable, 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: atest art_standalone_dexpreopt_tests:art_standalone_dexpreopt_tests.DexpreoptTest#ForSystemServer
Change-Id: I80dbf555c395c92539c506d3d8b1f2f101a58bce
2021-11-24 15:41:49 +00:00
Nahian Ashraf
ab77473ace DO NOT MERGE: Revert "Add NEED_AIDL_NDK_PLATFORM_BACKEND"
Revert submission 1859096-remove_ndk_platform

Reason for revert: Build Breakage
Reverted Changes:
I62c995642:Add NEED_AIDL_NDK_PLATFORM_BACKEND
I1cbdce916:Don't generate the ndk_platform backend unless exp...

Change-Id: I4ddfb73ed7b9bcf1c6dee113e3ba9fd66d79d296
2021-11-24 15:16:59 +09:00
Treehugger Robot
9680501cc8 Merge "DO NOT MERGE: Revert "Add NEED_AIDL_NDK_PLATFORM_BACKEND"" 2021-11-24 05:35:08 +00:00
Nahian Ashraf
f41bff99b3 DO NOT MERGE: Revert "Add NEED_AIDL_NDK_PLATFORM_BACKEND"
Revert submission 1859096-remove_ndk_platform

Reason for revert: Build Breakage
Reverted Changes:
I62c995642:Add NEED_AIDL_NDK_PLATFORM_BACKEND
I1cbdce916:Don't generate the ndk_platform backend unless exp...

Change-Id: I4ddfb73ed7b9bcf1c6dee113e3ba9fd66d79d296
2021-11-24 03:34:07 +00:00
Jiyong Park
73cd59ea8b Merge "Add NEED_AIDL_NDK_PLATFORM_BACKEND" am: 4d7ddff334 am: c28911dd2a am: faf9b72cd3
Original change: https://android-review.googlesource.com/c/platform/build/+/1867788

Change-Id: I1fefaaae594b60cdc7506a510c87f26b12dac39f
2021-11-24 02:43:33 +00:00
Jiyong Park
c28911dd2a Merge "Add NEED_AIDL_NDK_PLATFORM_BACKEND" am: 4d7ddff334
Original change: https://android-review.googlesource.com/c/platform/build/+/1867788

Change-Id: I4c3fdafa50465bd050dbf3ef9e873e0e9fb0ff7c
2021-11-24 02:00:55 +00:00
Jiyong Park
4d7ddff334 Merge "Add NEED_AIDL_NDK_PLATFORM_BACKEND" 2021-11-24 01:43:19 +00:00
Martin Stjernholm
42ed3ff161 Merge "Configure boot image profiles for platform and unbundled ART module builds (reland)." am: f823ec6e99 am: 382d8ae9c4 am: cffbc40ea9 am: e7309cea6d
Original change: https://android-review.googlesource.com/c/platform/build/+/1896660

Change-Id: Ic77fa13ec275ffcada7f4962cd361d90bd746dd6
2021-11-22 15:00:18 +00:00
Martin Stjernholm
e7309cea6d Merge "Configure boot image profiles for platform and unbundled ART module builds (reland)." am: f823ec6e99 am: 382d8ae9c4 am: cffbc40ea9
Original change: https://android-review.googlesource.com/c/platform/build/+/1896660

Change-Id: I6eaf49afa42e1f6ee037b080af0f3cd00e2e08e5
2021-11-22 14:45:08 +00:00
Martin Stjernholm
382d8ae9c4 Merge "Configure boot image profiles for platform and unbundled ART module builds (reland)." am: f823ec6e99
Original change: https://android-review.googlesource.com/c/platform/build/+/1896660

Change-Id: I4f7a2e3c953e65d756f2eec9d7afdc033187682c
2021-11-22 14:24:16 +00:00
Joshua Trask
fd547d094e Merge "Add unbundled IntentResolver to base_system." 2021-11-19 22:40:52 +00:00