Commit bfc43696 authored Mar 05, 2015 by Ying Wang

Reorder lib paths in transform-bc-to-so to avoid build race condition.

We should put the NDK library path before
$(TARGET_OUT_INTERMEDIATE_LIBRARIES), so that we link against the NDK
libc/libm, instead of the platform libc/libm in
$(TARGET_OUT_INTERMEDIATE_LIBRARIES), which may still being written out,
because we don't have dependency on them.

Bug: 19613709
Change-Id: I26a8b272e38b7436bca3324246b21cd71349662b

parent fc759204

core/definitions.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -885,7 +885,7 @@ $(hide) $(PRIVATE_CXX) -shared -Wl,-soname,$(notdir $@) -nostdlib \
		$(dir $@)/$(notdir $(<:.bc=.o)) \
		$(RS_PREBUILT_COMPILER_RT) \
		-o $@ $(TARGET_GLOBAL_LDFLAGS) -Wl,--hash-style=sysv -L prebuilts/gcc/ \
		-L $(TARGET_OUT_INTERMEDIATE_LIBRARIES) $(RS_PREBUILT_LIBPATH) \
		$(RS_PREBUILT_LIBPATH) -L $(TARGET_OUT_INTERMEDIATE_LIBRARIES) \
		-lRSSupport -lm -lc
		endef