diff options
| author | Amit Pundir <amit.pundir@linaro.org> | 2023-10-18 19:47:15 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-10-18 19:47:15 +0000 |
| commit | e6fe95e2cbd88d387fc4e63c35ba599de995c8b0 (patch) | |
| tree | 2eeaedc5323bead03b623977afa6396102457279 | |
| parent | 16d6b4a0fa657aee5ffba3df28862dd02216140b (diff) | |
| parent | ab68f0ee844b16bde22afa364132f4c3aa880830 (diff) | |
| download | dragonboard-e6fe95e2cbd88d387fc4e63c35ba599de995c8b0.tar.gz | |
linaro_swr: Make it a 64bit only build target am: ab68f0ee84
Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/2785579
Change-Id: If9225fa465a08fb28539a78692a355a7b1c1242a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -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 |
5 files changed, 6 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) |