Multiprocessor build fails for cocos2d-x (fix included)

Please see my resolved issue on google:
http://code.google.com/p/android/issues/detail?id=23609

Description:
On my machine MP build works about 25 seconds against 2:45 in single threaded mode (default in cocos2d-x).

What I applied to fix this finally:
# In …mk I changed this:

LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../../libs/$(TARGET_ARCH_ABI)) \
-lcocos2d -llog -lgame_logic

to this:

LOCAL_LDLIBS := -L$(call host-path, $(LOCAL_PATH)/../../libs/$(TARGET_ARCH_ABI)) -llog
LOCAL_SHARED_LIBRARIES := libcocos2d libgame_logic
  1. Also in …mk changed this:
    <pre>
    LOCAL_LDLIBS := ~~L$/…/android/libs/$) ~~lcocos2d ~~lcocosdenshion ~~L$(call host-path, $(LOCAL_PATH)/…/…/cocos2dx/platform/third_party/android/libraries/$(TARGET_ARCH_ABI)) ~~lcurl
    </pre>
    to this:
    <pre>
    LOCAL_LDLIBS :=~~L$(call host-path, $(LOCAL_PATH)/…/android/libs/$(TARGET_ARCH_ABI)) ~~L$/cocos2dx/platform/third_party/android/libraries/$)~~lcurl
    LOCAL_SHARED_LIBRARIES := libcocos2d cocosdenshion
    </pre>
    You might note that I have explicitly specified $(COCOS_PATH) variable, but it is not related to issue. We just need specify libraries as LOCAL_SHARED_LIBRARIES for build to take into account what depends on what.