Use only hal-rootstrap package to build

hal-roostrap package contains the allowed and maintained files
to build hal-backend package. In order to keep ABI (Application Binary
Interface) compatibility between platform and hal image,
must use only hal-rootstrap package for build.

Change-Id: Ib2caf87584292472c0f55b1b6997141ac7bb3bac
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>

diff --git a/Makefile.am b/Makefile.am
index ef2583ecd32afd47b9ddbbcab0fa7bbcef516fbb..fc8b23335f374f6d26e8cc13893e0b2788505d2e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,8 +12,8 @@ libhal_backend_audio_la_SOURCES = tizen-audio.c \
                tizen-audio-impl-ctrl.c \
                hal-backend-audio.c
 libhal_backend_audio_la_LDFLAGS = $(AM_LDFLAGS) -disable-static -avoid-version
-libhal_backend_audio_la_LIBADD = $(AM_LDADD) $(ASOUNDLIB_LIBS) $(VCONF_LIBS) $(DLOG_LIBS) $(INIPARSER_LIBS)
-libhal_backend_audio_la_CFLAGS = $(AM_CFLAGS) $(ASOUNDLIB_CFLAGS) $(VCONF_CFLAGS) $(DLOG_CFLAGS) $(INIPARSER_CFLAGS) $(HALAPICOMMON) -DUSE_DLOG
+libhal_backend_audio_la_LIBADD = $(AM_LDADD) $(HALROOTSTRAP_LIBS)
+libhal_backend_audio_la_CFLAGS = $(AM_CFLAGS) $(HALROOTSTRAP_CFLAGS) -DUSE_DLOG
 
 if USE_TINYALSA
 libhal_backend_audio_la_LIBADD += $(TINYALSA_LIBS)

diff --git a/configure.ac b/configure.ac
index a64267c3e1d9d16ac66aef769fab5815ad8aabff..4be1e48f2bc9cf9d26b407eb87795364e6e8376d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -21,10 +21,9 @@ AC_PROG_MAKE_SET
 PKG_PROG_PKG_CONFIG
 
 # Checks for libraries.
-
-PKG_CHECK_MODULES(ASOUNDLIB, alsa >= 1.0.24)
-AC_SUBST(ASOUNDLIB_CFLAGS)
-AC_SUBST(ASOUNDLIB_LIBS)
+PKG_CHECK_MODULES(HALROOTSTRAP, hal-rootstrap)
+AC_SUBST(HALROOTSTRAP_CFLAGS)
+AC_SUBST(HALROOTSTRAP_LIBS)
 
 if test $USE_TINYALSA = "1"; then
 PKG_CHECK_MODULES(TINYALSA, tinyalsa)
@@ -35,14 +34,6 @@ else
 AM_CONDITIONAL(USE_TINYALSA, false)
 fi
 
-PKG_CHECK_MODULES(DLOG, dlog)
-AC_SUBST(DLOG_CFLAGS)
-AC_SUBST(DLOG_LIBS)
-
-PKG_CHECK_MODULES(HALAPICOMMON, hal-api-common)
-AC_SUBST(HALAPICOMMON_CFLAGS)
-AC_SUBST(HALAPICOMMON_LIBS)
-
 # Checks for header files.
 
 # Checks for typedefs, structures, and compiler characteristics.

diff --git a/packaging/audio-hal-bcm2837.spec b/packaging/audio-hal-bcm2837.spec
index 415c1facaa4791c984c060e061ef194536773dce..5213c59c5eecab44a44bbcf1c5b140c9f03fdcac 100644 (file)
--- a/packaging/audio-hal-bcm2837.spec
+++ b/packaging/audio-hal-bcm2837.spec
@@ -6,10 +6,7 @@ Group:      System/Libraries
 License:    Apache-2.0
 URL:        http://tizen.org
 Source0:    audio-hal-bcm2837-%{version}.tar.gz
-BuildRequires: pkgconfig(dlog)
-BuildRequires: pkgconfig(alsa)
-BuildRequires: pkgconfig(hal-api-common)
-BuildRequires: pkgconfig(hal-api-audio)
+BuildRequires: pkgconfig(hal-rootstrap)
 #BuildRequires: pkgconfig(tinyalsa)
 Provides: libhal-backend-audio.so
 

diff --git a/tizen-audio-internal.h b/tizen-audio-internal.h
index 48619c60830ca0537db37da68fa275b390f3c09d..212d147641c39e5150b5ab46151aa006b3676b4b 100644 (file)
--- a/tizen-audio-internal.h
+++ b/tizen-audio-internal.h
@@ -43,11 +43,11 @@
 #undef DLOG_TAG
 #endif
 #define DLOG_TAG "AUDIO_HAL"
-#define AUDIO_LOG_ERROR(...)            SLOG(LOG_ERROR, DLOG_TAG, __VA_ARGS__)
-#define AUDIO_LOG_WARN(...)             SLOG(LOG_WARN, DLOG_TAG, __VA_ARGS__)
-#define AUDIO_LOG_INFO(...)             SLOG(LOG_INFO, DLOG_TAG, __VA_ARGS__)
-#define AUDIO_LOG_DEBUG(...)            SLOG(LOG_DEBUG, DLOG_TAG, __VA_ARGS__)
-#define AUDIO_LOG_VERBOSE(...)          SLOG(LOG_DEBUG, DLOG_TAG, __VA_ARGS__)
+#define AUDIO_LOG_ERROR(...)            dlog_print(DLOG_ERROR, DLOG_TAG, __VA_ARGS__)
+#define AUDIO_LOG_WARN(...)             dlog_print(DLOG_WARN, DLOG_TAG, __VA_ARGS__)
+#define AUDIO_LOG_INFO(...)             dlog_print(DLOG_INFO, DLOG_TAG, __VA_ARGS__)
+#define AUDIO_LOG_DEBUG(...)            dlog_print(DLOG_DEBUG, DLOG_TAG, __VA_ARGS__)
+#define AUDIO_LOG_VERBOSE(...)          dlog_print(DLOG_DEBUG, DLOG_TAG, __VA_ARGS__)
 #else
 #define AUDIO_LOG_ERROR(...)            fprintf(stderr, __VA_ARGS__)
 #define AUDIO_LOG_WARN(...)             fprintf(stderr, __VA_ARGS__)