From 8d14003e60926139d5963ca904f5d9dd824680fa Mon Sep 17 00:00:00 2001
From: Mark Salyzyn <salyzyn@google.com>
Date: Tue, 16 Jan 2018 09:31:04 -0800
Subject: [PATCH] STOPSHIP: move sys.vdso reflector to allow "user" builds

Modification of 96c77a718c48399b5bf9ac81922249381db5ba7f to
remove restriction to userdebug and eng builds.  Rationalization
is the experiment will continue during public beta releases.

Test: manual, bionic-benchmarks --bionic_xml=vdso.xml
Bug: 70518189
Change-Id: I57e5cdc21569dd32377256d3962e1dc03385f7cb
---
 init.common.diag.rc.userdebug | 15 ---------------
 init.common.rc                | 15 +++++++++++++++
 sepolicy/init.te              |  2 --
 3 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/init.common.diag.rc.userdebug b/init.common.diag.rc.userdebug
index f1ecaf1dc..e28af9b7a 100644
--- a/init.common.diag.rc.userdebug
+++ b/init.common.diag.rc.userdebug
@@ -136,18 +136,3 @@ on property:sys.logger.bluetooth=true
 on property:sys.logger.bluetooth=false
    setprop persist.service.bdroid.snooplog false
    setprop persist.service.bdroid.fwsnoop false
-
-# b/70518189 vDSO experiments
-on property:sys.vdso=*
-   write /sys/module/vdso/parameters/enable_32 1
-   write /sys/module/vdso/parameters/enable_64 1
-
-on property:sys.vdso=false
-   write /sys/module/vdso/parameters/enable_32 0
-   write /sys/module/vdso/parameters/enable_64 0
-
-on property:sys.vdso=64
-   write /sys/module/vdso/parameters/enable_32 0
-
-on property:sys.vdso=32
-   write /sys/module/vdso/parameters/enable_64 0
diff --git a/init.common.rc b/init.common.rc
index f885a8bfa..c973efd19 100644
--- a/init.common.rc
+++ b/init.common.rc
@@ -865,3 +865,18 @@ service vendor.mid_sh /vendor/bin/init.mid.sh
 on property:init.svc.zygote=restarting && property:sys.qcom.thermalcfg=/vendor/etc/thermal-engine-vr.conf
    setprop sys.qcom.thermalcfg "/vendor/etc/thermal-engine.conf"
    restart vendor.thermal-engine
+
+# b/70518189 vDSO experiments
+on property:sys.vdso=*
+   write /sys/module/vdso/parameters/enable_32 1
+   write /sys/module/vdso/parameters/enable_64 1
+
+on property:sys.vdso=false
+   write /sys/module/vdso/parameters/enable_32 0
+   write /sys/module/vdso/parameters/enable_64 0
+
+on property:sys.vdso=64
+   write /sys/module/vdso/parameters/enable_32 0
+
+on property:sys.vdso=32
+   write /sys/module/vdso/parameters/enable_64 0
diff --git a/sepolicy/init.te b/sepolicy/init.te
index 5587b7d4a..6399c2265 100644
--- a/sepolicy/init.te
+++ b/sepolicy/init.te
@@ -14,6 +14,4 @@ allow init userdata_block_device:blk_file { write };
 allow init persist_block_device:lnk_file relabelto;
 
 # b/70518189 vDSO experiments
-userdebug_or_eng(`
 allow init sysfs_vdso:file w_file_perms;
-')