summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Shih-wei Liao <sliao@google.com> 2011-01-14 04:37:59 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 2011-01-14 04:37:59 -0800
commit47fcc7ee7e5efd3200773ddb50755f0c4071e801 (patch)
tree6c6edd92f8db248e62f894136eab7153947a69f1
parent1916e7f3a341f9b25571ca4bde8ea1d8a22d815a (diff)
parent307bf62dd54a58e9dcd91b375357e9bb9e3fdbf0 (diff)
Merge "Avoid converting rslib.bc to things like rslib.h. So we are less error-prone." into honeycomb
-rw-r--r--libs/rs/Android.mk18
1 files changed, 9 insertions, 9 deletions
diff --git a/libs/rs/Android.mk b/libs/rs/Android.mk
index d8d70c67f44d..ffc1290666e2 100644
--- a/libs/rs/Android.mk
+++ b/libs/rs/Android.mk
@@ -23,17 +23,17 @@ include $(BUILD_HOST_EXECUTABLE)
# TODO: This should go into build/core/config.mk
RSG_GENERATOR:=$(LOCAL_BUILT_MODULE)
-include $(CLEAR_VARS)
-input_data_file := $(LOCAL_PATH)/rslib.bc
-slangdata_output_var_name := rs_runtime_lib_bc
-LOCAL_MODULE := librslib_rt
+# include $(CLEAR_VARS)
+# input_data_file := $(LOCAL_PATH)/rslib.bc
+# slangdata_output_var_name := rs_runtime_lib_bc
+# LOCAL_MODULE := librslib_rt
-LOCAL_PRELINK_MODULE := false
-LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+# LOCAL_PRELINK_MODULE := false
+# LOCAL_MODULE_CLASS := STATIC_LIBRARIES
-LOCAL_MODULE_TAGS := optional
-include frameworks/compile/slang/SlangData.mk
-include $(BUILD_STATIC_LIBRARY)
+# LOCAL_MODULE_TAGS := optional
+# include frameworks/compile/slang/SlangData.mk
+# include $(BUILD_STATIC_LIBRARY)
# Build render script lib ====================