commit 140326584f6ec32a744d1dbc7779d87ca2c0816a
author Stephen Hines <srhines@google.com> Thu Aug 23 14:16:27 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 23 14:16:27 2012 -0700
tree 382798a81d542c1950e901b6b77c45c17b676498
parent 5633c1a476fbf6670e8347ce44cfba3d42b89bc4
parent 38c94b68c77c9b91ce191d5ccfb718d9d8613eda

am 38c94b68: am d906a2af: (-s ours) am 28464c41: Merge "Fix class redeclared as struct."

* commit '38c94b68c77c9b91ce191d5ccfb718d9d8613eda':
  Fix class redeclared as struct.

tools/bcc/Android.mk

diff --git a/tools/bcc/Android.mk b/tools/bcc/Android.mk
index 6f95eec..0799c61 100644
--- a/tools/bcc/Android.mk
+++ b/tools/bcc/Android.mk
@@ -45,7 +45,6 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := bcc
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := EXECUTABLES
 
 LOCAL_SRC_FILES := Main.cpp

tools/mcld/Android.mk

diff --git a/tools/mcld/Android.mk b/tools/mcld/Android.mk
index b8213d0..3e53c42 100644
--- a/tools/mcld/Android.mk
+++ b/tools/mcld/Android.mk
@@ -21,7 +21,6 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := mcld
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := EXECUTABLES
 
 LOCAL_SRC_FILES := Main.cpp
@@ -40,7 +39,6 @@
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := mcld
-LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := EXECUTABLES
 
 LOCAL_SRC_FILES := Main.cpp