Merge "Merge Android Pie into master"android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3oreo-mr1-1.2-iot-releasemaster-cuttlefish-testing-release

30 files changed, 24 insertions, 72 deletions

diff --git a/Android.mk b/Android.mk
index 5c7c040..85e8d12 100644
--- a/Android.mk
+++ b/Android.mk
@@ -5,6 +5,12 @@ ifneq ($(BOARD_IS_AUTOMOTIVE),true)
     include $(call all-named-subdir-makefiles,msm8960)
   else ifneq ($(filter msm8994,$(TARGET_BOARD_PLATFORM)),)
     include $(call all-named-subdir-makefiles,msm8992)
+  else ifneq ($(filter msm8909,$(TARGET_BOARD_PLATFORM)),)
+    ifeq ($(TARGET_SUPPORTS_QCOM_3100),true)
+      include $(call all-named-subdir-makefiles,msm8909w_3100)
+    else
+      include $(call all-named-subdir-makefiles,msm8909)
+    endif
   else ifneq ($(wildcard $(LOCAL_PATH)/$(TARGET_BOARD_PLATFORM)),)
     include $(call all-named-subdir-makefiles,$(TARGET_BOARD_PLATFORM))
   endif
diff --git a/msm8909/libbt-vendor/Android.mk b/msm8909/libbt-vendor/Android.mk
index 19ca946..e79e308 100644
--- a/msm8909/libbt-vendor/Android.mk
+++ b/msm8909/libbt-vendor/Android.mk
@@ -65,6 +65,7 @@ LOCAL_SHARED_LIBRARIES := \
 LOCAL_CFLAGS += -Wno-error
 LOCAL_MODULE := libbt-vendor
 LOCAL_CLANG := false
+LOCAL_CXX_STL := none
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
 LOCAL_MODULE_OWNER := qcom
diff --git a/sdm845/Android.mk b/msm8909w_3100/Android.mk
index cd2c3ae..cd2c3ae 100644
--- a/sdm845/Android.mk
+++ b/msm8909w_3100/Android.mk
diff --git a/sdm845/libbt-vendor/Android.mk b/msm8909w_3100/libbt-vendor/Android.mk
index 8d3f9d4..e299f89 100644
--- a/sdm845/libbt-vendor/Android.mk
+++ b/msm8909w_3100/libbt-vendor/Android.mk
@@ -31,7 +31,9 @@ LOCAL_SRC_FILES := \
         src/bt_vendor_persist.cpp
 
 #Disable this flag in case if FM over UART support not needed
+ifneq ($(TARGET_SUPPORTS_WEARABLES),true)
 LOCAL_CFLAGS := -DFM_OVER_UART
+endif
 
 ifneq (,$(filter userdebug eng,$(TARGET_BUILD_VARIANT)))
 LOCAL_CFLAGS += -DPANIC_ON_SOC_CRASH
@@ -42,11 +44,7 @@ LOCAL_C_INCLUDES += \
         $(LOCAL_PATH)/include \
         external/bluetooth/bluedroid/hci/include \
         system/bt/hci/include \
