build: rename shared libraries to libaudioreach

acdb/Android.mk

@@ -8,7 +8,7 @@ include $(CLEAR_VARS)
 acdb-def += -D_ANDROID_
 
 #----------------------------------------------------------------------------
-#             Make the Shared library (libar-acdb)
+#             Make the Shared library (libaudioreach-acdb)
 #----------------------------------------------------------------------------
 
 #LOCAL_C_INCLUDES := $(LOCAL_PATH)/inc
@@ -32,7 +32,7 @@ LOCAL_SRC_FILES := \
     src/acdb_heap.c\
     src/acdb_context_mgr.c
 
-LOCAL_MODULE := libar-acdb
+LOCAL_MODULE := libaudioreach-acdb
 LOCAL_MODULE_OWNER := qti
 LOCAL_MODULE_TAGS := optional
 LOCAL_VENDOR_MODULE := true
@@ -126,8 +126,8 @@ LOCAL_SHARED_LIBRARIES := \
     libutils\
     libcutils \
     libdiag \
-    libar-gsl\
-    libar-acdb
+    libaudioreach-gsl\
+    libaudioreach-acdb
 
 LOCAL_EXPORT_C_INCLUDE_DIRS := $(LOCAL_PATH)/ats/api
 LOCAL_EXPORT_C_INCLUDE_DIRS += $(LOCAL_PATH)/ats/inc

acdb/Makefile.am

@@ -43,9 +43,9 @@ acdb_c_sources = ./src/acdb.c \
 lib_includedir = $(includedir)
 lib_include_HEADERS = $(acdb_sources)
 
-lib_LTLIBRARIES = libar-acdb.la
-libar_acdb_la_CC = @CC@
-libar_acdb_la_LIBADD = -lar-osal -L$(top_builddir)/ar_osal
-libar_acdb_la_SOURCES = $(acdb_c_sources)
-libar_acdb_la_CFLAGS = $(AM_CFLAGS)
-libar_acdb_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@
+lib_LTLIBRARIES = libaudioreach-acdb.la
+libaudioreach_acdb_la_CC = @CC@
+libaudioreach_acdb_la_LIBADD = -laudioreach-osal -L$(top_builddir)/ar_osal
+libaudioreach_acdb_la_SOURCES = $(acdb_c_sources)
+libaudioreach_acdb_la_CFLAGS = $(AM_CFLAGS)
+libaudioreach_acdb_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@

acdb/acdb.pc.in

@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: acdb
 Description: acdb library
 Version: @LT_VERSION@
-Libs: -L${libdir} -lar-acdb
+Libs: -L${libdir} -laudioreach-acdb
 Cflags: -I${includedir}

acdb/ats/Makefile.am

@@ -65,12 +65,12 @@ lib_includedir = $(includedir)
 lib_include_HEADERS = $(ats_headers)
 requiredlibs = -lrt
 
-lib_LTLIBRARIES = libar-ats.la
-libar_ats_la_CC = @CC@
-libar_ats_la_LIBADD = -lar-osal -L$(top_builddir)/ar_osal
-libar_ats_la_LIBADD += -lar-acdb -L$(top_builddir)/acdb
+lib_LTLIBRARIES = libaudioreach-ats.la
+libaudioreach_ats_la_CC = @CC@
+libaudioreach_ats_la_LIBADD = -laudioreach-osal -L$(top_builddir)/ar_osal
+libaudioreach_ats_la_LIBADD += -laudioreach-acdb -L$(top_builddir)/acdb
 if CUTILS_SUPPORTED
-libar_ats_la_LIBADD += -lcutils
+libaudioreach_ats_la_LIBADD += -lcutils
 AM_CFLAGS += -DAR_ATS_USE_CUTILS
 endif
 
@@ -81,23 +81,23 @@ else
 AM_CFLAGS += @DIAG_CFLAGS@
 AM_CPPFLAGS += -DFEATURE_LE_DIAG
 requiredlibs += @DIAG_LIBS@
-libar_ats_la_LIBADD += @DIAG_LIBS@
+libaudioreach_ats_la_LIBADD += @DIAG_LIBS@
 endif
 
-libar_ats_la_SOURCES = $(ats_c_sources)
-libar_ats_la_CFLAGS = $(AM_CFLAGS)
-libar_ats_la_CPPFLAGS = $(AM_CPPFLAGS)
+libaudioreach_ats_la_SOURCES = $(ats_c_sources)
+libaudioreach_ats_la_CFLAGS = $(AM_CFLAGS)
+libaudioreach_ats_la_CPPFLAGS = $(AM_CPPFLAGS)
 if USES_ATS_TRANSPORT_TCPIP
