universal7885: unify arm branch

This commit is contained in:
Gabriel2392 2022-07-30 08:08:40 -03:00
commit 9b035b514f
22 changed files with 519 additions and 9 deletions

View file

@ -1,6 +1,6 @@
LOCAL_PATH := $(call my-dir)
ifneq ($(filter a10 a20 a20e a30 a30s a40, $(TARGET_DEVICE)),)
ifneq ($(filter a10dd a10 a20 a20e a30 a30s a40, $(TARGET_DEVICE)),)
subdir_makefiles=$(call first-makefiles-under,$(LOCAL_PATH))
$(foreach mk,$(subdir_makefiles),$(info including $(mk) ...)$(eval include $(mk)))

View file

@ -3,7 +3,7 @@ COMMON_PATH := device/samsung/universal7885-common
BOARD_VENDOR := samsung
# Platform
ifeq ($(TARGET_DEVICE), $(filter $(TARGET_DEVICE),a10 a20 a20e))
ifeq ($(TARGET_DEVICE), $(filter $(TARGET_DEVICE),a10dd a10 a20 a20e))
TARGET_SOC := exynos7884B
TARGET_BOARD_PLATFORM := universal7884B
TARGET_BOOTLOADER_BOARD_NAME := universal7884B
@ -17,17 +17,26 @@ TARGET_NO_BOOTLOADER := true
TARGET_NO_RADIOIMAGE := true
# Architecture
ifeq ($(TARGET_DEVICE),a10dd)
TARGET_ARCH := arm
TARGET_ARCH_VARIANT := armv8-a
TARGET_CPU_ABI := armeabi-v7a
TARGET_CPU_ABI2 := armeabi
TARGET_CPU_VARIANT := cortex-a53
TARGET_CPU_SMP := true
TARGET_USES_64_BIT_BINDER := true
else
TARGET_ARCH := arm64
TARGET_ARCH_VARIANT := armv8-a
TARGET_CPU_ABI := arm64-v8a
TARGET_CPU_ABI2 :=
TARGET_CPU_VARIANT := cortex-a53
TARGET_2ND_ARCH := arm
TARGET_2ND_ARCH_VARIANT := armv8-a
TARGET_2ND_CPU_ABI := armeabi-v7a
TARGET_2ND_CPU_ABI2 := armeabi
TARGET_2ND_CPU_VARIANT := cortex-a53
endif
# Bluetooth
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := $(COMMON_PATH)/bluetooth
@ -80,6 +89,11 @@ BOARD_FLASH_BLOCK_SIZE := 131072
BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true
TARGET_VENDOR_PROP += $(COMMON_PATH)/vendor.prop
TARGET_SYSTEM_PROP += $(COMMON_PATH)/system.prop
ifeq ($(TARGET_ARCH),arm64)
TARGET_VENDOR_PROP += $(COMMON_PATH)/configs/vendor_64.prop
else
TARGET_VENDOR_PROP += $(COMMON_PATH)/configs/vendor_32.prop
endif
# Recovery
BOARD_HAS_DOWNLOAD_MODE := true

View file

@ -0,0 +1,3 @@
## RIL
vendor.sec.rild.libpath=/vendor/lib/libsec-ril.so
vendor.sec.rild.libpath2=/vendor/lib/libsec-ril-dsds.so

View file

@ -0,0 +1,3 @@
## RIL
vendor.sec.rild.libpath=/vendor/lib64/libsec-ril.so
vendor.sec.rild.libpath2=/vendor/lib64/libsec-ril-dsds.so

View file

@ -287,9 +287,13 @@ PRODUCT_PACKAGES += \
# VNDK
PRODUCT_COPY_FILES += \
prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcutils-v29.so \
prebuilts/vndk/v29/arm64/arch-arm-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib/libcutils-v29.so
ifeq ($(TARGET_ARCH),arm64)
PRODUCT_COPY_FILES += \
prebuilts/vndk/v29/arm64/arch-arm64-armv8-a/shared/vndk-sp/libcutils.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libcutils-v29.so
endif
# Workaround for vintf issues...
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/vintf/compatibility_matrix.3.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/vintf/compatibility_matrix.3.xml

View file

@ -25,10 +25,6 @@ ro.hwui.use_vulkan=true
graphics.gpu.profiler.support=true
debug.hwui.renderer=skiavk
## RIL
vendor.sec.rild.libpath=/vendor/lib64/libsec-ril.so
vendor.sec.rild.libpath2=/vendor/lib64/libsec-ril-dsds.so
# LTE, GSM and WCDMA
ro.telephony.default_network=9,9