Merge commit 'b3d2494' into master_merge
diff --git a/libbt-vendor/gen-buildcfg.sh b/libbt-vendor/gen-buildcfg.sh
new file mode 100755
index 0000000..40c01f4
--- /dev/null
+++ b/libbt-vendor/gen-buildcfg.sh
@@ -0,0 +1,25 @@
+#!/usr/bin/env bash
+
+if [[ "" == "$2" ]]
+then
+ echo "Usage: $0 <in-file> <out-file>"
+ exit 1
+fi
+
+if [ ! -f "$1" ]
+then
+ echo "Error: Can't find input file $1..."
+ exit 2
+fi
+
+DATE=`/usr/bin/env date`
+BASE=`basename $2`
+BASE=`echo ${BASE} | tr "[:lower:]" "[:upper:]"`
+BASE=`echo ${BASE} | sed -e "s/\\./_/"`
+PROTECT="_${BASE}"
+
+echo "/* Auto-generated from $1 on ${DATE} */" > $2
+echo "#ifndef ${PROTECT}" >> $2
+echo "#define ${PROTECT}" >> $2
+sed -e '/^#/d' -e '/^$$/d' -e '/# Makefile only$$/d' -e 's/^/#define /' -e 's/=/ /' $1 >> $2
+echo "#endif" >> $2
diff --git a/msm8992/libbt-vendor/vnd_buildcfg.mk b/msm8992/libbt-vendor/vnd_buildcfg.mk
index d18e121..626a5f9 100644
--- a/msm8992/libbt-vendor/vnd_buildcfg.mk
+++ b/msm8992/libbt-vendor/vnd_buildcfg.mk
@@ -22,7 +22,7 @@
SRC := $(call my-dir)/include/vnd_generic.txt
endif
GEN := $(intermediates)/vnd_buildcfg.h
-TOOL := $(TOP_DIR)external/bluetooth/bluedroid/tools/gen-buildcfg.sh
+TOOL := $(LOCAL_PATH)/gen-buildcfg.sh
$(GEN): PRIVATE_PATH := $(call my-dir)
$(GEN): PRIVATE_CUSTOM_TOOL = $(TOOL) $< $@
