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

Commit bc512021 authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 8279 

* changes:
  Move the java and jni renderscript files to the proper location.
parents b3167dc3 e29d471e

libs/rs/java/RenderScript/android/renderscript/Matrix.java→graphics/java/android/renderscript/Matrix.java

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ import java.lang.Math; 
import android.util.Log;





/**

 * @hide

 *

 **/

public class Matrix {



    public Matrix() {

libs/rs/java/RenderScript/android/renderscript/ProgramVertexAlloc.java→graphics/java/android/renderscript/ProgramVertexAlloc.java

+4 −0
Original line number Diff line number Diff line
@@ -20,6 +20,10 @@ import java.lang.Math; 
import android.util.Log;





/**

 * @hide

 *

 **/

public class ProgramVertexAlloc {

    public static final int MODELVIEW_OFFSET = 0;

    public static final int PROJECTION_OFFSET = 16;

libs/rs/java/RenderScript/android/renderscript/RSSurfaceView.java→graphics/java/android/renderscript/RSSurfaceView.java

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ import android.view.Surface; 
import android.view.SurfaceHolder;

import android.view.SurfaceView;



/**

 * @hide

 *

 **/

public class RSSurfaceView extends SurfaceView implements SurfaceHolder.Callback {

    private SurfaceHolder mSurfaceHolder;

libs/rs/java/RenderScript/android/renderscript/RenderScript.java→graphics/java/android/renderscript/RenderScript.java

+9 −1
Original line number Diff line number Diff line
@@ -14,6 +14,10 @@ 
 * limitations under the License.

 */



/**

 * @hide

 *

 **/

package android.renderscript;



import java.io.InputStream;
@@ -31,6 +35,10 @@ import android.view.Surface; 
import android.graphics.Bitmap;

import android.graphics.Color;



/**

 * @hide

 *

 **/

public class RenderScript {

    static final String LOG_TAG = "libRS_jni";

    private static final boolean DEBUG  = false;
@@ -48,7 +56,7 @@ public class RenderScript { 
    static {

        sInitialized = false;

        try {

            System.loadLibrary("RS_jni");

            System.loadLibrary("rs_jni");

            _nInit();

            sInitialized = true;

        } catch (UnsatisfiedLinkError e) {

libs/rs/jni/Android.mk→graphics/jni/Android.mk

+7 −7
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ LOCAL_PATH:=$(call my-dir) 
include $(CLEAR_VARS)



LOCAL_SRC_FILES:= \

	RenderScript_jni.cpp

    android_renderscript_RenderScript.cpp



LOCAL_SHARED_LIBRARIES := \

        libandroid_runtime \
@@ -20,6 +20,7 @@ rs_generated_include_dir := $(call intermediates-dir-for,SHARED_LIBRARIES,libRS, 


LOCAL_C_INCLUDES += \

	$(JNI_H_INCLUDE) \

	$(LOCAL_PATH)/../../libs/rs \

	$(rs_generated_include_dir) \

	$(call include-path-for, corecg graphics)
@@ -27,10 +28,9 @@ LOCAL_CFLAGS += 


LOCAL_LDLIBS := -lpthread



LOCAL_MODULE:= libRS_jni

LOCAL_PRELINK_MODULE := false



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)