Commit graph

7557 commits

Author SHA1 Message Date
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
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
4d7ddff334 Merge "Add NEED_AIDL_NDK_PLATFORM_BACKEND" 2021-11-24 01:43:19 +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
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
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
35e7ab363c Merge "Configure boot image profiles for platform and unbundled ART module builds." 2021-11-12 19:56:53 +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
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
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
Elliott Hughes
267c6a8595 Merge "Don't package mdnsd for the host." 2021-10-27 21:49:13 +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
387b39fc91 Merge "Add health to VNDK list" 2021-10-26 22:33:31 +00:00
Yifan Hong
01b140d7f1 Add health to VNDK list
Test: pass
Bug: 177269435
Change-Id: I1653670a02284542eaa39ed7dc33ccc0aec54312
2021-10-25 21:00:42 -07:00
Jiyong Park
1010fff193 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: I62c995642b820419eaeedeee616c47aee1da251d
Change-Id: I62c995642b820419eaeedeee616c47aee1da251d
(cherry picked from commit ee29502db2)
2021-10-25 08:55:23 +09:00
Yi-Yo Chiang
09f68abca7 Merge "Revert "Renames boot-debug-*.img in GSI targets"" 2021-10-21 07:22:03 +00:00
Yi-Yo Chiang
be32848ce6 Merge "Stop building boot-(debug|with-debug-ramdisk)-*.img for GSI/GKI" 2021-10-21 04:59:33 +00:00
Treehugger Robot
ada4df3f1a Merge "Add fsverity test key" 2021-10-18 06:38:15 +00:00
Yi-Yo Chiang
ffb366ee99 Revert "Renames boot-debug-*.img in GSI targets"
This reverts commit a2a5db4466.

Reason for revert: original change was obsoleted by
  I3161e42b00a93177a1a4cb3b22da2218d294b7a7

Bug: 202129499
Test: Presubmit; change should be noop
Change-Id: Ib7be1ed73dbf08758276666f8ce35ed9cbf18a36
2021-10-18 06:33:51 +00:00
Dan Willemsen
39b81cdc7a Remove old build-tools/platform-tools SDK implementation
Since those were the only components of the Windows SDK, this removes a
lot of special casing around that as well.

Bug: 187222815
Change-Id: I2690aadcf78e9ccad43314c8475893e81a2e2735
2021-10-15 14:22:07 -07:00
Yi-Yo Chiang
92f08702dd Stop building boot-(debug|with-debug-ramdisk)-*.img for GSI/GKI
We don't need these anymore as we now export userdebug_plat_sepolicy.cil
to artifacts dist dir directly, so repack_bootimg don't need to use
boot-(debug|with-debug-ramdisk)-*.img as repack source anymore.

Bug: 202129499
Test: Check presubmit artifacts don't have boot-*debug*.img
Change-Id: I3161e42b00a93177a1a4cb3b22da2218d294b7a7
2021-10-15 19:26:39 +00:00
Inseob Kim
10255c8946 Add fsverity test key
Bug: 193113311
Test: N/A
Change-Id: I5ce7ff0872601520a8ed45bb143ff61b42ce43e0
2021-10-15 15:56:38 +09:00
Treehugger Robot
36987fa459 Merge "Revert "Set VNDK version to current for module builds"" 2021-10-14 17:26:27 +00:00
Jiyong Park
83ac8b7481 Revert "Set VNDK version to current for module builds"
This reverts commit af35677f03.

Bug: 185769808
Test: banchan com.android.media.swcodec module_arm64; m apps_only dist
Test: banchan com.android.media.swcodec aosp_arm64; m apps_only dist

In both cases, the built APEX doesn't have libsync.so in it.
apex_manifest.pb has libsync.so as requireNativeLibs.

Change-Id: I62397d50a6970a9316f0d6ddd36736f149bc7c2c
2021-10-12 13:45:50 +09:00
David Anderson
00addb0d28 Add f2fs.fsck to vendor_ramdisk.
Bug: 202462683
Test: f2fs.fsck is present in first_stage_ramdisk.
Change-Id: Ia4b76fc9ea25637d25e7171ee14278d2d80a2a33
2021-10-07 21:57:30 -07:00
Treehugger Robot
93152fc87a Merge "Revert "Stop building boot-debug-*.img for GKI"" am: 8681e5ac2a
Original change: https://android-review.googlesource.com/c/platform/build/+/1845113

Change-Id: Ie7f16d55760fe866c47aecb3994b77bf7cde60cd
2021-10-06 05:45:29 +00:00
Treehugger Robot
8681e5ac2a Merge "Revert "Stop building boot-debug-*.img for GKI"" 2021-10-06 05:29:21 +00:00
Yi-Yo Chiang
a62cc8a864 Revert "Stop building boot-debug-*.img for GKI"
This reverts commit f1679a0c1d.

Reason for revert: Unintentionally affects downstream, non-GSI-GKI products

Change-Id: Ic439ac586b9f27c7f83d0274f8ddfc6199cc05d5
2021-10-05 10:40:23 +00:00
Treehugger Robot
1508e90b94 Merge "Stop building boot-debug-*.img for GKI" am: 94ce4dbe2f
Original change: https://android-review.googlesource.com/c/platform/build/+/1839817