-libar_ats_la_CFLAGS += -DATS_TRANSPORT_TCPIP
-libar_ats_la_CPPFLAGS += -DATS_TRANSPORT_TCPIP
+libaudioreach_ats_la_CFLAGS += -DATS_TRANSPORT_TCPIP
+libaudioreach_ats_la_CPPFLAGS += -DATS_TRANSPORT_TCPIP
 endif
 
 if USES_ATS_DATA_LOGGING
-libar_ats_la_CFLAGS += -DATS_DATA_LOGGING
-libar_ats_la_CPPFLAGS += -DATS_DATA_LOGGING
+libaudioreach_ats_la_CFLAGS += -DATS_DATA_LOGGING
+libaudioreach_ats_la_CPPFLAGS += -DATS_DATA_LOGGING
 endif
 
-libar_ats_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@
+libaudioreach_ats_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@
 
 AM_CPPFLAGS += -DSOCK_PATH='"/usr/bin/gateway/ats_sockets"' \
         -DSOCK_PATH_SERVER='"/usr/bin/gateway/ats_sockets/unix_sock.server"' \
@@ -122,7 +122,7 @@ gateway_sources = ./transports/tcpip_gateway/src/tcpip_gateway_main.cpp \
 bin_PROGRAMS = ats_gateway
 ats_gateway_CC = @CC@
 ats_gateway_SOURCES = $(gateway_sources)
-ats_gateway_LDADD = $(top_builddir)/ar_osal/libar-osal.la
+ats_gateway_LDADD = $(top_builddir)/ar_osal/libaudioreach-osal.la
 ats_gateway_CPPFLAGS = $(AM_CPPFLAGS)
 
 if USES_ATS_DATA_LOGGING

acdb/ats/ats.pc.in

@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: ats
 Description: ats library
 Version: @LT_VERSION@
-Libs: -L${libdir} -lar-ats
+Libs: -L${libdir} -laudioreach-ats
 Cflags: -I${includedir}\ats

ar_osal/Makefile.am

@@ -78,10 +78,10 @@ if KERNEL_HEADER
 AM_CFLAGS += -DMSM_AUDIO_CUSTOM_STACK
 endif
 
-libar_osal_la_LIBADD = -lrt -lpthread
+libaudioreach_osal_la_LIBADD = -lrt -lpthread
 
 if CUTILS_SUPPORTED
-libar_osal_la_LIBADD += -lcutils -llog
+libaudioreach_osal_la_LIBADD += -lcutils -llog
 AM_CFLAGS += -DAR_OSAL_USE_CUTILS
 endif
 
@@ -90,14 +90,14 @@ AM_CFLAGS += -DION_DRIVER_UNSUPPORTED
 endif
 
 if USE_GLIB
-libar_osal_la_LIBADD += -lglib-2.0
+libaudioreach_osal_la_LIBADD += -lglib-2.0
 AM_CFLAGS += $(GLIB_CFLAGS) -D_GNU_SOURCE -include glib.h
 endif
 
 if USE_DUMMY_DIAG
 #dummy diag, do not link real diag libs
 else
-libar_osal_la_LIBADD += -ldiag
+libaudioreach_osal_la_LIBADD += -ldiag
 endif
 
 if USE_G_STR_FUNC
@@ -106,14 +106,14 @@ endif
 
 lib_includedir = $(includedir)
 lib_include_HEADERS = $(osal_sources)
-lib_LTLIBRARIES = libar-osal.la
-libar_osal_la_CC = @CC@
-libar_osal_la_SOURCES = $(osal_c_sources)
-libar_osal_la_CFLAGS = $(AM_CFLAGS) @DIAG_CFLAGS@
+lib_LTLIBRARIES = libaudioreach-osal.la
+libaudioreach_osal_la_CC = @CC@
+libaudioreach_osal_la_SOURCES = $(osal_c_sources)
+libaudioreach_osal_la_CFLAGS = $(AM_CFLAGS) @DIAG_CFLAGS@
 
 if LIBION_SUPPORTED
-libar_osal_la_LIBADD += -lion
-libar_osal_la_CFLAGS += @LIBION_CFLAGS@
+libaudioreach_osal_la_LIBADD += -lion
+libaudioreach_osal_la_CFLAGS += @LIBION_CFLAGS@
 endif
 
-libar_osal_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@
+libaudioreach_osal_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@

ar_osal/ar_osal.pc.in

@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: ar_osal
 Description: ar osal library
 Version: @LT_VERSION@
