Merge \"disable unpriv perf by default in user{,debug} builds\" into mnc-dev

am: 11c84f95fb Change-Id: Ic82b49068c2d6c834bafb01ea3f698bb9e84d1ac
2016-06-23 21:04:53 +00:00
parent 3749025ccb 11c84f95fb
commit a0c61fc832
1 changed files with 1 additions and 0 deletions
--- a/core/main.mk
+++ b/core/main.mk
@@ -316,6 +316,7 @@ tags_to_install :=
 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