Merge change 20640

* changes: build libRS
2009-08-10 14:06:22 -07:00
parent ccf8b94169 01e5fbd721
commit c028d09409
2 changed files with 1 additions and 4 deletions
--- a/graphics/jni/Android.mk
+++ b/graphics/jni/Android.mk
@@ -1,4 +1,3 @@
-ifeq ($(BUILD_RENDERSCRIPT),true)

 LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
@@ -33,7 +32,7 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(addprefix $(rs_generated_include_dir)/,rsgApi
 LOCAL_MODULE:= librs_jni
 LOCAL_ADDITIONAL_DEPENDENCIES += $(rs_generated_source)
 LOCAL_MODULE_TAGS := optional
+LOCAL_REQUIRED_MODULES := libRS

 include $(BUILD_SHARED_LIBRARY)

-endif
--- a/libs/rs/Android.mk
+++ b/libs/rs/Android.mk
@@ -1,4 +1,3 @@
-ifeq ($(BUILD_RENDERSCRIPT),true)

 LOCAL_PATH:=$(call my-dir)

@@ -116,4 +115,3 @@ include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk,\
            java \
    	))

-endif