commit 18a141cc8c06a30266adeb4c33c99b8c0b348a8e
author Daniel Micay <danielmicay@gmail.com> Wed Dec 16 16:42:49 2015 -0500
committer Nick Kralevich <nnk@google.com> Wed Dec 23 20:18:15 2015 +0000
tree 0b357d001f68fa37e2e12167c247fbed08f4f0d6
parent d49e55561aa139af1b7c5a2f448ab5c7d93272d6

set ro.adb.secure=1 for user builds

In user builds, adb without authentication is always disabled. However,
it doesn't work with the defaults because authentication doesn't work
without having ro.adb.secure=1 set. It makes sense to offer builds with
no adb but not builds with adb present in an unusable state (especially
as the default).

Bug: 22220212
Bug: 21862859
Change-Id: Ic22300a70586fd57692ac59d6873ab16dde70919

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index c29731c..cfc39bb 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -360,6 +360,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