From fc951ff2687e859a36f95cd443b1f5ed7436eecf Mon Sep 17 00:00:00 2001
From: Justin Yun <justinyun@google.com>
Date: Tue, 19 Dec 2017 18:39:10 +0900
Subject: [PATCH] Do not enforce VNDK on GSI if VNDK version is not set

If ro.vndk.version is not defined, use the namespace configuration
file that does not enforce VNDK restriction.
This is only for GSI.

Bug: 70704112
Test: Flash sailfish with PI and test with PI GSI image
Change-Id: Ic2b41357905ef47a3483b2eff635e8ae239e28aa
---
 target/product/treble_common.mk       | 6 ++++++
 target/product/vndk/init.gsi.rc       | 2 ++
 target/product/vndk/init.noenforce.rc | 3 +++
 3 files changed, 11 insertions(+)
 create mode 100644 target/product/vndk/init.gsi.rc
 create mode 100644 target/product/vndk/init.noenforce.rc

diff --git a/target/product/treble_common.mk b/target/product/treble_common.mk
index 237718882..7ff5acb3a 100644
--- a/target/product/treble_common.mk
+++ b/target/product/treble_common.mk
@@ -81,3 +81,9 @@ ifeq ($(BOARD_AVB_ENABLE),true)
 $(error BOARD_AVB_ENABLE cannot be set for Treble GSI)
 endif
 BOARD_BUILD_DISABLED_VBMETAIMAGE := true
+
+#GSI support for the devices that disable VNDK enforcing
+PRODUCT_COPY_FILES += \
+    system/core/rootdir/etc/ld.config.txt:system/etc/ld.config.noenforce.txt \
+    build/make/target/product/vndk/init.gsi.rc:system/etc/init/init.gsi.rc \
+    build/make/target/product/vndk/init.noenforce.rc:system/etc/init/gsi/init.noenforce.rc
diff --git a/target/product/vndk/init.gsi.rc b/target/product/vndk/init.gsi.rc
new file mode 100644
index 000000000..3e6b1fb2a
--- /dev/null
+++ b/target/product/vndk/init.gsi.rc
@@ -0,0 +1,2 @@
+# If ro.vndk.version is not defined, import init.noenforce.rc
+import /system/etc/init/gsi/init.${ro.vndk.version:-noenforce}.rc
diff --git a/target/product/vndk/init.noenforce.rc b/target/product/vndk/init.noenforce.rc
new file mode 100644
index 000000000..9371cc875
--- /dev/null
+++ b/target/product/vndk/init.noenforce.rc
@@ -0,0 +1,3 @@
+on early-init
+    # If ro.vndk.version is not set, use ld.config.nonenforce.txt
+    export LD_CONFIG_FILE /system/etc/ld.config.noenforce.txt