diff options
| author | Shih-wei Liao <sliao@google.com> | 2011-01-13 02:04:00 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-01-13 02:04:00 -0800 |
| commit | f6dd9c539c1b18f65674b495cb23bf2df36da7af (patch) | |
| tree | d3a364e81e92b93c1227c064a2b9683b2461354f | |
| parent | 3ae5017b1bc2910610194cc8790e8d96516ac9b5 (diff) | |
| parent | 067e7b261a9fedab9217fc9d4baa76ba577636c2 (diff) | |
| download | frameworks_base-f6dd9c539c1b18f65674b495cb23bf2df36da7af.zip frameworks_base-f6dd9c539c1b18f65674b495cb23bf2df36da7af.tar.gz frameworks_base-f6dd9c539c1b18f65674b495cb23bf2df36da7af.tar.bz2 | |
Merge "On-device linking." into honeycomb
| -rw-r--r-- | libs/rs/Android.mk | 6 | ||||
| -rw-r--r-- | libs/rs/rsScriptC.cpp | 2 |
2 files changed, 6 insertions, 2 deletions
diff --git a/libs/rs/Android.mk b/libs/rs/Android.mk index c2e58b6..d0cbbbd 100644 --- a/libs/rs/Android.mk +++ b/libs/rs/Android.mk @@ -27,9 +27,13 @@ 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 := SHARED_LIBRARIES + LOCAL_MODULE_TAGS := optional include frameworks/compile/slang/SlangData.mk -include $(BUILD_STATIC_LIBRARY) +include $(BUILD_SHARED_LIBRARY) # Build render script lib ==================== diff --git a/libs/rs/rsScriptC.cpp b/libs/rs/rsScriptC.cpp index 5dd976a..55ee9ca 100644 --- a/libs/rs/rsScriptC.cpp +++ b/libs/rs/rsScriptC.cpp @@ -428,7 +428,7 @@ void ScriptCState::runCompiler(Context *rsc, // Handle Fatal Error } -#if 0 +#if 1 if (bccLinkBC(s->mBccScript, rs_runtime_lib_bc, rs_runtime_lib_bc_size) != 0) { |