commit edea9e38e78ea487814058ec760850df8e1a548c
author Stephen Hines <srhines@google.com> Thu May 03 19:22:45 2012 -0700
committer Android Git Automerger <android-git-automerger@android.com> Thu May 03 19:22:45 2012 -0700
tree b816f46b5be0a1ed94a76abb1fdb27e45fa29ca9
parent 1c65eba0d75441a611c027a26a1dfd47120d88c4
parent d6917e1d149f189125eb555e25c056886e548c75

am d6917e1d: Revert "Define HAVE_BCC_CONFIG_MK_H for ConfigFromMk.h."

* commit 'd6917e1d149f189125eb555e25c056886e548c75':
  Revert "Define HAVE_BCC_CONFIG_MK_H for ConfigFromMk.h."

Config.h

diff --git a/Config.h b/Config.h
index c1f4133..b1ea833 100644
--- a/Config.h
+++ b/Config.h
@@ -1,9 +1,7 @@
 #ifndef BCC_CONFIG_H
 #define BCC_CONFIG_H
 
-#ifdef HAVE_BCC_CONFIG_MK_H
 #include "ConfigFromMk.h"
-#endif
 
 //---------------------------------------------------------------------------
 // Configuration for Disassembler

libbcc-gen-build-stamp.mk

diff --git a/libbcc-gen-build-stamp.mk b/libbcc-gen-build-stamp.mk
index a2d8374..22fe81d 100644
--- a/libbcc-gen-build-stamp.mk
+++ b/libbcc-gen-build-stamp.mk
@@ -55,7 +55,3 @@
 	$(transform-generated-source)
 
 LOCAL_GENERATED_SOURCES += $(GEN)
-
-LOCAL_CFLAGS := \
-  -DHAVE_BCC_CONFIG_MK_H \
-  $(LOCAL_CFLAGS)