diff options
| author | Ricardo Cerqueira <ricardo@cyngn.com> | 2015-01-09 03:43:45 +0000 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-16 23:12:00 -0700 |
| commit | 1ced4d15fe6501fc5c12244c6c4cbdbd65a955e1 (patch) | |
| tree | 4d423d44b25cb03d553d56b4d98241f913d76a8d | |
| parent | 4b647353cfdbf7f18c70c3f8eaa06d61b05dada7 (diff) | |
| download | android_hardware_qcom_bt-1ced4d15fe6501fc5c12244c6c4cbdbd65a955e1.tar.gz android_hardware_qcom_bt-1ced4d15fe6501fc5c12244c6c4cbdbd65a955e1.tar.bz2 android_hardware_qcom_bt-1ced4d15fe6501fc5c12244c6c4cbdbd65a955e1.zip | |
Fix up building with TARGET_2ND_ARCH
Set up the intermediates path to generate the buildcfg header at
the right location
Change-Id: Ifd65a27134100ec40332bcc3b15d1950e3f43a7b
| -rw-r--r-- | libbt-vendor/Android.mk | 2 | ||||
| -rw-r--r-- | libbt-vendor/vnd_buildcfg.mk | 6 |
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) $< $@ |