Add tangor% to the pattern match
Some targets are using tangor_xxx and some use xxx_tangor, cover both to avoid duplicate zygote props. Test: Build Signed-off-by: Pat Tjin <pattjin@google.com> Change-Id: I43b18f6b5296f7b1575a8d5e817b3f2281dc1e1c
This commit is contained in:
parent
b0599c3b02
commit
a63220bcd1
3 changed files with 4 additions and 4 deletions
|
@ -32,7 +32,7 @@ TARGET_CPU_ABI := arm64-v8a
|
|||
TARGET_CPU_VARIANT := cortex-a55
|
||||
TARGET_CPU_VARIANT_RUNTIME := cortex-a55
|
||||
|
||||
ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
|
||||
ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT)))
|
||||
TARGET_2ND_ARCH := arm
|
||||
TARGET_2ND_ARCH_VARIANT := armv8-a
|
||||
TARGET_2ND_CPU_ABI := armeabi-v7a
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
#
|
||||
# All components inherited here go to system image
|
||||
#
|
||||
ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
|
||||
ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT)))
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||
else
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
|
||||
|
|
|
@ -18,7 +18,7 @@ include device/google/gs-common/device.mk
|
|||
|
||||
TARGET_BOARD_PLATFORM := gs101
|
||||
|
||||
ifneq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
|
||||
ifneq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT)))
|
||||
LOCAL_64ONLY := _64
|
||||
endif
|
||||
|
||||
|
@ -897,7 +897,7 @@ ifneq ($(BOARD_WITHOUT_RADIO),true)
|
|||
$(call inherit-product-if-exists, vendor/samsung_slsi/telephony/$(BOARD_USES_SHARED_VENDOR_TELEPHONY)/common/device-vendor.mk)
|
||||
endif
|
||||
|
||||
ifeq (,$(filter %tangor %_64,$(TARGET_PRODUCT)))
|
||||
ifeq (,$(filter %tangor tangor% %_64,$(TARGET_PRODUCT)))
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
|
||||
else
|
||||
$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit_only.mk)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue