Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

am 031db87: Merge "Fix intermittent Mac build errors." into eclair

Merge commit '031db8796b5140efb30b21671f32d12137989834'

* commit '031db8796b5140efb30b21671f32d12137989834':
  Fix intermittent Mac build errors.
  • Loading branch information...
commit 094da15ee5df62b8ca09677e83ad19615cd756e4 2 parents 918c415 + 031db87
Ying Wang authored Android Git Automerger committed
View
3  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
View
3  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
View
3  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
View
3  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
View
3  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
Please sign in to comment.
Something went wrong with that request. Please try again.