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 | 5e172b0817603d4ef0d7e80221a2cc4ecea1fb1b (patch) | |
| tree | 5ecdf3e822e5a5c3caddbf6fb062e49d07f7ca52 /Android.mk | |
| parent | 0e5224f76a29aaecd4a694900c4a949aab31f62c (diff) | |
| download | android_frameworks_rs-5e172b0817603d4ef0d7e80221a2cc4ecea1fb1b.tar.gz android_frameworks_rs-5e172b0817603d4ef0d7e80221a2cc4ecea1fb1b.tar.bz2 android_frameworks_rs-5e172b0817603d4ef0d7e80221a2cc4ecea1fb1b.zip | |
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.
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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 \ |