diff options
| author | Elliott Hughes <enh@google.com> | 2015-06-17 15:23:42 -0700 |
|---|---|---|
| committer | Elliott Hughes <enh@google.com> | 2015-06-19 13:26:02 -0700 |
| commit | 1cddc2092f544c5eac339e59746436facfdd5dc7 (patch) | |
| tree | 2980a377d028230c412251e516c88751ece12382 /adb/Android.mk | |
| parent | 6ee7ff426893d8b8ebbb63e02073b9780912bd17 (diff) | |
| download | system_core-1cddc2092f544c5eac339e59746436facfdd5dc7.zip system_core-1cddc2092f544c5eac339e59746436facfdd5dc7.tar.gz system_core-1cddc2092f544c5eac339e59746436facfdd5dc7.tar.bz2 | |
Ignore ro.adb.secure in user builds.
Require authorization by default, and remove the ability to override
that in user builds. (userdebug and eng are still free to do whatever
they want.)
Bug: http://b/21862859
Change-Id: Ibf8af375be5bf1141c1ad481eee7a59fb10a7adb
(cherry picked from commit 5cba504215ea91187cc36ec7aec5dce1b0f4b0fe)
Diffstat (limited to 'adb/Android.mk')
| -rw-r--r-- | adb/Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/adb/Android.mk b/adb/Android.mk index 1613a88..425bf9b 100644 --- a/adb/Android.mk +++ b/adb/Android.mk @@ -232,12 +232,11 @@ LOCAL_CFLAGS := \ -D_GNU_SOURCE \ -Wno-deprecated-declarations \ -ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) -LOCAL_CFLAGS += -DALLOW_ADBD_ROOT=1 -endif +LOCAL_CFLAGS += -DALLOW_ADBD_NO_AUTH=$(if $(filter userdebug eng,$(TARGET_BUILD_VARIANT)),1,0) ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT))) LOCAL_CFLAGS += -DALLOW_ADBD_DISABLE_VERITY=1 +LOCAL_CFLAGS += -DALLOW_ADBD_ROOT=1 endif LOCAL_MODULE := adbd |