am d8f7c9b8: Merge change 5545 into donut

Merge commit 'd8f7c9b85e25fab93fef2221a84b60edc2e7b837'

* commit 'd8f7c9b85e25fab93fef2221a84b60edc2e7b837':
  remove updater from the user system image
diff --git a/updater/Android.mk b/updater/Android.mk
index 71a9a23..d4a4e33 100644
--- a/updater/Android.mk
+++ b/updater/Android.mk
@@ -7,10 +7,15 @@
 	updater.c
 
 #
-# Build the device-side library
+# Build a statically-linked binary to include in OTA packages
 #
 include $(CLEAR_VARS)
 
+# Build only in eng, so we don't end up with a copy of this in /system
+# on user builds.  (TODO: find a better way to build device binaries
+# needed only for OTA packages.)
+LOCAL_MODULE_TAGS := eng
+
 LOCAL_SRC_FILES := $(updater_src_files)
 
 LOCAL_STATIC_LIBRARIES := $(TARGET_RECOVERY_UPDATER_LIBS) $(TARGET_RECOVERY_UPDATER_EXTRA_LIBS)