Commit Graph

7903 Commits

Author SHA1 Message Date
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
Martin Stjernholm
91964c82e3 Configure boot image profiles for platform and unbundled ART module
builds (reland).

- Use art/build/boot/boot-image-profile.txt for the primary boot image
  in the ART module, both when it's built from source in platform and
  as an unbundled module.

- Use frameworks/base/boot/boot-image-profile.txt for the framework
  extension image in platform, but not in unbundled builds.

This should obsolete the combined profile
frameworks/base/config/boot-image-profile.txt.

This relands https://r.android.com/1881863 with a fix to allow multiple
values on PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION.

Test: build/soong/soong_ui.bash --dumpvar-mode \
        PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION
  and check that it prints both art/build/boot/boot-image-profile.txt
  and frameworks/base/boot/boot-image-profile.txt in a platform build
  on master.
Test: build/soong/soong_ui.bash --dumpvar-mode \
        PRODUCT_DEX_PREOPT_BOOT_IMAGE_PROFILE_LOCATION
  and check that it prints only art/build/boot/boot-image-profile.txt
  in an unbundled build on master-art.
Test: banchan com.android.art && m
  on master-art and check that
  out/soong/.intermediates/art/build/apex/com.android.art/android_common_com.android.art_image/image.apex/javalib/x86_64/boot.oat
  shrinks from 14 MB to 4.7.
Test: m droid
  on master together with https://r.android.com/1895131 and check that
  out/soong/.intermediates/art/build/apex/com.android.art/android_common_com.android.art_image/image.apex/javalib/x86_64/boot.oat
  and out/target/product/vsoc_x86_64/system/framework/x86_64/boot-framework.oat
  are identical.
Test: lunch armv8-eng && art/tools/buildbot-build.sh
  on master-art
Bug: 174746397
Change-Id: I9114271bc69cf0888150b2c778a086bc50b73045
2021-11-19 16:21:37 +00:00
Xin Li
0d8b812568 Merge "Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918" into stage-aosp-master 2021-11-18 21:28:37 +00:00
Yifan Hong
c4fe106fbc Merge changes from topic "servicemanager-recovery" am: 351cd2e489 am: 207e7372e7 am: c0802aa2f5 am: b384b246f4
Original change: https://android-review.googlesource.com/c/platform/build/+/1891531

Change-Id: Ifd9e224fb7f8095c6b67aa1c60725d532f763da6
2021-11-18 05:52:40 +00:00
Yifan Hong
b384b246f4 Merge changes from topic "servicemanager-recovery" am: 351cd2e489 am: 207e7372e7 am: c0802aa2f5
Original change: https://android-review.googlesource.com/c/platform/build/+/1891531

Change-Id: I76a829a18323fc01a9224e3696c32f1a63e8c8f8
2021-11-18 05:34:47 +00:00
Yifan Hong
c0802aa2f5 Merge changes from topic "servicemanager-recovery" am: 351cd2e489 am: 207e7372e7
Original change: https://android-review.googlesource.com/c/platform/build/+/1891531

Change-Id: Ie0e2cf7a90c7ad127a6fa0a6b42e078446bc954f
2021-11-18 05:18:00 +00:00
Yifan Hong
351cd2e489 Merge changes from topic "servicemanager-recovery"
* changes:
  Add servicemanager.recovery to base_vendor.mk.
  Add recovery service_contexts.
2021-11-18 04:39:14 +00:00
Gavin Corkery
fc0788f962 Merge "Revert "Revert "Add framework-supplementalprocess to PRODUCT_APE..."" 2021-11-17 18:53:55 +00:00
Alice Kuo
39d7b2bb93 Add android.hardware.bluetooth.audio-V1-ndk.so
This is the package for the shared types of AIDL Audio HAL.

Bug: 203490261
Test: m
Change-Id: I62e1ce426f741b0e241ebf409fa2e9ea91f8fe73
2021-11-17 17:00:07 +08:00
Gavin Corkery
2ac33aa153 Revert "Revert "Add framework-supplementalprocess to PRODUCT_APE..."
Revert^2 "Add framework-supplementalprocess prebuilts"

e0c2a4dea0d0e27abad0cd3e4d440ab8f82752e4

Change-Id: I1c35394c2fed645cbffa3e91e6b841a0f763329d
2021-11-16 22:33:10 +00:00
Xin Li
b461e822a1 Merge sc-qpr1-dev-plus-aosp-without-vendor@7810918
Bug: 205056467
Merged-In: I42fd618b5a018abd57e6eab4fe4ed6ba9f70a235
Change-Id: I5e0d686c2a1cc15e6a3115243f3a83cb070b111c
2021-11-15 23:30:54 +00:00
Martin Stjernholm
8838a6fb66 Merge "Revert "Configure boot image profiles for platform and unbundled ART module"" am: 629ca86722 am: 575a363461 am: 7d836fa763 am: 037a4a5de7
Original change: https://android-review.googlesource.com/c/platform/build/+/1892419

Change-Id: Ibce29a3a0ba40f25b8d28499bb52aca782a80a73
2021-11-15 21:14:07 +00:00
Martin Stjernholm
037a4a5de7 Merge "Revert "Configure boot image profiles for platform and unbundled ART module"" am: 629ca86722 am: 575a363461 am: 7d836fa763
Original change: https://android-review.googlesource.com/c/platform/build/+/1892419

