Remove HAVE_BCC_CONFIG_MK_H.
Change-Id: I21334ea5279e814f427e39c75f0c89297e026ca5
diff --git a/include/bcc/Config/Config.h b/include/bcc/Config/Config.h
index 42799a8..e13f504 100644
--- a/include/bcc/Config/Config.h
+++ b/include/bcc/Config/Config.h
@@ -1,9 +1,7 @@
#ifndef BCC_CONFIG_CONFIG_H
#define BCC_CONFIG_CONFIG_H
-#ifdef HAVE_BCC_CONFIG_MK_H
#include "ConfigFromMk.h"
-#endif
//---------------------------------------------------------------------------
// Configuration for Disassembler
diff --git a/libbcc-gen-build-info.mk b/libbcc-gen-build-info.mk
index 679a3e0..7112a1a 100644
--- a/libbcc-gen-build-info.mk
+++ b/libbcc-gen-build-info.mk
@@ -55,7 +55,3 @@
$(transform-generated-source)
LOCAL_GENERATED_SOURCES += $(GEN)
-
-LOCAL_CFLAGS := \
- -DHAVE_BCC_CONFIG_MK_H \
- $(LOCAL_CFLAGS)
diff --git a/libbcc-gen-config-from-mk.mk b/libbcc-gen-config-from-mk.mk
index 30bfd58..f8baa63 100644
--- a/libbcc-gen-config-from-mk.mk
+++ b/libbcc-gen-config-from-mk.mk
@@ -14,17 +14,16 @@
# limitations under the License.
#
+# Build rules for extracting configuration from Android.mk
+intermediates := $(call local-intermediates-dir)
-# Build Rules for Extracting Configuration from Android.mk
-intermediates := $(local-intermediates-dir)
+GEN_CONFIG_FROM_MK := $(intermediates)/ConfigFromMk.h
-GEN := $(intermediates)/ConfigFromMk.h
-
-$(GEN): PRIVATE_PATH := $(LIBBCC_ROOT_PATH)
-$(GEN): PRIVATE_CUSTOM_TOOL = \
+$(GEN_CONFIG_FROM_MK): PRIVATE_PATH := $(LIBBCC_ROOT_PATH)
+$(GEN_CONFIG_FROM_MK): PRIVATE_CUSTOM_TOOL = \
$(PRIVATE_PATH)/tools/build/gen-config-from-mk.py < $< > $@
-$(GEN): $(LIBBCC_ROOT_PATH)/libbcc-config.mk \
+$(GEN_CONFIG_FROM_MK): $(LIBBCC_ROOT_PATH)/libbcc-config.mk \
$(LIBBCC_ROOT_PATH)/tools/build/gen-config-from-mk.py
$(transform-generated-source)
-LOCAL_GENERATED_SOURCES += $(GEN)
+LOCAL_GENERATED_SOURCES += $(GEN_CONFIG_FROM_MK)