diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2015-12-16 16:42:49 -0500 |
|---|---|---|
| committer | Nick Kralevich <nnk@google.com> | 2015-12-23 20:18:15 +0000 |
| commit | 18a141cc8c06a30266adeb4c33c99b8c0b348a8e (patch) | |
| tree | 0b357d001f68fa37e2e12167c247fbed08f4f0d6 | |
| parent | d49e55561aa139af1b7c5a2f448ab5c7d93272d6 (diff) | |
| download | build-18a141cc8c06a30266adeb4c33c99b8c0b348a8e.tar.gz | |
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
| -rw-r--r-- | core/build-system.html | 1 | ||||
| -rw-r--r-- | core/main.mk | 4 |
2 files changed, 5 insertions, 0 deletions
diff --git a/core/build-system.html b/core/build-system.html index 3f638c3b07..bddde6a4de 100644 --- a/core/build-system.html +++ b/core/build-system.html @@ -270,6 +270,7 @@ for these). <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. diff --git a/core/main.mk b/core/main.mk index c29731c57a..cfc39bbedb 100644 --- a/core/main.mk +++ b/core/main.mk @@ -360,6 +360,10 @@ ifneq (,$(user_variant)) # 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 |