halium_device: Unify tree for ARM64 and ARM variants

Android.mk

@@ -16,7 +16,6 @@
 
 LOCAL_PATH := $(call my-dir)
 
-ifneq ($(filter halium_arm64,$(TARGET_DEVICE)),)
+ifneq ($(filter halium_arm64 halium_arm,$(TARGET_DEVICE)),)
 include $(call all-makefiles-under,$(LOCAL_PATH))
-
 endif

AndroidProducts.mk

@@ -1,7 +1,11 @@
 PRODUCT_MAKEFILES := \
-    $(LOCAL_DIR)/lineage_halium_arm64.mk
+    $(LOCAL_DIR)/halium_arm/lineage_halium_arm.mk \
+    $(LOCAL_DIR)/halium_arm64/lineage_halium_arm64.mk
 
 COMMON_LUNCH_CHOICES := \
+    lineage_halium_arm-user \
+    lineage_halium_arm-userdebug \
+    lineage_halium_arm-eng \
     lineage_halium_arm64-user \
     lineage_halium_arm64-userdebug \
     lineage_halium_arm64-eng

BoardConfig.mk

@@ -16,9 +16,7 @@
 
 BOARD_VENDOR := halium
 
-DEVICE_PATH := device/halium/halium_arm64
-
-include build/make/target/board/generic_arm64/BoardConfig.mk
+DEVICE_PATH := device/halium/halium
 
 TARGET_USES_64_BIT_BINDER := true
 
@@ -42,6 +40,7 @@ TARGET_USES_HWC2 := true
 
 # Filesystem
 TARGET_USERIMAGES_USE_EXT4 := true
+TARGET_USERIMAGES_USE_F2FS := true
 
 # HIDL
 DEVICE_FRAMEWORK_MANIFEST_FILE := $(DEVICE_PATH)/framework_manifest.xml

halium_arm/BoardConfig.mk

@@ -0,0 +1,14 @@
+-include device/halium/halium/BoardConfig.mk
+
+# Include Legacy GSI patches
+include build/make/target/board/generic_arm_ab/BoardConfig.mk
+
+# Architecture
+TARGET_ARCH := arm
+TARGET_ARCH_VARIANT := armv7-a-neon
+TARGET_CPU_ABI := armeabi-v7a
+TARGET_CPU_ABI2 := armeabi
+TARGET_CPU_VARIANT := generic
+
+# Should be true for devices launched with Pie and Q
+TARGET_USES_64_BIT_BINDER := true

halium_arm/lineage_halium_arm.mk

@@ -0,0 +1,9 @@
+$(call inherit-product, $(LOCAL_PATH)/../lineage_halium.mk)
+# Inherit device
+$(call inherit-product, $(LOCAL_PATH)/../device.mk)
+
+PRODUCT_BRAND := halium
+PRODUCT_DEVICE := halium_arm
+PRODUCT_MANUFACTURER := halium
+PRODUCT_NAME := lineage_halium_arm
+PRODUCT_MODEL := Generic Device

halium_arm64/BoardConfig.mk

@@ -0,0 +1,17 @@
+-include device/halium/halium/BoardConfig.mk
+
+# Include Legacy GSI patches
+include build/make/target/board/generic_arm64_ab/BoardConfig.mk
+
+# Architecture
+TARGET_ARCH := arm64
+TARGET_ARCH_VARIANT := armv8-a
+TARGET_CPU_ABI := arm64-v8a
+TARGET_CPU_ABI2 :=
+TARGET_CPU_VARIANT := generic
+
+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 := generic

halium_arm64/lineage_halium_arm64.mk

@@ -0,0 +1,12 @@
+# Inherit 64bit configurations
+$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
+
+# Inherit common files
+$(call inherit-product, $(LOCAL_PATH)/../device.mk)
+$(call inherit-product, $(LOCAL_PATH)/../lineage_halium.mk)
+
+PRODUCT_BRAND := halium
+PRODUCT_DEVICE := halium_arm64
+PRODUCT_MANUFACTURER := Halium
+PRODUCT_NAME := lineage_halium_arm64
+PRODUCT_MODEL := Generic Device

lineage_halium_arm64.mk → lineage_halium.mk

@@ -15,21 +15,11 @@
 #
 
 # Inherit from those products. Most specific first.
-$(call inherit-product, $(SRC_TARGET_DIR)/product/core_64_bit.mk)
-# $(call inherit-product, $(SRC_TARGET_DIR)/product/full_base.mk)
 $(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_p.mk)
 
 # Inherit halium.mk
 $(call inherit-product, vendor/halium/config/halium.mk)
 
-# Inherit device
-$(call inherit-product, $(LOCAL_PATH)/device.mk)
-
 # Inherit fonts
 $(call inherit-product-if-exists, frameworks/base/data/fonts/fonts.mk)
 
-PRODUCT_BRAND := halium
-PRODUCT_DEVICE := halium_arm64
-PRODUCT_MANUFACTURER := halium
-PRODUCT_NAME := lineage_halium_arm64
-PRODUCT_MODEL := Generic Device