Commit graph

1324 commits

Author SHA1 Message Date
Roman Kiryanov
e662209bee Retire emulator build files from build/make
they were moved to device/generic/goldfish

Bug: 295259752
Test: presubmit
Change-Id: I996811e8703b43313fca3ac819e6ed333d37866b
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-11-03 10:07:03 -07:00
Roman Kiryanov
4bf479f605 Retire obsolete emulator targets and boards
the sdk_phone* targets are replaced with sdk_phone64*,
the emulator* boards are replaced with emu64* in
the device/generic/goldfish folder.

Bug: 295259752
Test: presubmit
Change-Id: I069a06baf02aea30db617f183abbfeaa6f968f29
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-10-31 09:49:07 -07:00
Alfred Piccioni
bd523029a9 Remove emulator_x86_arm board from common boards
The board will now live in the Android TV vendor partition, since the
emulator team is no longer supporting 32-bit boards.

Bug: 305610937
Test: Null
Change-Id: Ia1afb35ad15eb991bb2451c160db4f853f016587
Merged-In: Ia1afb35ad15eb991bb2451c160db4f853f016587
2023-10-27 18:58:37 +00:00
Roman Kiryanov
4a3c2b3a5c Put the emulator_x86_arm board back
ATV still needs it. ATV will make a local copy
of this board (as the only user) and after that
this change should be reverted.

Bug: 305610937
Test: presubmit
Change-Id: I873a49d0c61b2e9711a33d0ac407d4341601af61
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-10-17 12:34:48 -07:00
Roman Kiryanov
e04167e58b Retire obsolete (32bit-only) emulator targets and boards
Please use 64bit-only targets instead:
* sdk_phone64_x86_64
* sdk_phone64_arm64
* we don't support x86+arm for AOSP targets

Bug: 295259752
Test: presubmit
Change-Id: I887e21ad00e6981a162da5cf1cc47827d068eee7
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-10-12 10:57:50 -07:00
Tomislav Novak
1af7e1fa7f emulator_arm64: Revert TARGET_NO_KERNEL to emulator default
With TARGET_NO_KERNEL set to false, sdk_phone_arm64 build depends on
$PRODUCT_OUT/kernel, which no longer exists as of aosp/2548555 ("Cleanup
in emulator_arm64/device.mk").

$ lunch sdk_phone_arm64-eng && m
[...]
FAILED: ninja: 'out/target/product/emulator_arm64/kernel', needed by
  'out/target/product/emulator_arm64/boot.img', missing and no known
  rule to make it

Goldfish makefiles copy prebuilt kernels to $OUT/kernel-ranchu that
the emulator then uses, so no need to generate the boot image.

Test: lunch sdk_phone_arm64-eng && m
Change-Id: I3598ac04b352fc07679315ced4f7b7a536ccb5a5
2023-09-21 14:49:56 -07:00
LaMont Jones
e61610d31a Add support for TARGET_BOARD_INFO_FILES
This makes it so that portions of android-info.txt can come from
different sources.

Bug: b/301141632
Test: manual
Change-Id: I82793b37162f52805db425b802a2e0762526bd91
2023-09-19 23:06:39 +00:00
Roman Kiryanov
f945b5df68 (reland2) Remove emulator dependencies on non emulator targets (2)
the sidecar issue in GSI was fixed.

Bug: 111538404
Test: presubmit
Change-Id: Ia48ce2e076edc4f13f85e58d9bbbe15b8e6a4438
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-07-11 14:16:35 -07:00
Roman Kiryanov
3a3b121154 Remove the X attribute from .mk files
Bug: 111538404
Test: presubmit
Change-Id: Iefd39e76559ec25c4bdd98893dfc593816da5077
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-07-11 14:16:35 -07:00
Ulya Trafimovich
08c381b8b2 Add riscv64 banchan target.
Test: banchan riscv64 com.android.art
Test: build/soong/build_test.bash --dist -products module_riscv64
Bug: 271573990
Change-Id: I6aa8c51b1a1928b3da52a9345a8bfb84e3eb11d0
2023-06-28 13:58:30 +01:00
SzuWei Lin
fb27c2954f 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 05:02:25 +00:00
Szu-An Lu
527591f248 Revert "(reland) Remove emulator dependencies on non emulator ta..."
Revert submission 2576824-aosp-no-emulator2

Reason for revert: build fail

Reverted changes: /q/submissionid:2576824-aosp-no-emulator2

Bug: 280698810
Change-Id: Id033198251c10bbe774436837e4cddb527062155
2023-05-08 21:20:13 +00:00
Roman Kiryanov
f47363caf5 (reland) Remove emulator dependencies on non emulator targets (2)
Bug: 111538404
Test: presubmit
Change-Id: I62531f60db9bd81ea12c898913b3bbd73c873b6f
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-05-03 14:27:48 -07:00
Richard Xie
47bddbced9 Merge "Revert "Remove emulator dependencies on non emulator targets (2)"" 2023-05-03 21:09:56 +00:00
Richard Xie
02b9b9e194 Revert "Remove emulator dependencies on non emulator targets (2)"
Revert submission 2529481-aosp-no-emulator

Reason for revert: DroidMonitor: Potential culprit for Bug 280642806 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Reverted changes: /q/submissionid:2529481-aosp-no-emulator

Change-Id: I732e1b1a1f001fe016a4e20c1a95516995522501
2023-05-03 20:56:54 +00:00
Roman Kiryanov
f50711adc4 Merge "Remove emulator dependencies on non emulator targets (2)" 2023-05-03 17:28:12 +00:00
Steven Moreland
52fbc7df01 Remove config for 64-bit binder ABI
Also make it an error to specify the configuration
being removed.

Bug: 232423610
Test: build, boot
Change-Id: I1e4d993c7f4b9628eee6b270e47919aede4408b6
2023-04-26 20:45:15 +00:00
Roman Kiryanov
d82931f9aa Remove emulator dependencies on non emulator targets (2)
Bug: 111538404
Test: presubmit
Change-Id: Idd55d7f10bc178cfe716d173dbe59d2bed5fd963
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-04-22 18:07:52 -07:00
Roman Kiryanov
2d9385fd32 Set BOARD_X_FILE_SYSTEM_TYPE in the common BoardConfig file
required if TARGET_COPY_OUT_X is set to
`product` or `system_ext`.

Bug: 111538404
Test: presubmit
Change-Id: Ibe7538885cd2f00b8f4340db83be7618a0beee4a
Signed-off-by: Roman Kiryanov <rkir@google.com>
2023-04-22 18:07:30 -07: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