Change-Id: Id9f6eba26d02d1326fc6d8afbc318a76a0961a7b
2021-10-04 07:53:59 +00:00
Treehugger Robot
94ce4dbe2f Merge "Stop building boot-debug-*.img for GKI" 2021-10-04 07:36:38 +00:00
Howard Chen
8a59680b4f Merge "Make GSI target to export bootimage to DIST" am: c1b9c1d801
Original change: https://android-review.googlesource.com/c/platform/build/+/1839815

Change-Id: Ibac747f40c9a961fbe692f511b2edfef11f07247
2021-10-04 06:59:55 +00:00
Yi-Yo Chiang
f1679a0c1d Stop building boot-debug-*.img for GKI
GKI devices should be using vendor_boot-debug.img from their device
build instead.

Bug: 200945738
Test: Presubmit
Change-Id: I4ff19f8ccef9befc826c02a628cc15f5d2f68b10
2021-09-30 12:52:59 +00:00
Howard Chen
95339b0d91 Make GSI target to export bootimage to DIST
This is to support a bootimage only target in AB.

Bug: 198363484
Test: lunch aosp_arm64-userdebug; make bootimage dist

Change-Id: I9a32c365f635ec4693675a1969d7a1e684c8f55a
2021-09-30 07:10:05 +00:00
Adam Shih
869356db7f Merge "create a makefile that holds non AB device setting" am: 95e5729ee5
Original change: https://android-review.googlesource.com/c/platform/build/+/1774706

Change-Id: I3c94bb10b40a80d982dfceb0902f866d1ca24dea
2021-09-28 03:53:54 +00:00
Adam Shih
95e5729ee5 Merge "create a makefile that holds non AB device setting" 2021-09-28 03:36:43 +00:00
Jiakai Zhang
5c55d4ab75 Merge "Remove dalvik.vm.dex2oat-updatable-bcp-packages-file." am: 315e32a904
Original change: https://android-review.googlesource.com/c/platform/build/+/1833558

Change-Id: Ib82b28114cc9eee3aff919e2207d71defcd09d1c
2021-09-27 11:55:00 +00:00
Jiakai Zhang
f7523888d8 Remove dalvik.vm.dex2oat-updatable-bcp-packages-file.
This system property is no longer needed.

Bug: 200241946
Test: Presubmits
Change-Id: If86551ac511f29e3ec2ff992695cecbb0dd58bb6
2021-09-26 03:36:30 +00:00
Treehugger Robot
d995c9e246 Merge "Renames boot-debug-*.img in GSI targets" am: b7aced88d6
Original change: https://android-review.googlesource.com/c/platform/build/+/1833559

Change-Id: I77024efd9f0281e40397bdebfab4160997bb50dc
2021-09-25 03:50:32 +00:00
Treehugger Robot
b7aced88d6 Merge "Renames boot-debug-*.img in GSI targets" 2021-09-25 03:33:40 +00:00
Adam Shih
d40d176dba create a makefile that holds non AB device setting
Bug: 189894781
Test: build ROM with the binary inside
Change-Id: I99f2b4d3bd57b57ffd3b5066b1306c6fa17c2c85
2021-09-24 10:48:21 +08:00
Bowgo Tsai
a2a5db4466 Renames boot-debug-*.img in GSI targets
Those boot-debug-*.img is used with `repack_bootimg` for a
vendor_boot-debug.img in VTS setup. It is not for GKI boot.img
release.

  https://source.android.com/compatibility/vts/vts-on-gsi#repacking

Renames boot-debug-*.img to boot-with-debug-ramdisk-*.img to
avoid confusion with the official GKI boot.img release.

Bug: 200878300
Test: `lunch gsi_arm64-user` then `make bootimage_debug`
Change-Id: Ia1f6ba847d5b7409fb7a8534432484d2aa972494
2021-09-23 22:19:52 +08:00
Sarah Chin
3628138f4c Add IRadio modules to VNDK
Test: build
Bug: 198331451
Change-Id: Ifdf60903e715cae26a06501aeb3c578f94d207fd
Merged-In: Ifdf60903e715cae26a06501aeb3c578f94d207fd
2021-09-23 03:55:06 +00:00
Sarah Chin
519c2211d5 Add IRadio modules to VNDK
Test: build
Bug: 198331451
Change-Id: Ifdf60903e715cae26a06501aeb3c578f94d207fd
2021-09-21 23:33:20 -07:00
Treehugger Robot
2ab762b6f7 Merge "Make native.bridge property overridable" am: 3c63667abb
Original change: https://android-review.googlesource.com/c/platform/build/+/1832764

Change-Id: I68933ad960937b3d2d6f6f9d804169cbbc5e1063
2021-09-22 02:58:01 +00:00
Treehugger Robot
3c63667abb Merge "Make native.bridge property overridable" 2021-09-22 02:45:11 +00:00
Lev Rumyantsev
b32e1479ef Make native.bridge property overridable
When a device uses native bridge, it may be included in the system
image, so overriding by vendor/build.prop is not an option.
Example of overriding can be seen here: ag/15881132

Test: build cf_x86_64_phone-userdebug with native-bridge and launch, observe
1. ro.dalvik.vm.native.bridge=native_bridge.so moved from
vendor/build.prop to system/build.prop
2. the prop is correctly set at runtime
3. translated apps work
Bug: 197153442

Change-Id: I6cd566dd4e0fac181e309cb7f282d086de09075b
2021-09-21 15:01:08 -07:00