Merge "disable unpriv perf by default in user{,debug} builds" am: 4bc8280a98

am: 13f2b4cf2f

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

Change-Id: Id14069a95cba23aff3540b3a43998cedd52b6ac7
This commit is contained in:
Jeffrey Vander Stoep
2016-06-01 23:53:42 +00:00
committed by android-build-merger

View File

@@ -386,6 +386,7 @@ tags_to_install :=
ifneq (,$(user_variant)) ifneq (,$(user_variant))
# Target is secure in user builds. # Target is secure in user builds.
ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=1 ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=1
ADDITIONAL_DEFAULT_PROPERTIES += security.perf_harden=1
ifeq ($(user_variant),user) ifeq ($(user_variant),user)
ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=1 ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=1