PD#145255: generate amlogic files to vendor/

Change-Id: I84f9408e4c5c4ecda1dcb72ce568c1a452e8efa6

9 files changed, 50 insertions, 6 deletions

diff --git a/Android.mk b/Android.mk
index b3b81c6..d8329a3 100644
--- a/Android.mk
+++ b/Android.mk
@@ -25,7 +25,10 @@ LOCAL_MODULE := libbt-vendor
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_OWNER := broadcom
+
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
 LOCAL_PROPRIETARY_MODULE := true
+endif
 
 include $(LOCAL_PATH)/vnd_buildcfg.mk
 
diff --git a/conf/40183/Android.mk b/conf/40183/Android.mk
index 974e213..bf84336 100755..100644
--- a/conf/40183/Android.mk
+++ b/conf/40183/Android.mk
@@ -4,11 +4,15 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := bt_vendor.conf
 LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
 
 LOCAL_MODULE_TAGS := eng
 
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
-
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/bluetooth
+else
+LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
+endif
 include $(BUILD_PREBUILT)
 
diff --git a/conf/asus/grouper/Android.mk b/conf/asus/grouper/Android.mk
index 974e213..7ae2d2e 100644
--- a/conf/asus/grouper/Android.mk
+++ b/conf/asus/grouper/Android.mk
@@ -4,11 +4,16 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := bt_vendor.conf
 LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
 
 LOCAL_MODULE_TAGS := eng
 
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/bluetooth
+else
+LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
+endif
 include $(BUILD_PREBUILT)
 
diff --git a/conf/bcm_usb_bt/Android.mk b/conf/bcm_usb_bt/Android.mk
index 974e213..7ae2d2e 100644
--- a/conf/bcm_usb_bt/Android.mk
+++ b/conf/bcm_usb_bt/Android.mk
@@ -4,11 +4,16 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := bt_vendor.conf
 LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
 
 LOCAL_MODULE_TAGS := eng
 
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/bluetooth
+else
+LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
+endif
 include $(BUILD_PREBUILT)
 
diff --git a/conf/meson/Android.mk b/conf/meson/Android.mk
index 974e213..7ae2d2e 100644
--- a/conf/meson/Android.mk
+++ b/conf/meson/Android.mk
@@ -4,11 +4,16 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := bt_vendor.conf
 LOCAL_MODULE_CLASS := ETC
-LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
 
 LOCAL_MODULE_TAGS := eng
 
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
 
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/bluetooth
+else
+LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
+endif
 include $(BUILD_PREBUILT)
 
diff --git a/conf/moto/wingray/Android.mk b/conf/moto/wingray/Android.mk
index 974e213..06d28e4 100644
--- a/conf/moto/wingray/Android.mk
+++ b/conf/moto/wingray/Android.mk
@@ -4,8 +4,12 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := bt_vendor.conf
 LOCAL_MODULE_CLASS := ETC
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/bluetooth
+else
 LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
-
+endif
 LOCAL_MODULE_TAGS := eng
 
 LOCAL_SRC_FILES := $(LOCAL_MODULE)
diff --git a/conf/samsung/crespo/Android.mk b/conf/samsung/crespo/Android.mk
index 974e213..1e7259d 100644
--- a/conf/samsung/crespo/Android.mk
+++ b/conf/samsung/crespo/Android.mk
@@ -4,7 +4,13 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := bt_vendor.conf
 LOCAL_MODULE_CLASS := ETC
+
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/bluetooth
+else
 LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
+endif
 
 LOCAL_MODULE_TAGS := eng
 
diff --git a/conf/samsung/crespo4g/Android.mk b/conf/samsung/crespo4g/Android.mk
index 974e213..1e7259d 100644
--- a/conf/samsung/crespo4g/Android.mk
+++ b/conf/samsung/crespo4g/Android.mk
@@ -4,7 +4,13 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := bt_vendor.conf
 LOCAL_MODULE_CLASS := ETC
+
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/bluetooth
+else
 LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
+endif
 
 LOCAL_MODULE_TAGS := eng
 
diff --git a/conf/samsung/maguro/Android.mk b/conf/samsung/maguro/Android.mk
index 974e213..1e7259d 100644
--- a/conf/samsung/maguro/Android.mk
+++ b/conf/samsung/maguro/Android.mk
@@ -4,7 +4,13 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := bt_vendor.conf
 LOCAL_MODULE_CLASS := ETC
+
+ifeq ($(shell test $(PLATFORM_SDK_VERSION) -ge 26 && echo OK),OK)
+LOCAL_PROPRIETARY_MODULE := true
+LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/etc/bluetooth
+else
 LOCAL_MODULE_PATH := $(TARGET_OUT)/etc/bluetooth
+endif
 
 LOCAL_MODULE_TAGS := eng