-        $(TARGET_OUT_HEADERS)/bt/hci_qcomm_init \
-        $(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr/include
-
-LOCAL_ADDITIONAL_DEPENDENCIES += \
-$(TARGET_OUT_INTERMEDIATES)/KERNEL_OBJ/usr
+        $(TARGET_OUT_HEADERS)/bt/hci_qcomm_init
 
 ifeq ($(BOARD_HAS_QCA_BT_AR3002), true)
 LOCAL_C_FLAGS := \
@@ -62,6 +60,7 @@ LOCAL_SHARED_LIBRARIES := \
         liblog \
         libbtnv
 
+LOCAL_CFLAGS += -Wno-error
 LOCAL_MODULE := libbt-vendor
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE_CLASS := SHARED_LIBRARIES
diff --git a/msm8909w_3100/libbt-vendor/MODULE_LICENSE_BSD b/msm8909w_3100/libbt-vendor/MODULE_LICENSE_BSD
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/msm8909w_3100/libbt-vendor/MODULE_LICENSE_BSD
diff --git a/sdm845/libbt-vendor/NOTICE b/msm8909w_3100/libbt-vendor/NOTICE
index 33ff961..33ff961 100644
--- a/sdm845/libbt-vendor/NOTICE
+++ b/msm8909w_3100/libbt-vendor/NOTICE
diff --git a/sdm845/libbt-vendor/include/bt_vendor_persist.h b/msm8909w_3100/libbt-vendor/include/bt_vendor_persist.h
index 4f2e8ee..4f2e8ee 100644
--- a/sdm845/libbt-vendor/include/bt_vendor_persist.h
+++ b/msm8909w_3100/libbt-vendor/include/bt_vendor_persist.h
diff --git a/sdm845/libbt-vendor/include/bt_vendor_qcom.h b/msm8909w_3100/libbt-vendor/include/bt_vendor_qcom.h
index 8565b6c..c71ce8a 100644
--- a/sdm845/libbt-vendor/include/bt_vendor_qcom.h
+++ b/msm8909w_3100/libbt-vendor/include/bt_vendor_qcom.h
@@ -43,12 +43,6 @@ typedef enum {
 }bt_soc_type;
 
 typedef enum {
-    FM_VND_OP_POWER_CTRL = (unsigned int)BT_VND_OP_A2DP_OFFLOAD_STOP + 1,
-    BT_VND_OP_FM_USERIAL_OPEN,
-    BT_VND_OP_FM_USERIAL_CLOSE,
-}bt_fm_serial;
-
-typedef enum {
     BT_VND_OP_ANT_USERIAL_OPEN = 254,
     BT_VND_OP_ANT_USERIAL_CLOSE
 }ant_serial;
diff --git a/sdm845/libbt-vendor/include/hci_smd.h b/msm8909w_3100/libbt-vendor/include/hci_smd.h
index 055b779..055b779 100644
--- a/sdm845/libbt-vendor/include/hci_smd.h
+++ b/msm8909w_3100/libbt-vendor/include/hci_smd.h
diff --git a/sdm845/libbt-vendor/include/hci_uart.h b/msm8909w_3100/libbt-vendor/include/hci_uart.h
index 21e9689..21e9689 100644
--- a/sdm845/libbt-vendor/include/hci_uart.h
+++ b/msm8909w_3100/libbt-vendor/include/hci_uart.h
diff --git a/sdm845/libbt-vendor/include/hw_ar3k.h b/msm8909w_3100/libbt-vendor/include/hw_ar3k.h
index 2129548..2129548 100644
--- a/sdm845/libbt-vendor/include/hw_ar3k.h
+++ b/msm8909w_3100/libbt-vendor/include/hw_ar3k.h
diff --git a/sdm845/libbt-vendor/include/hw_rome.h b/msm8909w_3100/libbt-vendor/include/hw_rome.h
index 08efb39..08efb39 100644
--- a/sdm845/libbt-vendor/include/hw_rome.h
+++ b/msm8909w_3100/libbt-vendor/include/hw_rome.h
diff --git a/sdm845/libbt-vendor/include/vnd_generic.txt b/msm8909w_3100/libbt-vendor/include/vnd_generic.txt
index 43e790c..43e790c 100644
--- a/sdm845/libbt-vendor/include/vnd_generic.txt
+++ b/msm8909w_3100/libbt-vendor/include/vnd_generic.txt
diff --git a/sdm845/libbt-vendor/include/vnd_mako.txt b/msm8909w_3100/libbt-vendor/include/vnd_mako.txt
index 5408c92..5408c92 100644
--- a/sdm845/libbt-vendor/include/vnd_mako.txt
+++ b/msm8909w_3100/libbt-vendor/include/vnd_mako.txt
diff --git a/sdm845/libbt-vendor/src/bt_vendor_persist.cpp b/msm8909w_3100/libbt-vendor/src/bt_vendor_persist.cpp
index 519e826..519e826 100644
--- a/sdm845/libbt-vendor/src/bt_vendor_persist.cpp
+++ b/msm8909w_3100/libbt-vendor/src/bt_vendor_persist.cpp
diff --git a/sdm845/libbt-vendor/src/bt_vendor_qcom.c b/msm8909w_3100/libbt-vendor/src/bt_vendor_qcom.c
index 8cbf5d1..8cbf5d1 100755
--- a/sdm845/libbt-vendor/src/bt_vendor_qcom.c
+++ b/msm8909w_3100/libbt-vendor/src/bt_vendor_qcom.c
diff --git a/sdm845/libbt-vendor/src/hardware.c b/msm8909w_3100/libbt-vendor/src/hardware.c
index 90db801..90db801 100644
--- a/sdm845/libbt-vendor/src/hardware.c
+++ b/msm8909w_3100/libbt-vendor/src/hardware.c
diff --git a/sdm845/libbt-vendor/src/hci_smd.c b/msm8909w_3100/libbt-vendor/src/hci_smd.c
index 7e5b16d..7e5b16d 100644
--- a/sdm845/libbt-vendor/src/hci_smd.c
+++ b/msm8909w_3100/libbt-vendor/src/hci_smd.c
diff --git a/sdm845/libbt-vendor/src/hci_uart.c b/msm8909w_3100/libbt-vendor/src/hci_uart.c
index 2aeace8..2aeace8 100644
--- a/sdm845/libbt-vendor/src/hci_uart.c
+++ b/msm8909w_3100/libbt-vendor/src/hci_uart.c
diff --git a/sdm845/libbt-vendor/src/hw_ar3k.c b/msm8909w_3100/libbt-vendor/src/hw_ar3k.c
index cc54db8..cc54db8 100644
--- a/sdm845/libbt-vendor/src/hw_ar3k.c
+++ b/msm8909w_3100/libbt-vendor/src/hw_ar3k.c
diff --git a/sdm845/libbt-vendor/src/hw_rome.c b/msm8909w_3100/libbt-vendor/src/hw_rome.c
index ccfb137..ccfb137 100644
--- a/sdm845/libbt-vendor/src/hw_rome.c
+++ b/msm8909w_3100/libbt-vendor/src/hw_rome.c
diff --git a/sdm845/libbt-vendor/vnd_buildcfg.mk b/msm8909w_3100/libbt-vendor/vnd_buildcfg.mk
index d18e121..d18e121 100644
--- a/sdm845/libbt-vendor/vnd_buildcfg.mk
+++ b/msm8909w_3100/libbt-vendor/vnd_buildcfg.mk
diff --git a/msm8996/libbt-vendor/src/bt_vendor_persist.cpp b/msm8996/libbt-vendor/src/bt_vendor_persist.cpp
index 519e826..8505797 100644
--- a/msm8996/libbt-vendor/src/bt_vendor_persist.cpp
+++ b/msm8996/libbt-vendor/src/bt_vendor_persist.cpp
@@ -28,7 +28,7 @@
 
 #ifdef BT_NV_SUPPORT
 #include "bt_nv.h"
-#include <utils/Log.h>
+#include <log/log.h>
 
 /*===========================================================================
 FUNCTION   bt_vendor_nv_read
diff --git a/msm8996/libbt-vendor/src/bt_vendor_qcom.c b/msm8996/libbt-vendor/src/bt_vendor_qcom.c
index 3ad87b8..7520967 100644
--- a/msm8996/libbt-vendor/src/bt_vendor_qcom.c
+++ b/msm8996/libbt-vendor/src/bt_vendor_qcom.c
@@ -33,7 +33,7 @@
 #include <termios.h>
 #include <unistd.h>
 
-#include <utils/Log.h>
+#include <log/log.h>
 #include <cutils/properties.h>
 #include "bt_vendor_qcom.h"
 #include "hci_uart.h"
diff --git a/msm8996/libbt-vendor/src/hardware.c b/msm8996/libbt-vendor/src/hardware.c
index a1ebd35..b7b13aa 100644
--- a/msm8996/libbt-vendor/src/hardware.c
+++ b/msm8996/libbt-vendor/src/hardware.c
@@ -26,7 +26,6 @@
 
 #define LOG_TAG "bt_vendor"
 
-#include <utils/Log.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
@@ -36,8 +35,10 @@
 #include <dirent.h>
 #include <ctype.h>
 #include <cutils/properties.h>
+#include <log/log.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include "bt_hci_bdroid.h"
 #include "bt_vendor_qcom.h"
 #include <string.h>
diff --git a/msm8996/libbt-vendor/src/hci_smd.c b/msm8996/libbt-vendor/src/hci_smd.c
index 3ddbcc2..44e95db 100644
--- a/msm8996/libbt-vendor/src/hci_smd.c
+++ b/msm8996/libbt-vendor/src/hci_smd.c
@@ -24,17 +24,18 @@
 
 #define LOG_TAG "bt_vendor"
 
-#include <utils/Log.h>
 #include <termios.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
 #include <cutils/properties.h>
 #include "bt_vendor_qcom.h"
 #include "hci_smd.h"
 #include <string.h>
 #include <cutils/properties.h>
+#include <log/log.h>
 
 /*****************************************************************************
 **   Macros & Constants
diff --git a/msm8996/libbt-vendor/src/hci_uart.c b/msm8996/libbt-vendor/src/hci_uart.c
index e4ce994..b15c583 100644
--- a/msm8996/libbt-vendor/src/hci_uart.c
+++ b/msm8996/libbt-vendor/src/hci_uart.c
@@ -26,12 +26,13 @@
 
 #define LOG_TAG "bt_vendor"
 
-#include <utils/Log.h>
 #include <termios.h>
 #include <fcntl.h>
 #include <errno.h>
 #include <stdio.h>
 #include <string.h>
+#include <unistd.h>
+#include <log/log.h>
 #include "bt_vendor_qcom.h"
 #include "hci_uart.h"
 #include <string.h>
diff --git a/msm8996/libbt-vendor/src/hw_ar3k.c b/msm8996/libbt-vendor/src/hw_ar3k.c
index f8e3342..e3b72dc 100644
--- a/msm8996/libbt-vendor/src/hw_ar3k.c
+++ b/msm8996/libbt-vendor/src/hw_ar3k.c
@@ -34,8 +34,9 @@ extern "C" {
 
 #define LOG_TAG "bt_vendor"
 
+#include <sys/uio.h>
 #include <sys/socket.h>
-#include <utils/Log.h>
+#include <log/log.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
@@ -49,6 +50,7 @@ extern "C" {
 #include <string.h>
 #include <termios.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "bt_hci_bdroid.h"
 #include "hci_uart.h"
diff --git a/msm8996/libbt-vendor/src/hw_rome.c b/msm8996/libbt-vendor/src/hw_rome.c
index cede337..b2b3126 100644
--- a/msm8996/libbt-vendor/src/hw_rome.c
+++ b/msm8996/libbt-vendor/src/hw_rome.c
@@ -35,7 +35,7 @@ extern "C" {
 #define LOG_TAG "bt_vendor"
 
 #include <sys/socket.h>
-#include <utils/Log.h>
+#include <log/log.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <signal.h>
@@ -50,6 +50,7 @@ extern "C" {
 #include <termios.h>
 #include <string.h>
 #include <stdbool.h>
+#include <unistd.h>
 
 #include "bt_hci_bdroid.h"
 #include "bt_vendor_qcom.h"
diff --git a/sdm845/CleanSpec.mk b/sdm845/CleanSpec.mk
deleted file mode 100755
index 8ab6f23..0000000
--- a/sdm845/CleanSpec.mk
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright (C) 2007 The Android Open Source Project
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# If you don't need to do a full clean build but would like to touch
-# a file or delete some intermediate files, add a clean step to the end
-# of the list.  These steps will only be run once, if they haven't been
-# run before.
-#
-# E.g.:
-#     $(call add-clean-step, touch -c external/sqlite/sqlite3.h)
-#     $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/STATIC_LIBRARIES/libz_intermediates)
-#
-# Always use "touch -c" and "rm -f" or "rm -rf" to gracefully deal with
-# files that are missing or have been moved.
-#
-# Use $(PRODUCT_OUT) to get to the "out/target/product/blah/" directory.
-# Use $(OUT_DIR) to refer to the "out" directory.
-#
-# If you need to re-do something that's already mentioned, just copy
-# the command and add it to the bottom of the list.  E.g., if a change
-# that you made last week required touching a file and a change you
-# made today requires touching the same file, just copy the old
-# touch step and add it to the end of the list.
-#
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
-
-# For example:
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/AndroidTests_intermediates)
-#$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/JAVA_LIBRARIES/core_intermediates)
-#$(call add-clean-step, find $(OUT_DIR) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f)
-#$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*)
-
-# ************************************************
-# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
-# ************************************************
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/SHARED_LIBRARIES/libbt-vendor_intermediates)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/NOTICE_FILES/src/system/vendor/lib/libbt-vendor.so.txt)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/lib/libbt-vendor.so)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/symbols/system/vendor/lib/libbt-vendor.so)
-$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/vendor/lib/libbt-vendor.so)