-Libs: -L${libdir} -lar-osal
+Libs: -L${libdir} -laudioreach-osal
 Cflags: -I${includedir}

ar_util/Makefile.am

@@ -19,8 +19,8 @@ util_c_sources = src/ar_util_data_log.c \
                  src/ar_util_err_detection.c \
                  src/ar_util_list.c
 
-lib_LTLIBRARIES = libar-util.la
-libar_util_la_CC = @CC@
-libar_util_la_SOURCES = $(util_c_sources)
-libar_util_la_CFLAGS = $(AM_CFLAGS)
-libar_util_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@
+lib_LTLIBRARIES = libaudioreach-util.la
+libaudioreach_util_la_CC = @CC@
+libaudioreach_util_la_SOURCES = $(util_c_sources)
+libaudioreach_util_la_CFLAGS = $(AM_CFLAGS)
+libaudioreach_util_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@

ar_util/ar_util.pc.in

@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: ar_util
 Description: ar_util library
 Version: @LT_VERSION@
-Libs: -L${libdir} -lar-util
+Libs: -L${libdir} -laudioreach-util
 Cflags: -I${includedir}

gpr/Android.mk

@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libar-gpr
+LOCAL_MODULE := libaudioreach-gpr
 LOCAL_MODULE_OWNER := qti
 LOCAL_MODULE_TAGS := optional
 LOCAL_VENDOR_MODULE := true

gpr/Makefile.am

@@ -55,11 +55,11 @@ gpr_c_sources =  ./core/src/gpr_drv.c \
 lib_includedir = $(includedir)
 lib_include_HEADERS = $(gpr_sources)
 
-lib_LTLIBRARIES = libar-gpr.la
-libar_gpr_la_CC = @CC@
-libar_gpr_la_LIBADD = -lpthread $(top_builddir)/ar_osal/libar-osal.la
+lib_LTLIBRARIES = libaudioreach-gpr.la
+libaudioreach_gpr_la_CC = @CC@
+libaudioreach_gpr_la_LIBADD = -lpthread $(top_builddir)/ar_osal/libaudioreach-osal.la
 if USE_GLIB
-libar_gpr_la_LIBADD += -lglib-2.0
+libaudioreach_gpr_la_LIBADD += -lglib-2.0
 AM_CFLAGS += $(GLIB_CFLAGS) -include glib.h
 endif
 
@@ -68,15 +68,14 @@ AM_CFLAGS += -Dstrlcpy=g_strlcpy
 endif
 
 if CUTILS_SUPPORTED
-libar_gpr_la_LIBADD += -lcutils
+libaudioreach_gpr_la_LIBADD += -lcutils
 AM_CFLAGS += -DGPR_USE_CUTILS
 endif
 
 if USE_ARE_ON_APPS
 AM_CFLAGS += -DARE_ON_APPS
 endif
 
-libar_gpr_la_SOURCES = $(gpr_c_sources)
-libar_gpr_la_CFLAGS = $(AM_CFLAGS)
-libar_gpr_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@
-
+libaudioreach_gpr_la_SOURCES = $(gpr_c_sources)
+libaudioreach_gpr_la_CFLAGS = $(AM_CFLAGS)
+libaudioreach_gpr_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@

gpr/gpr.pc.in

@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: gpr
 Description: gpr library
 Version: @LT_VERSION@
-Libs: -L${libdir} -lar-gpr
+Libs: -L${libdir} -laudioreach-gpr
 Cflags: -I${includedir}

gsl/Android.mk

@@ -1,7 +1,7 @@
 LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
-LOCAL_MODULE := libar-gsl
+LOCAL_MODULE := libaudioreach-gsl
 LOCAL_MODULE_OWNER := qti
 LOCAL_MODULE_TAGS := optional
 LOCAL_VENDOR_MODULE := true
@@ -32,9 +32,9 @@ LOCAL_SRC_FILES := src/gsl_main.c \
 LOCAL_HEADER_LIBRARIES := libspf-headers
 LOCAL_SHARED_LIBRARIES := \
     liblx-osal\
-    libar-acdb\
+    libaudioreach-acdb\
     liblx-ar_util\
-    libar-gpr
+    libaudioreach-gpr
 
 LOCAL_C_INCLUDES := $(LOCAL_PATH)/api\
     $(LOCAL_PATH)/inc\

gsl/Makefile.am

@@ -58,18 +58,18 @@ gsl_c_sources = ./src/gsl_graph.c \
 lib_includedir = $(includedir)
 lib_include_HEADERS = $(gsl_sources)
 
