diff options
| author | Daniel Micay <danielmicay@gmail.com> | 2015-12-16 16:42:49 -0500 |
|---|---|---|
| committer | Andreas Blaesius <andi@unlegacy-android.org> | 2018-06-10 22:57:04 +0200 |
| commit | 243592e4e6518794d3c8a20077b9271f7a1bae8b (patch) | |
| tree | befd29b360e962b8ecb6bdbdc59f67d499b848dc | |
| parent | 18c6ad750535d7ad1a8a426e454dda614f53dd1a (diff) | |
| download | build-243592e4e6518794d3c8a20077b9271f7a1bae8b.tar.gz build-243592e4e6518794d3c8a20077b9271f7a1bae8b.tar.bz2 build-243592e4e6518794d3c8a20077b9271f7a1bae8b.zip | |
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 caade583b..04fdb9d5d 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 b82cd6a48..e2a1e3429 100644 --- a/core/main.mk +++ b/core/main.mk @@ -281,6 +281,10 @@ ifneq (,$(user_variant)) ADDITIONAL_DEFAULT_PROPERTIES += ro.secure=1 ADDITIONAL_DEFAULT_PROPERTIES += security.perf_harden=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 |