resolved conflicts for merge of 1f81b64b to mnc-dev-plus-aosp
Change-Id: I7997086b1d83bc5ee06068f82ca31c290389bc44
diff --git a/Android.mk b/Android.mk
index c5d3d16..f2d2334 100644
--- a/Android.mk
+++ b/Android.mk
@@ -17,7 +17,10 @@
bdroid_CFLAGS += -DBLUEDROID_DEBUG
endif
+bdroid_CFLAGS += -DEXPORT_SYMBOL="__attribute__((visibility(\"default\")))"
+
bdroid_CFLAGS += \
+ -fvisibility=hidden \
-Wall \
-Wno-unused-parameter \
-Wunused-but-set-variable \
diff --git a/btcore/src/counter.c b/btcore/src/counter.c
index 08aa518..55cf77f 100644
--- a/btcore/src/counter.c
+++ b/btcore/src/counter.c
@@ -142,7 +142,7 @@
return future_new_immediate(FUTURE_SUCCESS);
}
-module_t counter_module = {
+EXPORT_SYMBOL module_t counter_module = {
.name = COUNTER_MODULE,
.init = counter_init,
.start_up = NULL,
diff --git a/btif/src/bluetooth.c b/btif/src/bluetooth.c
index f842e5c..e056061 100644
--- a/btif/src/bluetooth.c
+++ b/btif/src/bluetooth.c
@@ -486,7 +486,7 @@
.open = open_bluetooth_stack,
};
-struct hw_module_t HAL_MODULE_INFO_SYM = {
+EXPORT_SYMBOL struct hw_module_t HAL_MODULE_INFO_SYM = {
.tag = HARDWARE_MODULE_TAG,
.version_major = 1,
.version_minor = 0,
diff --git a/btif/src/btif_config.c b/btif/src/btif_config.c
index 2d1ffa6..271d71a 100644
--- a/btif/src/btif_config.c
+++ b/btif/src/btif_config.c
@@ -142,7 +142,7 @@
return future_new_immediate(FUTURE_SUCCESS);
}
-const module_t btif_config_module = {
+EXPORT_SYMBOL const module_t btif_config_module = {
.name = BTIF_CONFIG_MODULE,
.init = init,
.start_up = NULL,
diff --git a/device/src/classic/peer.c b/device/src/classic/peer.c
index 6d1a7b5..d2de679 100644
--- a/device/src/classic/peer.c
+++ b/device/src/classic/peer.c
@@ -68,7 +68,7 @@
return NULL;
}
-const module_t classic_peer_module = {
+EXPORT_SYMBOL const module_t classic_peer_module = {
.name = CLASSIC_PEER_MODULE,
.init = init,
.start_up = NULL,
diff --git a/device/src/controller.c b/device/src/controller.c
index 5101625..89c0133 100644
--- a/device/src/controller.c
+++ b/device/src/controller.c
@@ -250,7 +250,7 @@
return future_new_immediate(FUTURE_SUCCESS);
}
-const module_t controller_module = {
+EXPORT_SYMBOL const module_t controller_module = {
.name = CONTROLLER_MODULE,
.init = NULL,
.start_up = start_up,
diff --git a/gki/ulinux/gki_ulinux.c b/gki/ulinux/gki_ulinux.c
index 72ad479..c8e9953 100644
--- a/gki/ulinux/gki_ulinux.c
+++ b/gki/ulinux/gki_ulinux.c
@@ -51,7 +51,7 @@
}
// Temp module until GKI dies
-const module_t gki_module = {
+EXPORT_SYMBOL const module_t gki_module = {
.name = GKI_MODULE,
.init = init,
.start_up = NULL,
diff --git a/hci/src/btsnoop.c b/hci/src/btsnoop.c
index 990623e..b768f70 100644
--- a/hci/src/btsnoop.c
+++ b/hci/src/btsnoop.c
@@ -80,7 +80,7 @@
return NULL;
}
-const module_t btsnoop_module = {
+EXPORT_SYMBOL const module_t btsnoop_module = {
.name = BTSNOOP_MODULE,
.init = NULL,
.start_up = start_up,
diff --git a/hci/src/hci_layer.c b/hci/src/hci_layer.c
index 89d5cc9..acada3e 100644
--- a/hci/src/hci_layer.c
+++ b/hci/src/hci_layer.c
@@ -317,7 +317,7 @@
return NULL;
}
-const module_t hci_module = {
+EXPORT_SYMBOL const module_t hci_module = {
.name = HCI_MODULE,
.init = NULL,
.start_up = start_up,
diff --git a/main/bte_logmsg.c b/main/bte_logmsg.c
index 3258f47..c6944bd 100644
--- a/main/bte_logmsg.c
+++ b/main/bte_logmsg.c
@@ -249,7 +249,7 @@
return NULL;
}
-const module_t bte_logmsg_module = {
+EXPORT_SYMBOL const module_t bte_logmsg_module = {
.name = BTE_LOGMSG_MODULE,
.init = init,
.start_up = NULL,
diff --git a/main/stack_config.c b/main/stack_config.c
index 6e1431e..06e15d1 100644
--- a/main/stack_config.c
+++ b/main/stack_config.c
@@ -53,7 +53,7 @@
return future_new_immediate(FUTURE_SUCCESS);
}
-const module_t stack_config_module = {
+EXPORT_SYMBOL const module_t stack_config_module = {
.name = STACK_CONFIG_MODULE,
.init = init,
.start_up = NULL,
diff --git a/osi/Android.mk b/osi/Android.mk
index 52dc2cf..ee55c5c 100644
--- a/osi/Android.mk
+++ b/osi/Android.mk
@@ -48,7 +48,7 @@
./src/socket.c \
./src/thread.c
-LOCAL_CFLAGS := -std=c99 -Wall -Werror -UNDEBUG
+LOCAL_CFLAGS := -std=c99 -Wall -Werror -UNDEBUG -fvisibility=hidden
# Many .h files have redefined typedefs
LOCAL_CLANG_CFLAGS += -Wno-error=typedef-redefinition
LOCAL_MODULE := libosi
diff --git a/profile/src/manager.c b/profile/src/manager.c
index 9e56b65..6e3d45c 100644
--- a/profile/src/manager.c
+++ b/profile/src/manager.c
@@ -57,7 +57,7 @@
return NULL;
}
-const module_t profile_manager_module = {
+EXPORT_SYMBOL const module_t profile_manager_module = {
.name = PROFILE_MANAGER_MODULE,
.init = init,
.start_up = NULL,
diff --git a/utils/src/bt_utils.c b/utils/src/bt_utils.c
index 53a53de..c8755c5 100644
--- a/utils/src/bt_utils.c
+++ b/utils/src/bt_utils.c
@@ -73,7 +73,7 @@
return NULL;
}
-const module_t bt_utils_module = {
+EXPORT_SYMBOL const module_t bt_utils_module = {
.name = BT_UTILS_MODULE,
.init = init,
.start_up = NULL,