From 4ae39bd3670462e703a1f614cc0ddd468511be6a Mon Sep 17 00:00:00 2001
From: Pierre-Hugues Husson <phh@phh.me>
Date: Thu, 26 Sep 2019 22:24:54 +0200
Subject: [PATCH] Don't include sas stuff on non-sas target

---
 base-sas.mk | 13 +++++++++++++
 base.mk     | 13 -------------
 generate.sh |  4 ++++
 3 files changed, 17 insertions(+), 13 deletions(-)
 create mode 100644 base-sas.mk

diff --git a/base-sas.mk b/base-sas.mk
new file mode 100644
index 0000000..3b4c071
--- /dev/null
+++ b/base-sas.mk
@@ -0,0 +1,13 @@
+PRODUCT_COPY_FILES += \
+	device/phh/treble/apex-setup.rc:system/etc/init/apex-setup.rc \
+
+PRODUCT_COPY_FILES += \
+	system/core/rootdir/init.zygote32.rc:system/etc/init/zygote/init.zygote32.rc \
+	system/core/rootdir/init.zygote32_64.rc:system/etc/init/zygote/init.zygote32_64.rc \
+	system/core/rootdir/init.zygote64_32.rc:system/etc/init/zygote/init.zygote64_32.rc \
+	system/core/rootdir/init.zygote64.rc:system/etc/init/zygote/init.zygote64.rc \
+
+PRODUCT_COPY_FILES += \
+	frameworks/av/apex/mediaswcodec.rc:system/etc/init/mediaswcodec-treble.rc \
+	device/phh/treble/environ/init.treble-environ.rc:system/etc/init/init.treble-environ.rc \
+
diff --git a/base.mk b/base.mk
index c091a64..f1bf899 100644
--- a/base.mk
+++ b/base.mk
@@ -140,19 +140,6 @@ PRODUCT_COPY_FILES += \
 PRODUCT_COPY_FILES += \
 	frameworks/native/data/etc/android.software.secure_lock_screen.xml:system/etc/permissions/android.software.secure_lock_screen.xml \
 
-PRODUCT_COPY_FILES += \
-	device/phh/treble/apex-setup.rc:system/etc/init/apex-setup.rc \
-
 PRODUCT_COPY_FILES += \
         device/phh/treble/ld.config.26.txt:system/etc/ld.config.26.txt \
 
-PRODUCT_COPY_FILES += \
-	system/core/rootdir/init.zygote32.rc:system/etc/init/zygote/init.zygote32.rc \
-	system/core/rootdir/init.zygote32_64.rc:system/etc/init/zygote/init.zygote32_64.rc \
-	system/core/rootdir/init.zygote64_32.rc:system/etc/init/zygote/init.zygote64_32.rc \
-	system/core/rootdir/init.zygote64.rc:system/etc/init/zygote/init.zygote64.rc \
-
-PRODUCT_COPY_FILES += \
-	frameworks/av/apex/mediaswcodec.rc:system/etc/init/mediaswcodec-treble.rc \
-	device/phh/treble/environ/init.treble-environ.rc:system/etc/init/init.treble-environ.rc \
-
diff --git a/generate.sh b/generate.sh
index 90ec60b..271915c 100644
--- a/generate.sh
+++ b/generate.sh
@@ -23,6 +23,7 @@ for part in a ab;do
 				apps_name=""
 				extra_packages=""
                 vndk="vndk.mk"
+		optional_base=""
 				if [ "$apps" == "gapps" ];then
 					apps_suffix="g"
 					apps_script='$(call inherit-product, device/phh/treble/gapps.mk)'
@@ -59,6 +60,8 @@ for part in a ab;do
 				part_suffix='a'
 				if [ "$part" == 'ab' ];then
 					part_suffix='b'
+				else
+					optional_base='$(call inherit-product, device/phh/treble/base-sas.mk)'
 				fi
 
 				target="treble_${arch}_${part_suffix}${apps_suffix}${su_suffix}"
@@ -78,6 +81,7 @@ for part in a ab;do
 include build/make/target/product/aosp_${baseArch}_ab.mk
 \$(call inherit-product, vendor/vndk/${vndk})
 \$(call inherit-product, device/phh/treble/base.mk)
+$optional_base
 $apps_script
 $rom_script