Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

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
3  build_config/opencore_dynamic/Android_opencore_author.mk
@@ -8,6 +8,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
8 8
9 9 LOCAL_WHOLE_STATIC_LIBRARIES += libandroidpvauthor
10 10
  11 +# to solve circular dependency among the static libraries.
  12 +LOCAL_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES) $(LOCAL_WHOLE_STATIC_LIBRARIES)
  13 +
11 14 LOCAL_MODULE := libopencore_author
12 15
13 16 -include $(PV_TOP)/Android_platform_extras.mk
3  build_config/opencore_dynamic/Android_opencore_common.mk
@@ -40,6 +40,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
40 40 libpvwav \
41 41 libpvfileparserutils
42 42
  43 +# to solve circular dependency among the static libraries.
  44 +LOCAL_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES) $(LOCAL_WHOLE_STATIC_LIBRARIES)
  45 +
43 46 LOCAL_MODULE := libopencore_common
44 47
45 48 -include $(PV_TOP)/Android_platform_extras.mk
3  build_config/opencore_dynamic/Android_opencore_net_support.mk
@@ -10,6 +10,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
10 10 libprotocolenginenode_pdl \
11 11 libprotocolenginenode_ps
12 12
  13 +# to solve circular dependency among the static libraries.
  14 +LOCAL_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES) $(LOCAL_WHOLE_STATIC_LIBRARIES)
  15 +
13 16 LOCAL_MODULE := libopencore_net_support
14 17
15 18 -include $(PV_TOP)/Android_platform_extras.mk
3  build_config/opencore_dynamic/Android_opencore_player.mk
@@ -24,6 +24,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
24 24
25 25 LOCAL_WHOLE_STATIC_LIBRARIES += libandroidpv
26 26
  27 +# to solve circular dependency among the static libraries.
  28 +LOCAL_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES) $(LOCAL_WHOLE_STATIC_LIBRARIES)
  29 +
27 30 LOCAL_MODULE := libopencore_player
28 31
29 32 -include $(PV_TOP)/Android_platform_extras.mk
3  build_config/opencore_dynamic/Android_opencore_rtsp.mk
@@ -14,6 +14,9 @@ LOCAL_WHOLE_STATIC_LIBRARIES := \
14 14 libpvmedialayernode \
15 15 libpvsdpparser
16 16
  17 +# to solve circular dependency among the static libraries.
  18 +LOCAL_STATIC_LIBRARIES := $(LOCAL_STATIC_LIBRARIES) $(LOCAL_WHOLE_STATIC_LIBRARIES)
  19 +
17 20 LOCAL_MODULE := libopencore_rtsp
18 21
19 22 -include $(PV_TOP)/Android_platform_extras.mk

0 comments on commit 094da15

Please sign in to comment.
Something went wrong with that request. Please try again.