commit f9911ae087189c26e0ef8a2334233116a8944aa7
author Nick Kralevich <nnk@google.com> Wed Dec 23 20:22:30 2015 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Dec 23 20:22:30 2015 +0000
tree fa94d4dbb1f47dcd9da7a6e384c4aa9edb83ddbd
parent 9d4dbe09edcaeccd461138b5aefceb76759f5fd9
parent 18a141cc8c06a30266adeb4c33c99b8c0b348a8e

Merge "set ro.adb.secure=1 for user builds"

core/build-system.html

diff --git a/core/build-system.html b/core/build-system.html
index 3f638c3..bddde6a 100644
--- a/core/build-system.html
+++ b/core/build-system.html
@@ -270,6 +270,7 @@
         <li>Installs non-APK modules that have no tags specified.
         <li>Installs APKs according to the product definition files; tags
             are ignored for APK modules.
+        <li><code>ro.adb.secure=1</code>
         <li><code>ro.secure=1</code>
         <li><code>ro.debuggable=0</code>
         <li><code>adb</code> is disabled by default.

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 2ca52c7..d2f8414 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -365,6 +365,10 @@
   # Target is secure in user builds.
   ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=1
 
+  ifeq ($(user_variant),user)
+    ADDITIONAL_DEFAULT_PROPERTIES += ro.adb.secure=1
+  endif
+
   ifeq ($(user_variant),userdebug)
     # Pick up some extra useful tools
     tags_to_install += debug