Commit Graph

1306 Commits

Author SHA1 Message Date
SzuWei Lin
0dce348046 Support dynamic 64-bit drmserver
64-bit GSI requires support both 64_32-bit and 64-bit devices at
the same time. Add a new variable TARGET_DYNAMIC_64_32_DRMSERVER
to put drmserver_dynamic.rc into GSI. Which starts 64-bit
drmserver if ro.zygote is zygote64. Otherwise, it keeps the
original behavior to start 32-bit drmserver.

Bug: 282603373
Test: make gsi_arm64-user; Check system/etc/init
Test: make gsi_arm-user; Check systen/etc/init
Change-Id: I874cee00a066086f565e044549ad40c6ab5d62b0
Merged-In: I874cee00a066086f565e044549ad40c6ab5d62b0
2023-05-17 15:35:59 +08:00
Roman Kiryanov
b623cfbe96 Cleanup in emulator_arm64/device.mk
emulator specifies its kernel in device/generic/goldfish

Bug: 111538404
Test: presubmit
Change-Id: I76ab7e5fbb19805f52c2ca4713e11cc544ada905
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-04-19 13:30:46 -07:00
Ulya Trofimovich
1d3c4ae036 Merge "Revert "Disable dexpreopt for aosp_riscv64"" 2023-04-03 11:31:42 +00:00
Treehugger Robot
7f92721184 Merge "Add the system_dlkm partition to goldfish" 2023-03-28 16:11:02 +00:00
Ulya Trofimovich
cc5c6a74ee Revert "Disable dexpreopt for aosp_riscv64"
This reverts commit ae7f543b7c.

