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
diff --git a/BoardConfig-common.mk b/BoardConfig-common.mk
index 1113b58..7b5287d 100644
--- a/BoardConfig-common.mk
+++ b/BoardConfig-common.mk
@@ -32,7 +32,7 @@
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
diff --git a/aosp_common.mk b/aosp_common.mk
index e4e6863..57d6722 100644
--- a/aosp_common.mk
+++ b/aosp_common.mk
@@ -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)
diff --git a/device.mk b/device.mk
index d153692..dad8e37 100644
--- a/device.mk
+++ b/device.mk
@@ -18,7 +18,7 @@
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 @@
$(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)