diff options
| author | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-12 07:31:30 +0000 |
|---|---|---|
| committer | android-build-team Robot <android-build-team-robot@google.com> | 2017-07-12 07:31:30 +0000 |
| commit | 8bfefcab0ac37ef51a3030f1a9225748509689b5 (patch) | |
| tree | f8eaf51043153bb4993986549723c2681998b528 | |
| parent | 77a25624c5aaf25ef158c52c04f72b69136e4ee8 (diff) | |
| parent | 6c5f73328e05e5fb1b12ddfe18e8456b747bb91e (diff) | |
| download | libhardware-8bfefcab0ac37ef51a3030f1a9225748509689b5.tar.gz | |
release-request-b6f2d5b3-a3d6-410f-b58f-c85ba8187177-for-git_oc-mr1-release-4173087 snap-temp-L93200000081515229
Change-Id: I39914b6ad4d33af543c3024ea4325c0cb6b70250
| -rw-r--r-- | include/hardware/bt_gatt_client.h | 3 | ||||
| -rw-r--r-- | modules/hwcomposer/Android.mk | 1 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/hardware/bt_gatt_client.h b/include/hardware/bt_gatt_client.h index 9adeb6f0..cafc2da7 100644 --- a/include/hardware/bt_gatt_client.h +++ b/include/hardware/bt_gatt_client.h @@ -207,7 +207,8 @@ typedef struct { /** Create a connection to a remote LE or dual-mode device */ bt_status_t (*connect)(int client_if, const RawAddress& bd_addr, - bool is_direct, int transport, int initiating_phys); + bool is_direct, int transport, bool opportunistic, + int initiating_phys); /** Disconnect a remote device or cancel a pending connection */ bt_status_t (*disconnect)( int client_if, const RawAddress& bd_addr, diff --git a/modules/hwcomposer/Android.mk b/modules/hwcomposer/Android.mk index da0f6db6..42b4e47d 100644 --- a/modules/hwcomposer/Android.mk +++ b/modules/hwcomposer/Android.mk @@ -23,6 +23,7 @@ LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_PROPRIETARY_MODULE := true LOCAL_SHARED_LIBRARIES := liblog libEGL LOCAL_SRC_FILES := hwcomposer.cpp +LOCAL_HEADER_LIBRARIES := libhardware_headers LOCAL_MODULE := hwcomposer.default LOCAL_CFLAGS:= -DLOG_TAG=\"hwcomposer\" LOCAL_MODULE_TAGS := optional |