Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f6dd9c53 authored by Shih-wei Liao's avatar Shih-wei Liao Committed by Android (Google) Code Review
Browse files

Merge "On-device linking." into honeycomb

parents 3ae5017b 067e7b26

libs/rs/Android.mk

+5 −1
Original line number Diff line number Diff line
@@ -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 ====================

libs/rs/rsScriptC.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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) {