commit 1a6f09a48c2047a6611b3f01088530b2ec895f7b
author Tim Murray <timmurray@google.com> Tue Mar 05 11:07:15 2013 -0800
committer Tim Murray <timmurray@google.com> Wed Mar 06 17:15:26 2013 -0800
tree b5a75f6c9a371cd9f9af6885d7425e103f328473
parent 42e05e040e18367a4597564533c1af5642ebf79c

Add support for multiple architectures with RS compat lib.

Change-Id: I310f6f72e1124c06e9c59b0f59d33f168dc1e632

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index e895f95..2cf5283 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -826,13 +826,13 @@
 @echo "Renderscript compatibility: $(notdir $@) <= $(notdir $<)"
 $(hide) mkdir -p $(dir $@)
 $(hide) $(BCC_COMPAT) -O3 -o $(dir $@)/$(notdir $(<:.bc=.o)) -fPIC -shared \
-	-rt-path $(PRIVATE_LIBCLCORE) $<
+	-rt-path $(RS_PREBUILT_CLCORE) -mtriple $(RS_TRIPLE) $<
 $(hide) $(PRIVATE_CXX) -shared -Wl,-soname,$(notdir $@) -nostdlib \
 	-Wl,-rpath,\$$ORIGIN/../lib \
 	$(dir $@)/$(notdir $(<:.bc=.o)) \
-	$(PRIVATE_COMPILER_RT) \
+	$(RS_PREBUILT_COMPILER_RT) \
 	-o $@ -L prebuilts/gcc/ \
-	-L $(TARGET_OUT_INTERMEDIATE_LIBRARIES) $(PRIVATE_LIBPATH) \
+	-L $(TARGET_OUT_INTERMEDIATE_LIBRARIES) $(RS_PREBUILT_LIBPATH) \
 	-lRSSupport -lm
 endef