Reason for revert: Enabling dexpreopt for RISC-V (there is still no
  compiler support, but dex2oat runs in verification mode and does
  not attempt any compilation with https://r.android.com/2510739).

Change-Id: I0a6d0416bec51131f0a54c7ff5b0e194728452b1
2023-03-28 13:15:35 +00:00
Roman Kiryanov
8e7f862bce Add the system_dlkm partition to goldfish
required by GKI

Bug: 274103438
Test: atest -c vts_dlkm_partition_test
Change-Id: I0ff1528cf4c79c9604db6302d9a3470e81aae7ee
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-03-27 11:21:38 -07:00
Treehugger Robot
e07ac36efa Merge "Use a better arbitrary target arch for this host-only "device"." 2023-03-24 21:27:15 +00:00
Colin Cross
ae7f543b7c Disable dexpreopt for aosp_riscv64
dex2oat isn't supported for riscv64 yet, disable dexpreopt.  For
aosp_riscv64-user and -userdebug builds it is also necessary to
relax the requirement that dexpreopt is enabled.

Test: lunch aosp_riscv64-userdebug && m
Change-Id: I3b66304cedf55f734f8aa1d3ad3ed594a7b9a122
2023-03-23 16:29:28 -07:00
Martin Stjernholm
4bbb9744db Use a better arbitrary target arch for this host-only "device".
This "device" is used for linux_bionic builds that may build with
prebuilts (from prebuilts/runtime/mainline and prebuilts/module_sdk) on
master-art and master-art-host. The ndk arch suite was recently
extended to riscv64 (https://r.android.com/2488597), and those
prebuilts don't include that arch, which caused a failure in Soong
(even though target prebuilts aren't actually used here).

Test: lunch armv8-eng
      env DIST_DIR=out/dist ./art/tools/dist_linux_bionic.sh \
        -j80 com.android.art.host
  on master-art
Bug: 274756655
Change-Id: I3e7cdc7dc4ed45ffde4ac139b00d1e9e0148744b
2023-03-23 18:39:54 +00:00
Roman Kiryanov
6a4773340a Remove conditions around PRODUCT_USE_DYNAMIC_PARTITIONS
PRODUCT_USE_DYNAMIC_PARTITIONS must be enabled.

Bug: 274103438
Test: presubmit
Change-Id: Ie0234187fd4689211f0d4530f9b96027567273ad
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-03-22 20:22:35 -07:00
Roman Kiryanov
6715e76360 Retire QEMU_USE_SYSTEM_EXT_PARTITIONS
always enabled

Bug: 274103438
Test: presubmit
Change-Id: Iace22e384976663a8b6e4d1c474c1e2d0f90ec74
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-03-22 20:22:35 -07:00
Roman Kiryanov
fd5e673f9f Match the generic_64bitonly_x86_64/BoardConfig.mk to generic_x86_64
aosp_64bitonly_x86_64 gets broken by the emulator
changes otherwise.

Bug: 274103438
Test: m
Change-Id: I31fed64619e26a1c690a6cf086c644757e45a878
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-03-22 20:22:21 -07:00
Roman Kiryanov
dd0483995d Retire QEMU_DISABLE_AVB
never enabled

Bug: 274103438
Test: presubmit
Change-Id: I4296bef2924d2f041d3e9cbfd2bb3ab0c2a72c75
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-03-21 15:30:21 -07:00
Erick Alvarez
2b8cf0e409 Revert "Disable dexpreopt for aosp_riscv64"
This reverts commit e325f61525.

Reason for revert: DroidMonitor-triggered revert due to breakage in some branches.

Bug: 270958097
Change-Id: I2c3bb568c7f3b0dc7a364ea74b91574966102ff3
2023-02-27 20:39:14 +00:00
Ulya Trafimovich
e325f61525 Disable dexpreopt for aosp_riscv64
dex2oat isn't supported for riscv64 yet, disable dexpreopt.  For
aosp_riscv64-user and -userdebug builds it is also necessary to
relax the requirement that dexpreopt is enabled.

Test: trehugger
Change-Id: Ib84f1b40675783d286f4ff89d3c1daa9c7be710a
2023-02-24 14:09:10 +00:00
Bo Hu
7fb8a697aa emulator: do not enforce 8G system image partition
Only use 8G as default size, when product does not specify
the system image sizes.

Bug: 265440010
Test: build and check sizes

Change-Id: I8da862482600d06eda9b84d0cc5db65f713067b5
2023-01-18 11:09:03 -08:00
Ben Murdoch
bb8e6f5b12 Increase GF dynamic partition size to 8G
Bug: 258783815
Test: $ lunch sdk_phone64_x86_64-userdebug; m
      $ ls -l $OUT/super.img - check 8G
      $ grep -i dynamic_partitions_group_size $OUT/misc_info.txt
Change-Id: Ib08ee42e76a91b1c61c1b870f890dba66ed61209
2022-11-14 17:15:22 +00:00
SzuWei Lin
8521eca84e Add the path of GSI document in gsi_release.mk
Documents for GSI specific packages can be found at
device/generic/common/README.md.

Bug: 256984997
Test: TH
Change-Id: I62bfeea292050773c9d12cd753357dda836b07b0
2022-11-07 18:13:44 +08:00
SzuWei Lin
1c31b049c9 Support system_dlkm in GSI
From Android 13, all devices must include a system_dlkm partition.
The patch enables system_dlkm on all GSI targets to support the devices
with system_dlkm partition, and be compatible with old devices
without a system_dlkm partition.

With patch, there is no /system/system_dlkm, and add a symlink
/system/lib/modules -> /system_dlkm/lib/modules

Bug: 256984997
Test: make gsi_arm64-user and aosp_arm64-user; check system folder
Change-Id: I2453ec43d584423cc4d5f0e23405f0ae9b6c5c90
2022-11-07 18:13:31 +08:00
Spandan Das
ce69e9c812 Convert check_radio_versions to python3
Additionaly,
1. Run it as a python_binary_host so that it uses the hermetic python
toolchain
2. Fix an existing bug where if `board_info_txt` was empty, $^ would
   evaluate to its own path, and it would try to parse the relevant
   configuration from the wrong file

Bug: 196300985
Test: m out/target/product/vsoc_arm64/android-info.txt
Change-Id: Ie1e51a93041591829da4351dd57f37106e15d764
2022-10-24 21:02:00 +00:00
Colin Cross
a1920a2f2e Merge "Set ALLOW_MISSING_DEPENDENCIES=true in generic_riscv64/BoardConfig.mk" 2022-10-21 00:35:39 +00:00
Colin Cross
a098e96018 Set ALLOW_MISSING_DEPENDENCIES=true in generic_riscv64/BoardConfig.mk
Building for riscv64 without ALLOW_MISSING_DEPENDENCIES=true fails
on prebuilt modules that are missing riscv64 files.  Set
ALLOW_MISSING_DEPENDENCIES=true in BoardConfig.mk for now to avoid
always having to set it on the command line.

Test: lunch aosp_riscv64-userdebug && m ndk_sysroot
Change-Id: I6b7dcf684b59d073cb6e257717946d551aefdb44
2022-10-20 14:04:21 -07:00
Roman Kiryanov
09741e4e4d Retire compatibility_matrix.xml in goldfish
not required

Bug: 250696437
Test: presubmit
Signed-off-by: Roman Kiryanov <rkir@google.com>
Change-Id: I3dc983e829613daabbc836bea3e0e26af632a25d
2022-10-18 13:54:05 -07:00
Colin Cross
dac728895d Add initial files for aosp_riscv64 target
Add barebones files to support building for a riscv64 target.

Bug: 250918230
Test: lunch aosp_riscv64-userdebug && m ALLOW_MISSING_DEPENDENCIES=true nothing
Change-Id: I61e6ecf6706b7682c77b07e6593d78c7d1eaef39
2022-10-05 12:04:31 -07:00
Sam Delmerico
eab83032ae add module_x86_64only product
64bit only systems won't load modules with mixed 32/64 binaries. We need
a 64bit only product to build with.

Bug: 205990590
Test: lunch module_x86_64only && m
Test: vendor/google/build/build_mainline_modules.sh
Change-Id: I906f6cd10882986c8182ed16916e07c0f0d8b32e
Merged-In: I906f6cd10882986c8182ed16916e07c0f0d8b32e
2022-09-06 14:35:03 +00:00
Sam Delmerico
8b9539324a add module_arm64only product
64bit only systems won't load modules with mixed 32/64 binaries. We need
a 64bit only product to build with.

Bug: 205990590
Test: lunch module_arm64only && m
Change-Id: I050a673bfa95978e624e64004089fe7a2b8e0a95
Merged-In: I050a673bfa95978e624e64004089fe7a2b8e0a95
2022-09-06 14:34:27 +00:00
Treehugger Robot
6cae23a562 Merge "Remove TARGET_ENABLE_MEDIADRM_64 from BoardConfigGsiCommon.mk" am: 2c3c189da7
Original change: https://android-review.googlesource.com/c/platform/build/+/2155273

Change-Id: If98201de255b5ec80ea66b7e92042a2d16033a42
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-22 14:44:12 +00:00
SzuWei Lin
606904d0b8 Remove TARGET_ENABLE_MEDIADRM_64 from BoardConfigGsiCommon.mk
The setting doesn't affect system image.

Bug: 239141283
Change-Id: I210add4cd76797bd181923ad8ec439cb96d0ac7c
2022-07-15 07:56:48 +00:00
SzuWei Lin
dab11d367d Merge "Support dynamic 64-bit media service" am: aba99adea4
Original change: https://android-review.googlesource.com/c/platform/build/+/2144759

Change-Id: I9b5a60c8630a082e72eb1dc803f50b56ad03a2e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-14 00:38:17 +00:00
SzuWei Lin
951279493d Support dynamic 64-bit media service
64-bit GSI requires support both 64_32-bit and 64-bit devices at
the same time. Add a new variable TARGET_DYNAMIC_64_32_MEDIASERVER
to put mediaserver_dynamic.rc into GSI. Which starts 64-bit
mediaserver if ro.zygote is zygote64. Otherwise, it keeps the
original behavior to start 32-bit meidaserver.

Bug: 236664614
Test: make gsi_arm64-user; Check system/etc/init
Test: make gsi_arm-user; Check systen/etc/init
Test: cts-tradefed; run cts-on-gsi -m CtsViewTestCases
Change-Id: I74699ec5fafadcbe78a7fef6d10aaed752cd5afa
2022-07-06 12:06:46 +08:00
Jiakai Zhang
04ed50089e Merge "Set TARGET_USES_64_BIT_BINDER for mainline_sdk." am: d02946c4c3 am: 21d0333357
Original change: https://android-review.googlesource.com/c/platform/build/+/2121572

Change-Id: I2f895f8dd1ee68f10b0bf92f5af72e88f8be5100
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-13 10:12:19 +00:00
Jiakai Zhang
f5637f94fe Set TARGET_USES_64_BIT_BINDER for mainline_sdk.
Devices are all using 64 bit binder, and mainline_sdk should too.
According the comment here: https://cs.android.com/android/platform/superproject/+/master:build/make/target/board/BoardConfigMainlineCommon.mk;l=25;drc=6e7693f1597a0934833a72faf35e918dfbdb6ecd,
this flag is required even for non-64 bit devices.

`libbinder` doesn't compile on host with 32 bit binder.

Test: packages/modules/common/build/mainline_modules_sdks.sh \
        --build-platform-sdks-for-mainline --build-release=latest
Change-Id: I357ce42e88ad13ed259d573b9dd2bbfc27b82687
2022-06-10 14:35:53 +01:00
Martin Stjernholm
e0d25da43d Merge "Add a product for building linux_bionic in --soong-only mode." am: 0f96329283 am: fbf8cd8b00
Original change: https://android-review.googlesource.com/c/platform/build/+/2063871

Change-Id: I5f1a0f2800475784acffc8e17891cf58c959d2aa
Ignore-AOSP-First: this is an automerge
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-25 17:50:28 +00:00
Martin Stjernholm
0f96329283 Merge "Add a product for building linux_bionic in --soong-only mode." 2022-04-25 16:54:49 +00:00
Treehugger Robot
df0327b8ad Merge "Add boot AVB key setting to GSI" am: f9fcd028df am: d02479f849 am: 7ab456ee2a
Original change: https://android-review.googlesource.com/c/platform/build/+/2068887

Change-Id: Ic62f5c94f4159e5442204ccc11d9aa1865d2d132
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-20 20:18:43 +00:00
Martin Stjernholm
2d068b59e6 Add a product for building linux_bionic in --soong-only mode.
Modelled after the mainline_sdk product.

Test: build/soong/soong_ui.bash --make-mode --soong-only \
        SOONG_ALLOW_MISSING_DEPENDENCIES=true \
        TARGET_PRODUCT=linux_bionic com.android.art.host
Bug: 31559095
Bug: 229123823
Change-Id: I6051d21cc4bae561e987561ddad5f1ec5435c4ca
2022-04-20 16:58:29 +01:00
SzuWei Lin
97064c53ff Add boot AVB key setting to GSI
Signing tool assumes GSI targets has boot.img and get error without
these settings.

Bug: 229814765
Change-Id: I1e8e7f6375e396e1c2feb858b97e7d27dc5a2dec
2022-04-20 07:20:45 +00:00
Treehugger Robot
fdfbd833eb Merge "Non-module targets." am: ff15a27bd7 am: 7c30a61bc6 am: 6687e127b0
Original change: https://android-review.googlesource.com/c/platform/build/+/2055031

Change-Id: I5a6aa6499b4c39a8933ffee3d622023f2e8e0bf1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-11 20:43:09 +00:00
Treehugger Robot
ff15a27bd7 Merge "Non-module targets." 2022-04-11 19:42:29 +00:00
SzuWei Lin
c9d8f2dde1 Merge "Support building EROFS for GSI targets" am: 36fc586e07 am: f1d3b2638b am: f68f5fd173
Original change: https://android-review.googlesource.com/c/platform/build/+/2052705

Change-Id: If425b06759d9c0a3f179ad34cf59818945c9569c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-08 09:49:02 +00:00
Bob Badour
3a0f0c157e Non-module targets.
Bug: 151177513
Bug: 213388645
Bug: 210912771

Test: m droid dist reportmissinglicenses

Change-Id: Ia7cddef9748f6c036a2fc7539dad717ebc131f7c
2022-04-07 22:03:29 -07:00
SzuWei Lin
0c791bedb4 Support building EROFS for GSI targets
The EROFS is planned to replace the ext4 as the file system format
of readonly partitions. This patch is enabling the ability to
build GSI with EROFS. The usage is

  $ GSI_FILE_SYSTEM_TYPE=erofs make -j

Bug: 227552340
Test: lunch gsi_arm64-user; GSI_FILE_SYSTEM_TYPE=erofs make -j
Test: Verify the file system format of system.img
Change-Id: Ie815002c677d099c4db0ab7ca22db16ac6123659
2022-04-07 07:11:24 +00:00
Treehugger Robot
7003c45166 Merge "Remove GKI from gsi_$arch" am: 9fee6befad am: 9b0c214673 am: 197e0be8ef
Original change: https://android-review.googlesource.com/c/platform/build/+/1936198

Change-Id: Id62f2a0f140183f1b2c767f1d097a0d434bad114
2022-03-16 08:41:49 +00:00
Treehugger Robot
9fee6befad Merge "Remove GKI from gsi_$arch" 2022-03-16 07:07:46 +00:00
Ramji Jiyani
c3b0cc5fde Pixel Common: system_dlkm: avb hashtree footer
Add avb hashtree footer args for the system_dlkm
partition required for the T launch devices.

Bug: 222334390
Test: TH, manual build, Code testing gs101 & R6
Signed-off-by: Ramji Jiyani <ramjiyani@google.com>
Change-Id: I7a28ccfa2acad2e20c35a8a68edbffcca068678e
2022-03-02 12:38:10 -08:00
Anton Hansson
3327b9fc79 Add an ndk product and device
This adds a product that generates a soong.variables config similar to
the one manually maintained for the ndk build at the moment.

Bug: 174315599
Test: TARGET_PRODUCT=ndk m nothing && inspect out/soong/soong.variables
Change-Id: Ia10079b8a1ed8edf4efa2a6a5b04a079eece5360
2022-02-23 13:25:59 +00:00
SzuWei Lin
eec848fd6a Remove GKI from gsi_$arch
After having gki_$arch, there is no longer need for building GKI
by target gsi_$arch. The BoardConfigGkiCommon.mk is also moved
to /device/generic/common. The patch removes all GKI related
settings and files from target gsi_$arch.

Bug: 212486689
Test: build dist of gsi_arm64-userdebug
Test: build dist of aosp_arm64-userdebug
Change-Id: I369f42ad1f6e3f519bb62c3f035e699df1c7468f
2022-01-21 11:54:12 +08:00
Yi-Yo Chiang
cd6de3d8bb Remove GKI_SIGNING args from recovery & debug boot image build rules
These options are for certifying official GKI release, so they should
never be added to build command of recovery.img and boot-debug.img.

Also define gki_signing_signature_args in misc_info.txt iff.
BOARD_GKI_SIGNING_KEY_PATH is defined, so there's one less conditional.
We need to define it even if BOARD_GKI_SIGNING_SIGNATURE_ARGS is empty,
so that sign_target_files_apks.py can modify the option during image
signing.

Bug: 210367929
Test: Presubmit
Change-Id: I9546fcda796586d97af244955e15c1b8dc9f6d92
2022-01-05 02:59:45 +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
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