commit 306e1f5ed0f276249a5e936a96e98c1306426353
author Stephen Hines <srhines@google.com> Wed Sep 05 22:33:34 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 05 22:33:34 2012 -0700
tree 632f70c6e5550030f044a3f13a8e9eceed39e88c
parent 37f6bbeed27189e2cf5fac72c46871aa174a8fb4
parent a565633ff50bdbb355bf3c1a9fed72a39d4514f7

am a565633f: Merge "Fix up libbcc for LLVM upstream merge to r162314." into jb-mr1-dev

* commit 'a565633ff50bdbb355bf3c1a9fed72a39d4514f7':
  Fix up libbcc for LLVM upstream merge to r162314.

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