Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am f6dd9c53: Merge "On-device linking." into honeycomb

Browse Source 
* commit 'f6dd9c539c1b18f65674b495cb23bf2df36da7af':
  On-device linking.
This commit is contained in:
Shih-wei Liao
2011-01-13 02:07:39 -08:00
committed by Android Git Automerger
parent 9b024b693e f6dd9c539c
commit faf88e2d9d
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
libs/rs/Android.mk
View File

@@ -27,9 +27,13 @@ include $(CLEAR_VARS)
input_data_file := $(LOCAL_PATH)/rslib.bc input_data_file := $(LOCAL_PATH)/rslib.bc
slangdata_output_var_name := rs_runtime_lib_bc slangdata_output_var_name := rs_runtime_lib_bc
LOCAL_MODULE := librslib_rt LOCAL_MODULE := librslib_rt
LOCAL_PRELINK_MODULE := false
LOCAL_MODULE_CLASS := SHARED_LIBRARIES
LOCAL_MODULE_TAGS := optional LOCAL_MODULE_TAGS := optional
include frameworks/compile/slang/SlangData.mk include frameworks/compile/slang/SlangData.mk
include $(BUILD_STATIC_LIBRARY) include $(BUILD_SHARED_LIBRARY)
# Build render script lib ==================== # Build render script lib ====================

2
libs/rs/rsScriptC.cpp
View File

@@ -428,7 +428,7 @@ void ScriptCState::runCompiler(Context *rsc,
// Handle Fatal Error // Handle Fatal Error
} }
#if 0 #if 1
if (bccLinkBC(s->mBccScript, if (bccLinkBC(s->mBccScript,
rs_runtime_lib_bc, rs_runtime_lib_bc,
rs_runtime_lib_bc_size) != 0) { rs_runtime_lib_bc_size) != 0) {