diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-20 03:11:36 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-10-20 03:11:36 +0000 |
| commit | 4e0d137fbec213924dbf3b03054066b5d23ebf3b (patch) | |
| tree | 2eeaedc5323bead03b623977afa6396102457279 | |
| parent | 17a94cef9e8580a8e632e8017c987c7e648b6d6d (diff) | |
| parent | d3f48c496e58a4dffbba457afd1c91eb2c65966c (diff) | |
| download | dragonboard-4e0d137fbec213924dbf3b03054066b5d23ebf3b.tar.gz | |
Snap for 10975086 from d3f48c496e58a4dffbba457afd1c91eb2c65966c to 24Q1-release
Change-Id: I168a8dbd8bbb3a4f43d9505fc2bc8215939ceb68
| -rw-r--r-- | db845c.mk | 2 | ||||
| -rw-r--r-- | full.mk | 3 | ||||
| -rw-r--r-- | linaro_swr.mk | 2 | ||||
| -rw-r--r-- | linaro_swr/BoardConfig.mk | 7 | ||||
| -rw-r--r-- | rb5.mk | 2 | ||||
| -rw-r--r-- | shared/graphics/swangle/device.mk | 1 |
6 files changed, 7 insertions, 10 deletions
@@ -1,4 +1,6 @@ $(call inherit-product, device/linaro/dragonboard/full.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) $(call inherit-product, device/linaro/dragonboard/shared/graphics/drm_hwcomposer/device.mk) $(call inherit-product, device/linaro/dragonboard/shared/graphics/mesa/device.mk) $(call inherit-product, device/linaro/dragonboard/shared/graphics/minigbm_msm/device.mk) @@ -197,6 +197,3 @@ TARGET_PRODUCT_PROP := $(LOCAL_PATH)/product.prop DEVICE_MANIFEST_FILE := device/linaro/dragonboard/manifest.xml DEVICE_MATRIX_FILE := device/linaro/dragonboard/compatibility_matrix.xml - -$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) -$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) diff --git a/linaro_swr.mk b/linaro_swr.mk index fead873..5530e4f 100644 --- a/linaro_swr.mk +++ b/linaro_swr.mk @@ -1,4 +1,6 @@ $(call inherit-product, device/linaro/dragonboard/full.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) $(call inherit-product, device/linaro/dragonboard/shared/graphics/drm_hwcomposer/device.mk) $(call inherit-product, device/linaro/dragonboard/shared/graphics/minigbm_msm/device.mk) $(call inherit-product, device/linaro/dragonboard/shared/graphics/swangle/device.mk) diff --git a/linaro_swr/BoardConfig.mk b/linaro_swr/BoardConfig.mk index 615bf03..c57a9cc 100644 --- a/linaro_swr/BoardConfig.mk +++ b/linaro_swr/BoardConfig.mk @@ -6,13 +6,6 @@ TARGET_ARCH_VARIANT := armv8-2a TARGET_CPU_VARIANT := kryo385 TARGET_CPU_ABI := arm64-v8a -# Secondary Arch -TARGET_2ND_ARCH := arm -TARGET_2ND_ARCH_VARIANT := armv8-2a -TARGET_2ND_CPU_VARIANT := kryo385 -TARGET_2ND_CPU_ABI := armeabi-v7a -TARGET_2ND_CPU_ABI2 := armeabi - # Board Information TARGET_BOOTLOADER_BOARD_NAME := linaro_swr TARGET_BOARD_PLATFORM := linaro_swr @@ -1,4 +1,6 @@ $(call inherit-product, device/linaro/dragonboard/full.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk) +$(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk) $(call inherit-product, device/linaro/dragonboard/shared/graphics/drm_hwcomposer/device.mk) $(call inherit-product, device/linaro/dragonboard/shared/graphics/mesa/device.mk) $(call inherit-product, device/linaro/dragonboard/shared/graphics/minigbm_msm/device.mk) diff --git a/shared/graphics/swangle/device.mk b/shared/graphics/swangle/device.mk index 0eebc66..6f85a0e 100644 --- a/shared/graphics/swangle/device.mk +++ b/shared/graphics/swangle/device.mk @@ -48,4 +48,5 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.software.vulkan.deqp.level-2021-03-01.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.vulkan.deqp.level.xml PRODUCT_VENDOR_PROPERTIES += \ + debug.hwui.renderer=skiagl \ ro.hardware.vulkan=pastel |