diff options
| author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:02:10 -0700 |
|---|---|---|
| committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-08-02 11:37:36 -0700 |
| commit | d5a160ce176b964f88a3f9921100b9bfb41c92d3 (patch) | |
| tree | 2638e0a532b93e5ece2ca08edec87c34ad4e3540 | |
| parent | 06e04529841134d3cfe2287553bf73b0ebca9f17 (diff) | |
| parent | 5d5a58e58f603605d869afd24339641b91c1019e (diff) | |
| download | build-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
| -rw-r--r-- | core/build_id.mk | 2 | ||||
| -rw-r--r-- | core/main.mk | 1 | ||||
| -rw-r--r-- | core/version_defaults.mk | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index 07d978b..811f270 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -export BUILD_ID=MOB30R +export BUILD_ID=MOB30Z 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 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index cb8ba51..d90f3dc 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -103,7 +103,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)" # Can be an arbitrary string, but must be a single word. # # If there is no $PLATFORM_SECURITY_PATCH set, keep it empty. - PLATFORM_SECURITY_PATCH := 2016-07-05 + PLATFORM_SECURITY_PATCH := 2016-08-05 endif ifeq "" "$(PLATFORM_BASE_OS)" |