diff options
| author | Jason Sams <rjsams@android.com> | 2009-07-23 16:10:46 -0700 |
|---|---|---|
| committer | Jason Sams <rjsams@android.com> | 2009-07-23 16:10:46 -0700 |
| commit | 8af858e9b6577d074c5427e601b6418d288fdb9d (patch) | |
| tree | 1517f3730e0163b18c3dde4a66acc12a076ffb09 | |
| parent | e29d471e5ca9781d8772d445ec7832e94856fd14 (diff) | |
| download | frameworks_base-8af858e9b6577d074c5427e601b6418d288fdb9d.zip frameworks_base-8af858e9b6577d074c5427e601b6418d288fdb9d.tar.gz frameworks_base-8af858e9b6577d074c5427e601b6418d288fdb9d.tar.bz2 | |
Unbreak build by making the build of renderscript again conditional on BUILD_RENDERSCRIPT until we can figure out why the build servers see an error that does not reproduce locally.
| -rw-r--r-- | graphics/jni/Android.mk | 5 | ||||
| -rw-r--r-- | libs/rs/Android.mk | 5 |
2 files changed, 6 insertions, 4 deletions
diff --git a/graphics/jni/Android.mk b/graphics/jni/Android.mk index c0279b6..a19134d 100644 --- a/graphics/jni/Android.mk +++ b/graphics/jni/Android.mk @@ -1,3 +1,5 @@ +ifeq ($(BUILD_RENDERSCRIPT),true) + LOCAL_PATH:= $(call my-dir) include $(CLEAR_VARS) @@ -27,10 +29,11 @@ LOCAL_C_INCLUDES += \ LOCAL_CFLAGS += LOCAL_LDLIBS := -lpthread - LOCAL_ADDITIONAL_DEPENDENCIES := $(addprefix $(rs_generated_include_dir)/,rsgApiFuncDecl.h) LOCAL_MODULE:= librs_jni LOCAL_ADDITIONAL_DEPENDENCIES += $(rs_generated_source) LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) + +endif diff --git a/libs/rs/Android.mk b/libs/rs/Android.mk index d24a92c..6b11a25 100644 --- a/libs/rs/Android.mk +++ b/libs/rs/Android.mk @@ -1,3 +1,5 @@ +ifeq ($(BUILD_RENDERSCRIPT),true) + LOCAL_PATH:=$(call my-dir) @@ -103,13 +105,10 @@ LOCAL_SRC_FILES:= \ LOCAL_SHARED_LIBRARIES += libcutils libutils libEGL libGLESv1_CM libui libacc LOCAL_LDLIBS := -lpthread -ldl LOCAL_MODULE:= libRS - LOCAL_MODULE_TAGS := optional include $(BUILD_SHARED_LIBRARY) -ifeq ($(BUILD_RENDERSCRIPT),true) - # Include the subdirectories ==================== include $(addprefix $(LOCAL_PATH)/,$(addsuffix /Android.mk,\ java \ |