commit f692513071705e6ea28b3edd47898e12fa67a6ff
author Stephen Hines <srhines@google.com> Mon Dec 17 14:23:14 2012 -0800
committer Stephen Hines <srhines@google.com> Mon Dec 17 17:59:47 2012 -0800
tree 73a4607c92d00c87f9c6e059957e8180046afc68
parent 2db56364523c9af650729d0c9ef9ab3cae0ed847

Clean up libRSSupport.so and libclcore.bc dependencies.

Bug: 7419958
Change-Id: I62453bb6830cc2c82ca9dbbf576b52da95eef4b1

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index 93810ef..e216a70 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -822,9 +822,10 @@
 define transform-bc-to-so
 @echo "Renderscript compatibility"
 $(hide) mkdir -p $(dir $@)
-$(hide) $(BCC_COMPAT) -o $(dir $@)/$(notdir $(<:.bc=.o)) -fPIC -shared \
-	-rt-path $(TARGET_OUT_SHARED_LIBRARIES)/libclcore.bc $<
+$(hide) $(BCC_COMPAT) -O3 -o $(dir $@)/$(notdir $(<:.bc=.o)) -fPIC -shared \
+	-rt-path $(PRIVATE_LIBCLCORE) $<
 $(hide) $(PRIVATE_CXX) -shared -Wl,-soname,$(notdir $@) -nostdlib \
+	-Wl,-rpath,\$$ORIGIN/../lib \
 	$(dir $@)/$(notdir $(<:.bc=.o)) -o $@ -L prebuilts/gcc/ \
 	-L $(TARGET_OUT_INTERMEDIATE_LIBRARIES) -lRSSupport -lm
 endef