diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-13 02:00:48 +0100 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2016-12-13 02:00:48 +0100 |
| commit | f0e2077caea3afc6456b046c66989b780f8c1111 (patch) | |
| tree | 5410cd542c0f842a3536d74a8a7a5f985808fc18 /core/main.mk | |
| parent | 6662a629cef6f9bcf7edf0885080e3857b8b49b5 (diff) | |
| parent | ea2aaaeee4322b13eb1fd48342fc8f4a8109a83f (diff) | |
| download | build-f0e2077caea3afc6456b046c66989b780f8c1111.zip build-f0e2077caea3afc6456b046c66989b780f8c1111.tar.gz build-f0e2077caea3afc6456b046c66989b780f8c1111.tar.bz2 | |
Merge branch 'cm-13.0' of https://github.com/CyanogenMod/android_build into replicant-6.0
Diffstat (limited to 'core/main.mk')
| -rw-r--r-- | core/main.mk | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/core/main.mk b/core/main.mk index e6794a0..139fa46 100644 --- a/core/main.mk +++ b/core/main.mk @@ -98,6 +98,9 @@ include $(BUILD_SYSTEM)/config.mk # CTS-specific config. -include cts/build/config.mk +# CMTS-specific config. +-include vendor/cmts/build/config.mk + # This allows us to force a clean build - included after the config.mk # environment setup is done, but before we generate any dependencies. This # file does the rm -rf inline so the deps which are all done below will @@ -284,6 +287,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 |