Merge remote-tracking branch 'phh/android-8.1' into o8.1-los
diff --git a/.gitignore b/.gitignore
index a2533a7..19bd21e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
.*.swp
-treble_*mk
-AndroidProducts.mk
+
diff --git a/AndroidProducts.mk b/AndroidProducts.mk
new file mode 100644
index 0000000..66973ad
--- /dev/null
+++ b/AndroidProducts.mk
@@ -0,0 +1,34 @@
+PRODUCT_MAKEFILES := \
+ $(LOCAL_DIR)/treble_arm64_avS.mk \
+ $(LOCAL_DIR)/treble_arm64_avN.mk \
+ $(LOCAL_DIR)/treble_arm_avS.mk \
+ $(LOCAL_DIR)/treble_arm_avN.mk \
+ $(LOCAL_DIR)/treble_arm64_agS.mk \
+ $(LOCAL_DIR)/treble_arm64_agN.mk \
+ $(LOCAL_DIR)/treble_arm_agS.mk \
+ $(LOCAL_DIR)/treble_arm_agN.mk \
+ $(LOCAL_DIR)/treble_arm64_afS.mk \
+ $(LOCAL_DIR)/treble_arm64_afN.mk \
+ $(LOCAL_DIR)/treble_arm_afS.mk \
+ $(LOCAL_DIR)/treble_arm_afN.mk \
+ $(LOCAL_DIR)/treble_arm64_aoS.mk \
+ $(LOCAL_DIR)/treble_arm64_aoN.mk \
+ $(LOCAL_DIR)/treble_arm_aoS.mk \
+ $(LOCAL_DIR)/treble_arm_aoN.mk \
+ $(LOCAL_DIR)/treble_arm64_bvS.mk \
+ $(LOCAL_DIR)/treble_arm64_bvN.mk \
+ $(LOCAL_DIR)/treble_arm_bvS.mk \
+ $(LOCAL_DIR)/treble_arm_bvN.mk \
+ $(LOCAL_DIR)/treble_arm64_bgS.mk \
+ $(LOCAL_DIR)/treble_arm64_bgN.mk \
+ $(LOCAL_DIR)/treble_arm_bgS.mk \
+ $(LOCAL_DIR)/treble_arm_bgN.mk \
+ $(LOCAL_DIR)/treble_arm64_bfS.mk \
+ $(LOCAL_DIR)/treble_arm64_bfN.mk \
+ $(LOCAL_DIR)/treble_arm_bfS.mk \
+ $(LOCAL_DIR)/treble_arm_bfN.mk \
+ $(LOCAL_DIR)/treble_arm64_boS.mk \
+ $(LOCAL_DIR)/treble_arm64_boN.mk \
+ $(LOCAL_DIR)/treble_arm_boS.mk \
+ $(LOCAL_DIR)/treble_arm_boN.mk \
+
diff --git a/base.mk b/base.mk
index 34c6071..ea3b9ff 100644
--- a/base.mk
+++ b/base.mk
@@ -65,9 +65,15 @@
PRODUCT_PACKAGES += \
bootctl \
- vintf
+ vintf \
+ me.phh.treble.app \
PRODUCT_COPY_FILES += \
device/phh/treble/twrp/twrp.rc:system/etc/init/twrp.rc \
device/phh/treble/twrp/twrp.sh:system/bin/twrp.sh \
device/phh/treble/twrp/busybox-armv7l:system/bin/busybox_phh
+
+PRODUCT_COPY_FILES += \
+ device/phh/treble/device.rc:system/etc/init/device.rc \
+ device/phh/treble/change-device-name.sh:system/bin/change-device-name.sh
+
diff --git a/bliss.mk b/bliss.mk
new file mode 100644
index 0000000..b73802e
--- /dev/null
+++ b/bliss.mk
@@ -0,0 +1,4 @@
+$(call inherit-product, vendor/bliss/config/common_full_phone.mk)
+$(call inherit-product, device/lineage/sepolicy/common/sepolicy.mk)
+-include vendor/bliss/build/core/config.mk
+-include vendor/bliss/build/core/apicheck.mk
diff --git a/board-base.mk b/board-base.mk
index 4274be1..a51943b 100644
--- a/board-base.mk
+++ b/board-base.mk
@@ -1,3 +1,4 @@
TARGET_SYSTEM_PROP := device/phh/treble/system.prop $(TARGET_SYSTEM_PROP)
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR := device/phh/treble/bluetooth
TARGET_EXFAT_DRIVER := exfat
+BLISS_TREBLE_BUILD := true
\ No newline at end of file
diff --git a/change-device-name.sh b/change-device-name.sh
new file mode 100644
index 0000000..9fea294
--- /dev/null
+++ b/change-device-name.sh
@@ -0,0 +1,46 @@
+#!/system/bin/sh
+
+if [ -n "$(grep phh.device.namechanged /system/build.prop)" ]; then
+ exit 0
+fi
+
+if [ ! -f /vendor/build.prop ]; then
+ exit 0
+fi
+
+VENDOR_FINGERPRINT="$(grep ro.vendor.build.fingerprint /vendor/build.prop | cut -d'=' -f 2)"
+echo "Vendor fingerprint: $VENDOR_FINGERPRINT"
+
+modify_on_match() {
+ match_result=`echo $VENDOR_FINGERPRINT | grep $1`
+ brand=$2
+ model=$3
+ name=$4
+ device=$5
+
+ if [ -n "$match_result" ]; then
+ sed -i "s/ro\.product\.brand=.*/ro.product.brand=${brand}/" /system/build.prop
+ sed -i "s/ro\.product\.model=.*/ro.product.model=${model}/" /system/build.prop
+ sed -i "s/ro\.product\.name=.*/ro.product.name=${name}/" /system/build.prop
+ sed -i "s/ro\.product\.device=.*/ro.product.device=${device}/" /system/build.prop
+ sed -i "s/ro\.lineage\.device=.*/ro.lineage.device=${device}/" /system/build.prop
+
+ echo "Device name changed! Match: $2 $3 $4 $5"
+ fi
+}
+
+mount -o remount,rw /system
+
+# Add devices here, e.g.
+# modify_on_match <pattern> <brand> <model> <name> <device>
+
+modify_on_match "Xiaomi/polaris/polaris.*" "Xiaomi" "MIX 2S" "polaris" "polaris"
+modify_on_match "Xiaomi/clover/clover.*" "Xiaomi" "MI PAD 4" "clover" "clover"
+
+# End of devices
+
+if [ -z "$(grep phh.device.namechanged /system/build.prop)" ]; then
+ echo -e "\nphh.device.namechanged=true\n" >> /system/build.prop
+fi
+
+mount -o remount,ro /system
diff --git a/device.rc b/device.rc
new file mode 100644
index 0000000..c429b95
--- /dev/null
+++ b/device.rc
@@ -0,0 +1,2 @@
+on early-fs
+ exec u:r:phhsu_daemon:s0 root -- /system/bin/change-device-name.sh
diff --git a/phh-on-boot.sh b/phh-on-boot.sh
index f279bcb..ec471c4 100644
--- a/phh-on-boot.sh
+++ b/phh-on-boot.sh
@@ -1,5 +1,15 @@
#!/system/bin/sh
+if [ "$(getprop ro.vendor.product.device)" == "HWBKL" ];then
+ phh-su -c 'mount -o remount,rw /system'
+ phh-su -c 'rm -rf /system/priv-app/Camera2'
+ phh-su -c 'mount -o remount,ro /system'
+else
+ phh-su -c 'mount -o remount,rw /system'
+ phh-su -c 'rm -rf /system/priv-app/HwCamera2'
+ phh-su -c 'mount -o remount,ro /system'
+fi
+
if grep -qF android.hardware.boot /vendor/manifest.xml;then
bootctl mark-boot-successful
fi
diff --git a/phhgsi_arm64_a/BoardConfig.mk b/phhgsi_arm64_a/BoardConfig.mk
index 1c16774..e2465d5 100644
--- a/phhgsi_arm64_a/BoardConfig.mk
+++ b/phhgsi_arm64_a/BoardConfig.mk
@@ -1,4 +1,4 @@
include build/make/target/board/generic_arm64_a/BoardConfig.mk
include device/phh/treble/board-base.mk
-BOARD_SYSTEMIMAGE_PARTITION_SIZE := 1610612736
+BOARD_SYSTEMIMAGE_PARTITION_SIZE := 2147483648
diff --git a/treble_arm64_afN.mk b/treble_arm64_afN.mk
new file mode 100644
index 0000000..faccd79
--- /dev/null
+++ b/treble_arm64_afN.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, vendor/foss/foss.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm64_afN
+PRODUCT_DEVICE := phhgsi_arm64_a
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble with FOSS apps
+
+PRODUCT_PACKAGES +=
diff --git a/treble_arm64_afS.mk b/treble_arm64_afS.mk
new file mode 100644
index 0000000..a1cd1c6
--- /dev/null
+++ b/treble_arm64_afS.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, vendor/foss/foss.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm64_afS
+PRODUCT_DEVICE := phhgsi_arm64_a
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble with FOSS apps
+
+PRODUCT_PACKAGES += phh-su
diff --git a/treble_arm64_agN.mk b/treble_arm64_agN.mk
new file mode 100644
index 0000000..8599c81
--- /dev/null
+++ b/treble_arm64_agN.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, device/phh/treble/gapps.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm64_agN
+PRODUCT_DEVICE := phhgsi_arm64_a
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble with GApps
+
+PRODUCT_PACKAGES +=
diff --git a/treble_arm64_agS.mk b/treble_arm64_agS.mk
new file mode 100644
index 0000000..3533854
--- /dev/null
+++ b/treble_arm64_agS.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, device/phh/treble/gapps.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm64_agS
+PRODUCT_DEVICE := phhgsi_arm64_a
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble with GApps
+
+PRODUCT_PACKAGES += phh-su
diff --git a/treble_arm64_aoN.mk b/treble_arm64_aoN.mk
new file mode 100644
index 0000000..47898c1
--- /dev/null
+++ b/treble_arm64_aoN.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, device/phh/treble/gapps-go.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm64_aoN
+PRODUCT_DEVICE := phhgsi_arm64_a
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble Go
+
+PRODUCT_PACKAGES +=
diff --git a/treble_arm64_aoS.mk b/treble_arm64_aoS.mk
new file mode 100644
index 0000000..618dda7
--- /dev/null
+++ b/treble_arm64_aoS.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, device/phh/treble/gapps-go.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm64_aoS
+PRODUCT_DEVICE := phhgsi_arm64_a
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble Go
+
+PRODUCT_PACKAGES += phh-su
diff --git a/treble_arm64_avN.mk b/treble_arm64_avN.mk
new file mode 100644
index 0000000..555ebfa
--- /dev/null
+++ b/treble_arm64_avN.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm64_avN
+PRODUCT_DEVICE := phhgsi_arm64_a
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble vanilla
+
+PRODUCT_PACKAGES +=
diff --git a/treble_arm64_avS.mk b/treble_arm64_avS.mk
new file mode 100644
index 0000000..fa2205a
--- /dev/null
+++ b/treble_arm64_avS.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm64_avS
+PRODUCT_DEVICE := phhgsi_arm64_a
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble vanilla
+
+PRODUCT_PACKAGES += phh-su
diff --git a/treble_arm64_bfN.mk b/treble_arm64_bfN.mk
new file mode 100644
index 0000000..3bf1921
--- /dev/null
+++ b/treble_arm64_bfN.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, vendor/foss/foss.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm64_bfN
+PRODUCT_DEVICE := phhgsi_arm64_ab
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble with FOSS apps
+
+PRODUCT_PACKAGES +=
diff --git a/treble_arm64_bfS.mk b/treble_arm64_bfS.mk
new file mode 100644
index 0000000..9b97fac
--- /dev/null
+++ b/treble_arm64_bfS.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, vendor/foss/foss.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm64_bfS
+PRODUCT_DEVICE := phhgsi_arm64_ab
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble with FOSS apps
+
+PRODUCT_PACKAGES += phh-su
diff --git a/treble_arm64_bgN.mk b/treble_arm64_bgN.mk
new file mode 100644
index 0000000..260f98a
--- /dev/null
+++ b/treble_arm64_bgN.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, device/phh/treble/gapps.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm64_bgN
+PRODUCT_DEVICE := phhgsi_arm64_ab
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble with GApps
+
+PRODUCT_PACKAGES +=
diff --git a/treble_arm64_bgS.mk b/treble_arm64_bgS.mk
new file mode 100644
index 0000000..2a18ae5
--- /dev/null
+++ b/treble_arm64_bgS.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, device/phh/treble/gapps.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm64_bgS
+PRODUCT_DEVICE := phhgsi_arm64_ab
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble with GApps
+
+PRODUCT_PACKAGES += phh-su
diff --git a/treble_arm64_boN.mk b/treble_arm64_boN.mk
new file mode 100644
index 0000000..fc64f52
--- /dev/null
+++ b/treble_arm64_boN.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, device/phh/treble/gapps-go.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm64_boN
+PRODUCT_DEVICE := phhgsi_arm64_ab
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble Go
+
+PRODUCT_PACKAGES +=
diff --git a/treble_arm64_boS.mk b/treble_arm64_boS.mk
new file mode 100644
index 0000000..b95dcad
--- /dev/null
+++ b/treble_arm64_boS.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, device/phh/treble/gapps-go.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm64_boS
+PRODUCT_DEVICE := phhgsi_arm64_ab
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble Go
+
+PRODUCT_PACKAGES += phh-su
diff --git a/treble_arm64_bvN.mk b/treble_arm64_bvN.mk
new file mode 100644
index 0000000..ad65fc9
--- /dev/null
+++ b/treble_arm64_bvN.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm64_bvN
+PRODUCT_DEVICE := phhgsi_arm64_ab
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble vanilla
+
+PRODUCT_PACKAGES +=
diff --git a/treble_arm64_bvS.mk b/treble_arm64_bvS.mk
new file mode 100644
index 0000000..8c6c532
--- /dev/null
+++ b/treble_arm64_bvS.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm64_bvS
+PRODUCT_DEVICE := phhgsi_arm64_ab
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble vanilla
+
+PRODUCT_PACKAGES += phh-su
diff --git a/treble_arm_afN.mk b/treble_arm_afN.mk
new file mode 100644
index 0000000..2e001de
--- /dev/null
+++ b/treble_arm_afN.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk-binder32.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, vendor/foss/foss.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm_afN
+PRODUCT_DEVICE := phhgsi_arm_a
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble with FOSS apps
+
+PRODUCT_PACKAGES +=
diff --git a/treble_arm_afS.mk b/treble_arm_afS.mk
new file mode 100644
index 0000000..b55e4ed
--- /dev/null
+++ b/treble_arm_afS.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk-binder32.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, vendor/foss/foss.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm_afS
+PRODUCT_DEVICE := phhgsi_arm_a
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble with FOSS apps
+
+PRODUCT_PACKAGES += phh-su
diff --git a/treble_arm_agN.mk b/treble_arm_agN.mk
new file mode 100644
index 0000000..28d98f3
--- /dev/null
+++ b/treble_arm_agN.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk-binder32.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, device/phh/treble/gapps.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm_agN
+PRODUCT_DEVICE := phhgsi_arm_a
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble with GApps
+
+PRODUCT_PACKAGES +=
diff --git a/treble_arm_agS.mk b/treble_arm_agS.mk
new file mode 100644
index 0000000..7bdbb5b
--- /dev/null
+++ b/treble_arm_agS.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk-binder32.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, device/phh/treble/gapps.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm_agS
+PRODUCT_DEVICE := phhgsi_arm_a
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble with GApps
+
+PRODUCT_PACKAGES += phh-su
diff --git a/treble_arm_aoN.mk b/treble_arm_aoN.mk
new file mode 100644
index 0000000..9736d6c
--- /dev/null
+++ b/treble_arm_aoN.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk-binder32.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, device/phh/treble/gapps-go.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm_aoN
+PRODUCT_DEVICE := phhgsi_arm_a
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble Go
+
+PRODUCT_PACKAGES +=
diff --git a/treble_arm_aoS.mk b/treble_arm_aoS.mk
new file mode 100644
index 0000000..4195fa2
--- /dev/null
+++ b/treble_arm_aoS.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk-binder32.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, device/phh/treble/gapps-go.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm_aoS
+PRODUCT_DEVICE := phhgsi_arm_a
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble Go
+
+PRODUCT_PACKAGES += phh-su
diff --git a/treble_arm_avN.mk b/treble_arm_avN.mk
new file mode 100644
index 0000000..59c13c3
--- /dev/null
+++ b/treble_arm_avN.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk-binder32.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm_avN
+PRODUCT_DEVICE := phhgsi_arm_a
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble vanilla
+
+PRODUCT_PACKAGES +=
diff --git a/treble_arm_avS.mk b/treble_arm_avS.mk
new file mode 100644
index 0000000..17995ce
--- /dev/null
+++ b/treble_arm_avS.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk-binder32.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm_avS
+PRODUCT_DEVICE := phhgsi_arm_a
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble vanilla
+
+PRODUCT_PACKAGES += phh-su
diff --git a/treble_arm_bfN.mk b/treble_arm_bfN.mk
new file mode 100644
index 0000000..3e62496
--- /dev/null
+++ b/treble_arm_bfN.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk-binder32.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, vendor/foss/foss.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm_bfN
+PRODUCT_DEVICE := phhgsi_arm_ab
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble with FOSS apps
+
+PRODUCT_PACKAGES +=
diff --git a/treble_arm_bfS.mk b/treble_arm_bfS.mk
new file mode 100644
index 0000000..947e190
--- /dev/null
+++ b/treble_arm_bfS.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk-binder32.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, vendor/foss/foss.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm_bfS
+PRODUCT_DEVICE := phhgsi_arm_ab
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble with FOSS apps
+
+PRODUCT_PACKAGES += phh-su
diff --git a/treble_arm_bgN.mk b/treble_arm_bgN.mk
new file mode 100644
index 0000000..6d5e123
--- /dev/null
+++ b/treble_arm_bgN.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk-binder32.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, device/phh/treble/gapps.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm_bgN
+PRODUCT_DEVICE := phhgsi_arm_ab
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble with GApps
+
+PRODUCT_PACKAGES +=
diff --git a/treble_arm_bgS.mk b/treble_arm_bgS.mk
new file mode 100644
index 0000000..f2e5465
--- /dev/null
+++ b/treble_arm_bgS.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk-binder32.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, device/phh/treble/gapps.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm_bgS
+PRODUCT_DEVICE := phhgsi_arm_ab
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble with GApps
+
+PRODUCT_PACKAGES += phh-su
diff --git a/treble_arm_boN.mk b/treble_arm_boN.mk
new file mode 100644
index 0000000..ac78ff6
--- /dev/null
+++ b/treble_arm_boN.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk-binder32.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, device/phh/treble/gapps-go.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm_boN
+PRODUCT_DEVICE := phhgsi_arm_ab
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble Go
+
+PRODUCT_PACKAGES +=
diff --git a/treble_arm_boS.mk b/treble_arm_boS.mk
new file mode 100644
index 0000000..5384e48
--- /dev/null
+++ b/treble_arm_boS.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk-binder32.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+$(call inherit-product, device/phh/treble/gapps-go.mk)
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm_boS
+PRODUCT_DEVICE := phhgsi_arm_ab
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble Go
+
+PRODUCT_PACKAGES += phh-su
diff --git a/treble_arm_bvN.mk b/treble_arm_bvN.mk
new file mode 100644
index 0000000..214399f
--- /dev/null
+++ b/treble_arm_bvN.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk-binder32.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm_bvN
+PRODUCT_DEVICE := phhgsi_arm_ab
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble vanilla
+
+PRODUCT_PACKAGES +=
diff --git a/treble_arm_bvS.mk b/treble_arm_bvS.mk
new file mode 100644
index 0000000..2dcc3d3
--- /dev/null
+++ b/treble_arm_bvS.mk
@@ -0,0 +1,13 @@
+$(call inherit-product, device/phh/treble/base-pre.mk)
+include build/make/target/product/treble_common.mk
+$(call inherit-product, vendor/vndk/vndk-binder32.mk)
+$(call inherit-product, device/phh/treble/base.mk)
+
+$(call inherit-product, device/phh/treble/bliss.mk)
+
+PRODUCT_NAME := treble_arm_bvS
+PRODUCT_DEVICE := phhgsi_arm_ab
+PRODUCT_BRAND := Android
+PRODUCT_MODEL := Phh-Treble vanilla
+
+PRODUCT_PACKAGES += phh-su