commit b9a4e1eeea0b28642371c01392f553e9f416f4ba
author Ying Wang <wangying@google.com> Wed Feb 20 01:15:31 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Feb 20 01:15:31 2013 +0000
tree d4fef8b7bff48ca3a14216b902b41b15ffa20842
parent de920d4f74248cf19e36c2214100c023065110f5
parent d3aab738deea997b699a3b29733ccdc0107b334a

Merge "Use BUILD_PREBUILT to install the cmds."

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index e5f5dba..1db8a83 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -206,7 +206,7 @@
     $(renderscript_intermediate)/res/raw/, $(bc_files))
 
 rs_compatibility_jni_libs := $(addprefix \
-    $(renderscript_intermediate)/lib, \
+    $(renderscript_intermediate)/librs., \
     $(patsubst %.bc,%.so, $(bc_files)))
 
 $(rs_generated_bc) : $(RenderScript_file_stamp)
@@ -231,7 +231,7 @@
 $(rs_compatibility_jni_libs): PRIVATE_LIBCLCORE := $(rs_built_clcore)
 $(rs_compatibility_jni_libs): PRIVATE_COMPILER_RT := $(rs_compiler_rt)
 $(rs_compatibility_jni_libs): PRIVATE_LIBPATH := $(rs_extra_libpath)
-$(rs_compatibility_jni_libs): $(renderscript_intermediate)/lib%.so: \
+$(rs_compatibility_jni_libs): $(renderscript_intermediate)/librs.%.so: \
     $(renderscript_intermediate)/res/raw/%.bc
 	$(transform-bc-to-so)
 
@@ -271,7 +271,7 @@
 # Provide a way to skip sources included in multiple projects.
 ifdef LOCAL_RENDERSCRIPT_SKIP_INSTALL
 skip_install_rs_libs := $(patsubst %.rs,%.so, \
-    $(addprefix $(TARGET_OUT_SHARED_LIBRARIES)/lib, \
+    $(addprefix $(TARGET_OUT_SHARED_LIBRARIES)/librs., \
     $(notdir $(LOCAL_RENDERSCRIPT_SKIP_INSTALL))))
 installed_rs_compatibility_jni_libs := \
     $(filter-out $(skip_install_rs_libs),$(installed_rs_compatibility_jni_libs))