diff options
| author | Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> | 2024-05-03 17:02:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2024-05-03 17:02:03 +0000 |
| commit | f6f561ff26d57ccf02b36045568ac676f886ceee (patch) | |
| tree | e68aec18218a7cf58b4bce110826d01eacc9d3f4 | |
| parent | 0cff94437a3ad5ec5b1ee8d0e2fc733ce7772cee (diff) | |
| parent | 73b2705ef06342910a458ef083ef2a757c29a658 (diff) | |
| download | cuttlefish-f6f561ff26d57ccf02b36045568ac676f886ceee.tar.gz | |
Merge "Reapply "cuttlefish: auto: remove guest Swiftshader"" into main
| -rw-r--r-- | shared/auto/device_vendor.mk | 1 | ||||
| -rw-r--r-- | shared/config/config_auto.json | 1 | ||||
| -rw-r--r-- | shared/config/config_auto_md.json | 1 | ||||
| -rw-r--r-- | shared/config/config_auto_portrait.json | 1 | ||||
| -rw-r--r-- | vsoc_arm64/BoardConfig.mk | 2 | ||||
| -rw-r--r-- | vsoc_arm64_only/BoardConfig.mk | 2 | ||||
| -rw-r--r-- | vsoc_x86_64/BoardConfig.mk | 2 | ||||
| -rw-r--r-- | vsoc_x86_64_only/BoardConfig.mk | 2 | ||||
| -rw-r--r-- | vsoc_x86_64_pgagnostic/BoardConfig.mk | 2 |
9 files changed, 8 insertions, 6 deletions
diff --git a/shared/auto/device_vendor.mk b/shared/auto/device_vendor.mk index 8b4cdec53..07c2f0567 100644 --- a/shared/auto/device_vendor.mk +++ b/shared/auto/device_vendor.mk @@ -24,7 +24,6 @@ $(call inherit-product, device/google/cuttlefish/shared/bluetooth/device_vendor. $(call inherit-product, device/google/cuttlefish/shared/gnss/device_vendor.mk) $(call inherit-product, device/google/cuttlefish/shared/graphics/device_vendor.mk) $(call inherit-product, device/google/cuttlefish/shared/secure_element/device_vendor.mk) -$(call inherit-product, device/google/cuttlefish/shared/swiftshader/device_vendor.mk) $(call inherit-product, device/google/cuttlefish/shared/telephony/device_vendor.mk) $(call inherit-product, device/google/cuttlefish/shared/sensors/device_vendor.mk) $(call inherit-product, device/google/cuttlefish/shared/device.mk) diff --git a/shared/config/config_auto.json b/shared/config/config_auto.json index 67dd3bc8c..22282d7fb 100644 --- a/shared/config/config_auto.json +++ b/shared/config/config_auto.json @@ -1,5 +1,6 @@ { "display0": "width=1080,height=600,dpi=120", "display1": "width=400,height=600,dpi=120", + "gpu_mode": "gfxstream_guest_angle_host_swiftshader", "memory_mb" : 4096 } diff --git a/shared/config/config_auto_md.json b/shared/config/config_auto_md.json index 7eb22c322..af2366177 100644 --- a/shared/config/config_auto_md.json +++ b/shared/config/config_auto_md.json @@ -3,5 +3,6 @@ "display1": "width=400,height=600,dpi=120", "display2": "width=800,height=600,dpi=120", "display3": "width=800,height=600,dpi=120", + "gpu_mode": "gfxstream_guest_angle_host_swiftshader", "memory_mb" : 4096 } diff --git a/shared/config/config_auto_portrait.json b/shared/config/config_auto_portrait.json index 565f3dc9d..96a19cb6c 100644 --- a/shared/config/config_auto_portrait.json +++ b/shared/config/config_auto_portrait.json @@ -1,4 +1,5 @@ { "display0": "width=1224,height=2175,dpi=140", + "gpu_mode": "gfxstream_guest_angle_host_swiftshader", "memory_mb" : 4096 } diff --git a/vsoc_arm64/BoardConfig.mk b/vsoc_arm64/BoardConfig.mk index 1c07a216d..c3708bdad 100644 --- a/vsoc_arm64/BoardConfig.mk +++ b/vsoc_arm64/BoardConfig.mk @@ -42,10 +42,10 @@ HOST_CROSS_2ND_ARCH := -include device/google/cuttlefish/shared/identity/BoardConfig.mk -include device/google/cuttlefish/shared/reboot_escrow/BoardConfig.mk -include device/google/cuttlefish/shared/sensors/BoardConfig.mk --include device/google/cuttlefish/shared/swiftshader/BoardConfig.mk -include device/google/cuttlefish/shared/telephony/BoardConfig.mk -include device/google/cuttlefish/shared/vibrator/BoardConfig.mk ifneq ($(BOARD_IS_AUTOMOTIVE), true) +-include device/google/cuttlefish/shared/swiftshader/BoardConfig.mk -include device/google/cuttlefish/shared/virgl/BoardConfig.mk endif diff --git a/vsoc_arm64_only/BoardConfig.mk b/vsoc_arm64_only/BoardConfig.mk index 4f363ed6e..173571c4b 100644 --- a/vsoc_arm64_only/BoardConfig.mk +++ b/vsoc_arm64_only/BoardConfig.mk @@ -38,10 +38,10 @@ HOST_CROSS_2ND_ARCH := -include device/google/cuttlefish/shared/identity/BoardConfig.mk -include device/google/cuttlefish/shared/reboot_escrow/BoardConfig.mk -include device/google/cuttlefish/shared/sensors/BoardConfig.mk --include device/google/cuttlefish/shared/swiftshader/BoardConfig.mk -include device/google/cuttlefish/shared/telephony/BoardConfig.mk -include device/google/cuttlefish/shared/vibrator/BoardConfig.mk ifneq ($(BOARD_IS_AUTOMOTIVE), true) +-include device/google/cuttlefish/shared/swiftshader/BoardConfig.mk -include device/google/cuttlefish/shared/virgl/BoardConfig.mk endif diff --git a/vsoc_x86_64/BoardConfig.mk b/vsoc_x86_64/BoardConfig.mk index cb3eab27c..2f7c363b5 100644 --- a/vsoc_x86_64/BoardConfig.mk +++ b/vsoc_x86_64/BoardConfig.mk @@ -45,10 +45,10 @@ TARGET_NATIVE_BRIDGE_2ND_ABI := armeabi-v7a armeabi -include device/google/cuttlefish/shared/identity/BoardConfig.mk -include device/google/cuttlefish/shared/reboot_escrow/BoardConfig.mk -include device/google/cuttlefish/shared/sensors/BoardConfig.mk --include device/google/cuttlefish/shared/swiftshader/BoardConfig.mk -include device/google/cuttlefish/shared/telephony/BoardConfig.mk -include device/google/cuttlefish/shared/vibrator/BoardConfig.mk ifneq ($(BOARD_IS_AUTOMOTIVE), true) +-include device/google/cuttlefish/shared/swiftshader/BoardConfig.mk -include device/google/cuttlefish/shared/virgl/BoardConfig.mk endif diff --git a/vsoc_x86_64_only/BoardConfig.mk b/vsoc_x86_64_only/BoardConfig.mk index 7b2de1e82..71d6b43f3 100644 --- a/vsoc_x86_64_only/BoardConfig.mk +++ b/vsoc_x86_64_only/BoardConfig.mk @@ -38,10 +38,10 @@ AUDIOSERVER_MULTILIB := first -include device/google/cuttlefish/shared/identity/BoardConfig.mk -include device/google/cuttlefish/shared/reboot_escrow/BoardConfig.mk -include device/google/cuttlefish/shared/sensors/BoardConfig.mk --include device/google/cuttlefish/shared/swiftshader/BoardConfig.mk -include device/google/cuttlefish/shared/telephony/BoardConfig.mk -include device/google/cuttlefish/shared/vibrator/BoardConfig.mk ifneq ($(BOARD_IS_AUTOMOTIVE), true) +-include device/google/cuttlefish/shared/swiftshader/BoardConfig.mk -include device/google/cuttlefish/shared/virgl/BoardConfig.mk endif diff --git a/vsoc_x86_64_pgagnostic/BoardConfig.mk b/vsoc_x86_64_pgagnostic/BoardConfig.mk index c0def09e2..e2bdcfd7d 100644 --- a/vsoc_x86_64_pgagnostic/BoardConfig.mk +++ b/vsoc_x86_64_pgagnostic/BoardConfig.mk @@ -52,10 +52,10 @@ AUDIOSERVER_MULTILIB := first -include device/google/cuttlefish/shared/identity/BoardConfig.mk -include device/google/cuttlefish/shared/reboot_escrow/BoardConfig.mk -include device/google/cuttlefish/shared/sensors/BoardConfig.mk --include device/google/cuttlefish/shared/swiftshader/BoardConfig.mk -include device/google/cuttlefish/shared/telephony/BoardConfig.mk -include device/google/cuttlefish/shared/vibrator/BoardConfig.mk ifneq ($(BOARD_IS_AUTOMOTIVE), true) +-include device/google/cuttlefish/shared/swiftshader/BoardConfig.mk -include device/google/cuttlefish/shared/virgl/BoardConfig.mk endif |