don't hardcode compilation options based on product/target names

This provides a way for board files to specify libraries/flags for
hardware codecs, etc, though really this should not require compile
time options -- somebody who understands opencore should fix it to
deal with this gracefully at runtime.

This fixes the htc_dream build.

diff --git a/android/author/Android.mk b/android/author/Android.mk
index 8f107c0..0910aeb 100644 (file)
--- a/android/author/Android.mk
+++ b/android/author/Android.mk
@@ -13,9 +13,8 @@ LOCAL_SRC_FILES := \
 
 LOCAL_CFLAGS := $(PV_CFLAGS)
 
-ifeq ($(TARGET_DEVICE),dream)
-LOCAL_CFLAGS += -DHARDWARE_OMX=1
-endif
+# board-specific configuration
+LOCAL_CFLAGS += $(BOARD_OPENCORE_FLAGS)
 
 LOCAL_ARM_MODE := arm
 

diff --git a/codecs_v2/omx/omx_common/Android.mk b/codecs_v2/omx/omx_common/Android.mk
index 463fa13..9926d2b 100755 (executable)
--- a/codecs_v2/omx/omx_common/Android.mk
+++ b/codecs_v2/omx/omx_common/Android.mk
@@ -14,9 +14,8 @@ LOCAL_MODULE := libomx_common_lib
 
 LOCAL_CFLAGS :=   $(PV_CFLAGS)
 
-ifeq ($(TARGET_DEVICE),dream)
-LOCAL_CFLAGS += -DHARDWARE_OMX=1
-endif
+# board-specific configuration
+LOCAL_CFLAGS += $(BOARD_OPENCORE_FLAGS)
 
 LOCAL_ARM_MODE := arm
 

diff --git a/pvauthor/Android.mk b/pvauthor/Android.mk
index 50f7bf3..c823602 100644 (file)
--- a/pvauthor/Android.mk
+++ b/pvauthor/Android.mk
@@ -27,11 +27,8 @@ ifneq ($(TARGET_SIMULATOR),true)
 LOCAL_SHARED_LIBRARIES += libdl
 endif
 
-# Include Qualcomm codec
-ifeq ($(TARGET_DEVICE),dream)
-LOCAL_SHARED_LIBRARIES += libOmxCore
-endif
-
+# Include board-specific extensions
+LOCAL_SHARED_LIBRARIES += $(BOARD_OPENCORE_LIBRARIES)
 
 LOCAL_MODULE := libopencoreauthor
 

diff --git a/pvcommon/Android.mk b/pvcommon/Android.mk
index c3fffb6..2cc646e 100644 (file)
--- a/pvcommon/Android.mk
+++ b/pvcommon/Android.mk
@@ -33,10 +33,8 @@ ifneq ($(TARGET_SIMULATOR),true)
 LOCAL_SHARED_LIBRARIES += libdl
 endif
 
-# Include Qualcomm codec
-ifeq ($(TARGET_DEVICE),dream)
-LOCAL_SHARED_LIBRARIES += libOmxCore
-endif
+# Include board-specific extensions
+LOCAL_SHARED_LIBRARIES += $(BOARD_OPENCORE_LIBRARIES)
 
 
 LOCAL_MODULE := libopencorecommon

diff --git a/pvplayer/Android.mk b/pvplayer/Android.mk
index dc8bdca..69d952d 100644 (file)
--- a/pvplayer/Android.mk
+++ b/pvplayer/Android.mk
@@ -61,10 +61,8 @@ ifneq ($(TARGET_SIMULATOR),true)
 LOCAL_SHARED_LIBRARIES += libdl
 endif
 
-# Include Qualcomm codec
-ifeq ($(TARGET_DEVICE),dream)
-LOCAL_SHARED_LIBRARIES += libOmxCore
-endif
+# Include board-specific extensions
+LOCAL_SHARED_LIBRARIES += $(BOARD_OPENCORE_LIBRARIES)
 
 
 LOCAL_MODULE := libopencoreplayer