Change-Id: I3dd0520f5bc856c07c640e3f0877cbf0e20966c6
2021-11-15 21:00:29 +00:00
Gavin Corkery
b1a5bc4dc6 Merge "Revert "Add framework-supplementalprocess to PRODUCT_APEX_BOOT_JARS"" 2021-11-15 20:51:41 +00:00
Martin Stjernholm
7d836fa763 Merge "Revert "Configure boot image profiles for platform and unbundled ART module"" am: 629ca86722 am: 575a363461
Original change: https://android-review.googlesource.com/c/platform/build/+/1892419

Change-Id: I1e7aa79ee9fcd8eec93e6184fd24dc86a1be6272
2021-11-15 20:49:36 +00:00
Gavin Corkery
1fa82bee12 Revert "Add framework-supplementalprocess to PRODUCT_APEX_BOOT_JARS"
Revert "Add framework-supplementalprocess prebuilts"

Revert submission 16194363-supplementalprocess-stubs

Reason for revert: PDK build break
Reverted Changes:
Ie1d3605d2:Add SupplementalProcess stubs and bootclasspath fr...
I1ea34faba:Add framework-supplementalprocess to PRODUCT_APEX_...
I8ef2a4c0f:Add jars and fragment to SupplementalProcess apex
Ibf9444f89:Add framework-supplementalprocess prebuilts

Change-Id: I76974501e045bfa3f96a29d72e23952eb7d824cb
2021-11-15 20:39:32 +00:00
Martin Stjernholm
629ca86722 Merge "Revert "Configure boot image profiles for platform and unbundled ART module"" 2021-11-15 20:01:45 +00:00
Martin Stjernholm
a7e1611118 Revert "Configure boot image profiles for platform and unbundled ART module"
This reverts commit 1f925ed13e.

Reason for revert: SH regressions in boot and app startup: b/206152027

Bug: 174746397
Bug: 206152027
Change-Id: I60f642b8e4dd8ea04248b835e5b76ffcf01ac300
2021-11-15 17:16:03 +00:00
Yifan Hong
ae48bc0499 Add servicemanager.recovery to base_vendor.mk.
This is so that AIDL HALs can run in recovery.

Test: manual in recovery
Bug: 170338625
Change-Id: Ie9bb7bd554d9d848e6bacd091e2273b7f390c2a9
2021-11-13 00:28:05 -08:00
Treehugger Robot
cec98d9c9d Merge "Configure boot image profiles for platform and unbundled ART module builds." am: 35e7ab363c am: b025e958cb am: 8964be56b4 am: 31b3bf7e11
Original change: https://android-review.googlesource.com/c/platform/build/+/1881863

Change-Id: I6d23b5e17f632a5d96bf2f1aec16215deb0fb20c
2021-11-12 21:07:55 +00:00
Treehugger Robot
31b3bf7e11 Merge "Configure boot image profiles for platform and unbundled ART module builds." am: 35e7ab363c am: b025e958cb am: 8964be56b4
Original change: https://android-review.googlesource.com/c/platform/build/+/1881863

Change-Id: I10c8cf1d3d77513c95fdfadece936a3ee3aab79f
2021-11-12 20:49:40 +00:00
Treehugger Robot
8964be56b4 Merge "Configure boot image profiles for platform and unbundled ART module builds." am: 35e7ab363c am: b025e958cb
Original change: https://android-review.googlesource.com/c/platform/build/+/1881863

Change-Id: I72d4b8e70f20601dd6cdc1d75e944c980e9dd17e
2021-11-12 20:32:35 +00:00
Treehugger Robot
35e7ab363c Merge "Configure boot image profiles for platform and unbundled ART module builds." 2021-11-12 19:56:53 +00:00
Treehugger Robot
834ec0bd4d Merge "Revert "Add fsverity test key"" am: edf3230c76 am: 2b15898d7f am: 9dbc9d400e am: edce9368fd
Original change: https://android-review.googlesource.com/c/platform/build/+/1888499

Change-Id: I912bff9587c4fd903ba3becac5f9e1c4f4173c23
2021-11-11 19:52:12 +00:00
Joshua Trask
1bcaafcbdd Add unbundled IntentResolver to base_system.
Please let me know if there's some other config
where this might be a better fit instead.

The earlier prototyping work that established the
first "delegate chooser" component (i.e.
"Phase 2" of go/sharesheet-unbundling-phases)
implemented that component in SystemUI, which is
explicitly referenced only in handheld_system_ext.
OTOH the original ("system") Sharesheet comes
from frameworks/base, so for parity it seems like
this probably belongs in base_system instead.

Note that this still has no user-observable
effect; the IntentResolver component is only
invoked under the DeviceConfig flag
`systemui::use_delegate_chooser` which is
currently false for all users who haven't
manually opted-in.

Bug: 202164690
Test: Manually tested functionality on raven
after `mp droid` (or more easily, just confirm
the presence of the component by
`adb shell pm list packages` and check for
`package:com.android.intentresolver`).

Change-Id: I04579cd722fe5c04b4ce3fc1cc291b272c7ebab2
2021-11-11 14:46:26 -05:00