From 01e5fbd721f879679be66e43b9f671c0d39b89a2 Mon Sep 17 00:00:00 2001
From: Joe Onorato <joeo@android.com>
Date: Mon, 10 Aug 2009 14:06:01 -0700
Subject: [PATCH] build libRS

---
 graphics/jni/Android.mk | 3 +--
 libs/rs/Android.mk      | 2 --
 2 files changed, 1 insertion(+), 4 deletions(-)

diff --git a/graphics/jni/Android.mk b/graphics/jni/Android.mk
index a19134da6adbd..a6abd8ce51879 100644
--- 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
diff --git a/libs/rs/Android.mk b/libs/rs/Android.mk
index 3234f39c65299..978d975f7ef62 100644
--- 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
\ No newline at end of file