summaryrefslogtreecommitdiffstats
path: root/core/main.mk
diff options
context:
space:
mode:
authorJessica Wagantall <jwagantall@cyngn.com>2016-08-02 11:02:10 -0700
committerJessica Wagantall <jwagantall@cyngn.com>2016-08-02 11:37:36 -0700
commitd5a160ce176b964f88a3f9921100b9bfb41c92d3 (patch)
tree2638e0a532b93e5ece2ca08edec87c34ad4e3540 /core/main.mk
parent06e04529841134d3cfe2287553bf73b0ebca9f17 (diff)
parent5d5a58e58f603605d869afd24339641b91c1019e (diff)
downloadbuild-d5a160ce176b964f88a3f9921100b9bfb41c92d3.zip
build-d5a160ce176b964f88a3f9921100b9bfb41c92d3.tar.gz
build-d5a160ce176b964f88a3f9921100b9bfb41c92d3.tar.bz2
Merge tag 'android-6.0.1_r61' into HEAD
Android 6.0.1 Release 61 (MOB30Z) Change-Id: Ie36ef38fa4add95de1053c7fa5dd94bed9f94607
Diffstat (limited to 'core/main.mk')
-rw-r--r--core/main.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/main.mk b/core/main.mk
index 4894fc2..04be6e6 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -326,6 +326,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