Merge "Fix intermittent Mac build errors." into eclair

aosp-mirror · Feb 11, 2010 · 031db87 · 031db87
2 parents 5b11918 + c1cb65d
commit 031db87
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 0 deletions.
diff --git a/build_config/opencore_dynamic/Android_opencore_author.mk b/build_config/opencore_dynamic/Android_opencore_author.mk
@@ -8,6 +8,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
 
 LOCAL_WHOLE_STATIC_LIBRARIES +=  libandroidpvauthor
 
+# to solve circular dependency among the static libraries.
+LOCAL_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES) $(LOCAL_WHOLE_STATIC_LIBRARIES)
+
 LOCAL_MODULE := libopencore_author
 
 -include $(PV_TOP)/Android_platform_extras.mk

diff --git a/build_config/opencore_dynamic/Android_opencore_common.mk b/build_config/opencore_dynamic/Android_opencore_common.mk
@@ -40,6 +40,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
  	libpvwav \
  	libpvfileparserutils
 
+# to solve circular dependency among the static libraries.
+LOCAL_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES) $(LOCAL_WHOLE_STATIC_LIBRARIES)
+
 LOCAL_MODULE := libopencore_common
 
 -include $(PV_TOP)/Android_platform_extras.mk

diff --git a/build_config/opencore_dynamic/Android_opencore_net_support.mk b/build_config/opencore_dynamic/Android_opencore_net_support.mk
@@ -10,6 +10,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
  	libprotocolenginenode_pdl \
  	libprotocolenginenode_ps
 
+# to solve circular dependency among the static libraries.
+LOCAL_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES) $(LOCAL_WHOLE_STATIC_LIBRARIES)
+
 LOCAL_MODULE := libopencore_net_support
 
 -include $(PV_TOP)/Android_platform_extras.mk

diff --git a/build_config/opencore_dynamic/Android_opencore_player.mk b/build_config/opencore_dynamic/Android_opencore_player.mk
@@ -24,6 +24,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
 
 LOCAL_WHOLE_STATIC_LIBRARIES +=  libandroidpv
 
+# to solve circular dependency among the static libraries.
+LOCAL_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES) $(LOCAL_WHOLE_STATIC_LIBRARIES)
+
 LOCAL_MODULE := libopencore_player
 
 -include $(PV_TOP)/Android_platform_extras.mk

diff --git a/build_config/opencore_dynamic/Android_opencore_rtsp.mk b/build_config/opencore_dynamic/Android_opencore_rtsp.mk
@@ -14,6 +14,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
  	libpvmedialayernode \
  	libpvsdpparser
 
+# to solve circular dependency among the static libraries.
+LOCAL_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES) $(LOCAL_WHOLE_STATIC_LIBRARIES)
+
 LOCAL_MODULE := libopencore_rtsp
 
 -include $(PV_TOP)/Android_platform_extras.mk