commit 01e92039e3335db66b55564650f50f48cf982706
author Daniel Micay <danielmicay@gmail.com> Tue May 17 00:40:52 2016 -0400
committer The Android Automerger <android-build@google.com> Thu Jun 23 15:05:04 2016 -0700
tree 38d2744ea9849307c0450ccb12e426ffb4d298d6
parent 4aaba6d467ba94de1a6c518711a2f92d3d71f3b0

disable unpriv perf by default in user{,debug} builds

(Cherry picked from commit f2ac912b19ccbcc15d5176ec52c99744810adce7)

Bug: 29054680

Change-Id: If04bc63fc366006cde842a50b7c764f89d7449a6

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 5b6e1e9..a6f829a 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -316,6 +316,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),userdebug)
     # Pick up some extra useful tools