commit 02ab355d1c0b9a1565e08f84b134137f9394bfe5
author Daniel Micay <danielmicay@gmail.com> Thu Jun 02 02:05:15 2016 +0000
committer android-build-merger <android-build-merger@google.com> Thu Jun 02 02:05:15 2016 +0000
tree 49a2a0b4bab66a66be5094f8c13778d368d2e8cb
parent df1fff12fe1a844b7ed86b95d478fccb266b1ae6
parent 888a6238810b4c3c00108cb92f9755e74acd9ecf

disable unpriv perf by default in user{,debug} builds
am: 888a623881

* commit '888a6238810b4c3c00108cb92f9755e74acd9ecf':
  disable unpriv perf by default in user{,debug} builds

Change-Id: Ifd28052fe19232461afe26bbde7be42f7f11d9fb

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index f9aad2b..651ba98 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -390,6 +390,7 @@
 ifneq (,$(user_variant))
   # Target is secure in user builds.
   ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=1
+  ADDITIONAL_DEFAULT_PROPERTIES += security.perf_harden=1
 
   ifeq ($(user_variant),user)
     ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=1