Fix intermittent Mac build errors.
See http://b/issue?id=2391369
diff --git a/build_config/opencore_dynamic/Android_opencore_author.mk b/build_config/opencore_dynamic/Android_opencore_author.mk
index c7e14eb..8b0aa51 100644
--- 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 += 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
index ba0a3a1..c69782b 100644
--- a/build_config/opencore_dynamic/Android_opencore_common.mk
+++ b/build_config/opencore_dynamic/Android_opencore_common.mk
@@ -40,6 +40,9 @@
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
index 172c909..8550ccc 100644
--- a/build_config/opencore_dynamic/Android_opencore_net_support.mk
+++ b/build_config/opencore_dynamic/Android_opencore_net_support.mk
@@ -10,6 +10,9 @@
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
index 33fdaff..7234b19 100644
--- 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 += 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
index e72f0ce..81aec3b 100644
--- a/build_config/opencore_dynamic/Android_opencore_rtsp.mk
+++ b/build_config/opencore_dynamic/Android_opencore_rtsp.mk
@@ -14,6 +14,9 @@
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
