Merge "set ro.adb.secure=1 for user builds"
am: f9911ae087
* commit 'f9911ae087189c26e0ef8a2334233116a8944aa7':
set ro.adb.secure=1 for user builds
This commit is contained in:
@@ -270,6 +270,7 @@ for these).
|
|||||||
<li>Installs non-APK modules that have no tags specified.
|
<li>Installs non-APK modules that have no tags specified.
|
||||||
<li>Installs APKs according to the product definition files; tags
|
<li>Installs APKs according to the product definition files; tags
|
||||||
are ignored for APK modules.
|
are ignored for APK modules.
|
||||||
|
<li><code>ro.adb.secure=1</code>
|
||||||
<li><code>ro.secure=1</code>
|
<li><code>ro.secure=1</code>
|
||||||
<li><code>ro.debuggable=0</code>
|
<li><code>ro.debuggable=0</code>
|
||||||
<li><code>adb</code> is disabled by default.
|
<li><code>adb</code> is disabled by default.
|
||||||
|
@@ -365,6 +365,10 @@ 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
|
||||||
|
|
||||||
|
ifeq ($(user_variant),user)
|
||||||
|
ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=1
|
||||||
|
endif
|
||||||
|
|
||||||
ifeq ($(user_variant),userdebug)
|
ifeq ($(user_variant),userdebug)
|
||||||
# Pick up some extra useful tools
|
# Pick up some extra useful tools
|
||||||
tags_to_install += debug
|
tags_to_install += debug
|
||||||
|
Reference in New Issue
Block a user