-lib_LTLIBRARIES = libar-gsl.la
-libar_gsl_la_CC = @CC@
-libar_gsl_la_LIBADD = $(top_builddir)/acdb/libar-acdb.la $(top_builddir)/ar_osal/libar-osal.la $(top_builddir)/ar_util/libar-util.la $(top_builddir)/spf/libar-spfhdrs.la $(top_builddir)/gpr/libar-gpr.la
-libar_gsl_la_SOURCES = $(gsl_c_sources)
-libar_gsl_la_CFLAGS = $(AM_CFLAGS)
-libar_gsl_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@
+lib_LTLIBRARIES = libaudioreach-gsl.la
+libaudioreach_gsl_la_CC = @CC@
+libaudioreach_gsl_la_LIBADD = $(top_builddir)/acdb/libaudioreach-acdb.la $(top_builddir)/ar_osal/libaudioreach-osal.la $(top_builddir)/ar_util/libaudioreach-util.la $(top_builddir)/gpr/libaudioreach-gpr.la
+libaudioreach_gsl_la_SOURCES = $(gsl_c_sources)
+libaudioreach_gsl_la_CFLAGS = $(AM_CFLAGS)
+libaudioreach_gsl_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@
 
 if MDSP_PROC
-libar_gsl_la_CFLAGS += -DMDSP_PROC
+libaudioreach_gsl_la_CFLAGS += -DMDSP_PROC
 endif
 
 if USES_ATS_DATA_LOGGING
-libar_gsl_la_CFLAGS += -DATS_DATA_LOGGING
-libar_gsl_la_CPPFLAGS = -DATS_DATA_LOGGING
+libaudioreach_gsl_la_CFLAGS += -DATS_DATA_LOGGING
+libaudioreach_gsl_la_CPPFLAGS = -DATS_DATA_LOGGING
 endif

gsl/gsl.pc.in

@@ -6,5 +6,5 @@ includedir=@includedir@
 Name: gsl
 Description: gsl library
 Version: @LT_VERSION@
-Libs: -L${libdir} -lar-gsl
+Libs: -L${libdir} -laudioreach-gsl
 Cflags: -I${includedir}

public_headers/config.yml

@@ -21,8 +21,8 @@ branches:
           - spf/api/ar_utils/*.h
           - spf/api/ar_utils/generic/*.h
 abi_checks:
-  - path: build/usr/lib/libar-gsl.so
-  - path: build/usr/lib/libar-gpr.so
-  - path: build/usr/lib/libar-util.so
-  - path: build/usr/lib/libar-osal.so
-  - path: build/usr/lib/libar-acdb.so
+  - path: build/usr/lib/libaudioreach-gsl.so
+  - path: build/usr/lib/libaudioreach-gpr.so
+  - path: build/usr/lib/libaudioreach-util.so
+  - path: build/usr/lib/libaudioreach-osal.so
+  - path: build/usr/lib/libaudioreach-acdb.so

spf/Makefile.am

@@ -2,13 +2,6 @@ pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = spf.pc
 EXTRA_DIST = $(pkgconfig_DATA)
 
-AM_CFLAGS = -Wall -Werror
-AM_CFLAGS += -I ./api
-AM_CFLAGS += -I ./api/apm
-AM_CFLAGS += -I ./api/ar_utils
-AM_CFLAGS += -I ./api/modules
-AM_CFLAGS += -I ./api/vcpm
-
 spf_sources = ./api/apm/apm_api.h \
                 ./api/apm/apm_api_version.h \
                 ./api/apm/apm_container_api.h \
@@ -154,10 +147,3 @@ spf_include_HEADERS = $(spf_sources)
 
 asps_includedir = $(includedir)/spf/asps
 asps_include_HEADERS = $(asps_sources)
-
-#LIBRARY for LE apps
-lib_LTLIBRARIES = libar-spfhdrs.la
-libar_spfhdrs_la_CC = @CC@
-libar_spfhdrs_la_SOURCES = $(spf_sources) $(asps_sources)
-libar_spfhdrs_la_CFLAGS = $(AM_CFLAGS)
-libar_spfhdrs_la_LDFLAGS = -shared -version-number @LT_VERSION_NUMBER@

spf/spf.pc.in

@@ -4,7 +4,6 @@ libdir=@libdir@
 includedir=@includedir@
 
 Name: spf
-Description: spf library
+Description: spf headers
 Version: @LT_VERSION@
-Libs: -L${libdir} -lar-spfhdrs
 Cflags: -I${includedir}/spf -I${includedir}/spf/asps