commit 5890fe33141a9efd124c86c40a8c1ff6170ecf20
author Nick Kralevich <nnk@google.com> Thu Jan 19 13:11:35 2012 -0800
committer Nick Kralevich <nnk@google.com> Thu Jan 19 15:06:14 2012 -0800
tree 20d4561a00f32e0ab2c29749c8dbbaaaad5bcbfd
parent bd9206bc7399b22d3917c737bb75f8534fa77e35

Don't allow adb to run as root in user builds.

Change-Id: I4fbd7beb7f76c68fead1a89b745f0dfb931b4597

adb/Android.mk

diff --git a/adb/Android.mk b/adb/Android.mk
index 7744d2b..248208a 100644
--- a/adb/Android.mk
+++ b/adb/Android.mk
@@ -133,6 +133,10 @@
 LOCAL_CFLAGS += -DANDROID_GADGET=1
 endif
 
+ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
+LOCAL_CFLAGS += -DALLOW_ADBD_ROOT=1
+endif
+
 LOCAL_MODULE := adbd
 
 LOCAL_FORCE_STATIC_EXECUTABLE := true

adb/adb.c

diff --git a/adb/adb.c b/adb/adb.c
index ff9e92d..4434524 100644
--- a/adb/adb.c
+++ b/adb/adb.c
@@ -844,6 +844,9 @@
 
 #if !ADB_HOST
 static int should_drop_privileges() {
+#ifndef ALLOW_ADBD_ROOT
+    return 1;
+#else /* ALLOW_ADBD_ROOT */
     int secure = 0;
     char value[PROPERTY_VALUE_MAX];
 
@@ -869,6 +872,7 @@
         }
     }
     return secure;
+#endif /* ALLOW_ADBD_ROOT */
 }
 #endif /* !ADB_HOST */