summaryrefslogtreecommitdiffstats
path: root/libaudio
diff options
context:
space:
mode:
authorJean-Baptiste Queru <jbq@google.com>2010-09-26 07:13:00 -0700
committerJean-Baptiste Queru <jbq@google.com>2010-09-26 07:13:00 -0700
commit63e716c291668951cac8f0604283001c523c201e (patch)
tree27cb0665eb73a07b8d072a77e8a824df1368dc92 /libaudio
parent1e521da356b6dff8ea870e7bfbb792256318f3a1 (diff)
downloaddevice_samsung_crespo-63e716c291668951cac8f0604283001c523c201e.zip
device_samsung_crespo-63e716c291668951cac8f0604283001c523c201e.tar.gz
device_samsung_crespo-63e716c291668951cac8f0604283001c523c201e.tar.bz2
Better handling of libsecril stub.
Use a different name for the stub than for the real library, so that the real library still appears in the list of proprietary files. Also, use the real library instead of the stub when building an open-source build with the proprietary files. Change-Id: I570e7b86be5be5c8e18326c9438b5736f6019d44
Diffstat (limited to 'libaudio')
-rw-r--r--libaudio/Android.mk6
1 files changed, 5 insertions, 1 deletions
diff --git a/libaudio/Android.mk b/libaudio/Android.mk
index 4230fb2..3ea6267 100644
--- a/libaudio/Android.mk
+++ b/libaudio/Android.mk
@@ -53,7 +53,11 @@ ifeq ($(BOARD_HAVE_BLUETOOTH),true)
endif
ifneq ($(NO_IPC_ALSA_RILD),true)
+ifeq ($(BOARD_USES_LIBSECRIL_STUB),true)
+ LOCAL_SHARED_LIBRARIES += libsecril-client-stub
+else
LOCAL_SHARED_LIBRARIES += libsecril-client
+endif
LOCAL_CFLAGS += -DIPC_ALSA_RILD
endif
include $(BUILD_SHARED_LIBRARY)
@@ -82,7 +86,7 @@ ifeq ($(BOARD_USES_LIBSECRIL_STUB),true)
# A stub to replace libsecril-client at build time
include $(CLEAR_VARS)
LOCAL_SRC_FILES := secril_stub.c
-LOCAL_MODULE := libsecril-client
+LOCAL_MODULE := libsecril-client-stub
LOCAL_MODULE_TAGS := optional
include $(BUILD_SHARED_LIBRARY)
endif