summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libbt-vendor/Android.mk2
-rw-r--r--libbt-vendor/vnd_buildcfg.mk6
2 files changed, 6 insertions, 2 deletions
diff --git a/libbt-vendor/Android.mk b/libbt-vendor/Android.mk
index da74614..6e88c02 100644
--- a/libbt-vendor/Android.mk
+++ b/libbt-vendor/Android.mk
@@ -89,7 +89,7 @@ LOCAL_CFLAGS += -DENABLE_ANT
endif
#LOCAL_CFLAGS += -DREAD_BT_ADDR_FROM_PROP
-#include $(LOCAL_PATH)/vnd_buildcfg.mk
+include $(LOCAL_PATH)/vnd_buildcfg.mk
include $(BUILD_SHARED_LIBRARY)
diff --git a/libbt-vendor/vnd_buildcfg.mk b/libbt-vendor/vnd_buildcfg.mk
index d18e121..9b161d2 100644
--- a/libbt-vendor/vnd_buildcfg.mk
+++ b/libbt-vendor/vnd_buildcfg.mk
@@ -14,7 +14,11 @@
# limitations under the License.
#
+ifneq ($(TARGET_2ND_ARCH),)
+intermediates := $(call local-intermediates-dir,,$(TARGET_2ND_ARCH_VAR_PREFIX))
+else
intermediates := $(local-intermediates-dir)
+endif
SRC := $(call my-dir)/include/$(addprefix vnd_, $(addsuffix .txt,$(basename $(TARGET_DEVICE))))
ifeq (,$(wildcard $(SRC)))
@@ -22,7 +26,7 @@ ifeq (,$(wildcard $(SRC)))
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 := $(TOP_DIR)hardware/qcom/bt/libbt-vendor/gen-buildcfg.sh
$(GEN): PRIVATE_PATH := $(call my-dir)
$(GEN): PRIVATE_CUSTOM_TOOL = $(TOOL) $< $@