Commit Graph

8527 Commits

Author SHA1 Message Date
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
Treehugger Robot
edce9368fd Merge "Revert "Add fsverity test key"" am: edf3230c76 am: 2b15898d7f am: 9dbc9d400e
Original change: https://android-review.googlesource.com/c/platform/build/+/1888499

Change-Id: Ibcfdee0950a4ccd49ed688d852a9985d5497f3f0
2021-11-11 19:34:35 +00:00
Treehugger Robot
9dbc9d400e Merge "Revert "Add fsverity test key"" am: edf3230c76 am: 2b15898d7f
Original change: https://android-review.googlesource.com/c/platform/build/+/1888499

Change-Id: I7900c70dbc7cbd8295c8b21a91643ed3a2911ba4
2021-11-11 19:12:59 +00:00
Treehugger Robot
edf3230c76 Merge "Revert "Add fsverity test key"" 2021-11-11 18:29:58 +00:00
Martin Stjernholm
1f925ed13e Configure boot image profiles for platform and unbundled ART module
builds.

- 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.

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 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
  don't change size significantly.
Test: lunch armv8-eng && art/tools/buildbot-build.sh
  on master-art
Bug: 174746397
Change-Id: I77d7f73b1af414493ca00d2abf3a1e8b32c51d86
2021-11-11 16:01:51 +00:00
Gavin Corkery
e49c379c6e Merge "Add framework-supplementalprocess to PRODUCT_APEX_BOOT_JARS" 2021-11-11 15:59:13 +00:00
Inseob Kim
b73f8dcc05 Revert "Add fsverity test key"
This reverts commit 10255c8946.

Reason for revert: redundant for now

Change-Id: I756be1cfe3f4c8a2b8226955b8d9d963e40c71ae
2021-11-11 08:43:42 +00:00
Cole Faust
51888d561c Merge "Add soong_config_get" am: e856367da1 am: 88fac99ae6 am: 7e00224e10 am: 40886414ba am: eb404fac37
Original change: https://android-review.googlesource.com/c/platform/build/+/1883263

Change-Id: I5b630782e3ee1f846d20b343415b3d9999de76ab
2021-11-10 21:34:51 +00:00
Cole Faust
eb404fac37 Merge "Add soong_config_get" am: e856367da1 am: 88fac99ae6 am: 7e00224e10 am: 40886414ba
Original change: https://android-review.googlesource.com/c/platform/build/+/1883263

Change-Id: Ifa459c801c327c6709a3d08ca89e697e03fb64fa
2021-11-10 21:15:57 +00:00
Cole Faust
7e00224e10 Merge "Add soong_config_get" am: e856367da1 am: 88fac99ae6
Original change: https://android-review.googlesource.com/c/platform/build/+/1883263

Change-Id: I6b948b9535e93af86578e90e36e203b44f686f4d
2021-11-10 20:41:27 +00:00
Cole Faust
70a886c7ce Add soong_config_get
Having a function to get soong config variables
makes it easier to convert to starlark.

Bug: 201700692
Test: m RBC_PRODUCT_CONFIG=1 RBC_BOARD_CONFIG=1 nothing and check output files
Change-Id: I8627555df10d3f66f6154c00be9f0565076f1f94
2021-11-09 17:09:04 -08:00
Michael Wright
f67a456828 S V2 is now 32 am: 24d3b88704
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/+/16140164

Change-Id: Ic8bf8f30a82bebdd9c8e60a347fb8502184cfc61
2021-11-06 16:06:50 +00:00
Roshan Pius
24f4d01d6b Merge "Remove fira_android uwb package from VNDK" 2021-11-06 14:28:39 +00:00
Michael Wright
24d3b88704 S V2 is now 32
Bug: 204295952
Test: N/A
Change-Id: I0627247e0b40c6c912584d55417671d20167b7c2
Merged-In: I0627247e0b40c6c912584d55417671d20167b7c2
2021-11-05 19:39:39 +00:00
Roshan Pius
6b6df5cf69 Remove fira_android uwb package from VNDK
Bug: 197886322
Test: Compiles
Change-Id: I1767910238e08d7c5cda73b4b4377d1f3039121d
2021-11-05 12:09:47 -07:00
Gavin Corkery
38e7587660 Add framework-supplementalprocess to PRODUCT_APEX_BOOT_JARS
Test: Builds
Bug: 204989700
Change-Id: I1ea34fabae77ae4158bf9799ff8d7e356a1f269e
2021-11-05 09:20:23 +00:00
Michael Wright
4023936989 Merge "S V2 is now 32" 2021-11-05 02:10:38 +00:00
Nikita Ioffe
0d4aa2bf45 Merge "Add com.android.supplementalprocess to base_system.mk" 2021-11-03 23:48:19 +00:00
Michael Wright
591e6a8f3f S V2 is now 32
Bug: 204295952
Test: N/A
Change-Id: I0627247e0b40c6c912584d55417671d20167b7c2
2021-11-02 11:57:20 +00:00
TreeHugger Robot
178e578693 Merge "Add android.hardware.audio.common-V1-ndk.so" 2021-10-28 18:15:10 +00:00
Elliott Hughes
4371621968 Merge "Don't package mdnsd for the host." am: 267c6a8595 am: 65af0fd0a4 am: 89ea1e2275 am: 95d68573fe am: afd7e02e5f
Original change: https://android-review.googlesource.com/c/platform/build/+/1870882

Change-Id: I83ba343cb3cc70ce721aed105e56031d2a68d285
2021-10-28 00:10:01 +00:00
Mikhail Naganov
53a14bc621 Add android.hardware.audio.common-V1-ndk.so
This is the package for the shared types of AIDL Audio HAL.

Bug: 198812639
Test: m
Change-Id: Ia953963380794591eae6b1140d180dc36dfbe7ca
2021-10-27 16:47:23 -07:00
Elliott Hughes
89ea1e2275 Merge "Don't package mdnsd for the host." am: 267c6a8595 am: 65af0fd0a4
Original change: https://android-review.googlesource.com/c/platform/build/+/1870882

Change-Id: I23137a8b2b9d5601ab5f9720c9914c51d878eb35
2021-10-27 22:33:01 +00:00
Elliott Hughes
267c6a8595 Merge "Don't package mdnsd for the host." 2021-10-27 21:49:13 +00:00
Steven Moreland
f620f8a502 Merge "Add health to VNDK list" am: 387b39fc91 am: 422a06f4b1 am: 8f7396ca42 am: fdfbae44e7 am: 66eef46615
Original change: https://android-review.googlesource.com/c/platform/build/+/1863316

Change-Id: I39c036e37e6d7177c0faf0b4237c722e879f0860
2021-10-26 23:58:24 +00:00
Elliott Hughes
68d2f8ce91 Don't package mdnsd for the host.
I don't think anyone needs this since Brillo died.

Test: treehugger
Change-Id: Iaa7b84375c9d31f443cba4556dc25b9b00bae5f8
2021-10-26 16:38:58 -07:00
Steven Moreland
8f7396ca42 Merge "Add health to VNDK list" am: 387b39fc91 am: 422a06f4b1
Original change: https://android-review.googlesource.com/c/platform/build/+/1863316

Change-Id: Ib2c2014b0ce682b6b4a3c8d184fa496657d10da8
2021-10-26 23:15:19 +00:00