Merge "Fix the simulator build." (af002cf1) · Commits · e / os / android_frameworks_base

core/java/android/view/GLES20Canvas.java

+6 −4

Original line number	Diff line number	Diff line
		@@ -332,7 +332,7 @@ class GLES20Canvas extends Canvas {

		@Override
		public void drawARGB(int a, int r, int g, int b) {
		// TODO: Implement
		drawColor((a & 0xFF) << 24 \| (r & 0xFF) << 16 \| (g & 0xFF) << 8 \| (b & 0xFF));
		}

		@Override
		@@ -383,14 +383,16 @@ class GLES20Canvas extends Canvas {

		@Override
		public void drawColor(int color) {
		// TODO: Implement
		drawColor(color, PorterDuff.Mode.SRC_OVER);
		}

		@Override
		public void drawColor(int color, PorterDuff.Mode mode) {
		// TODO: Implement
		nDrawColor(mRenderer, color, mode.nativeInt);
		}

		private native void nDrawColor(int renderer, int color, int mode);

		@Override
		public void drawLine(float startX, float startY, float stopX, float stopY, Paint paint) {
		// TODO: Implement
		@@ -478,7 +480,7 @@ class GLES20Canvas extends Canvas {

		@Override
		public void drawRGB(int r, int g, int b) {
		// TODO: Implement
		drawColor(0xFF000000 \| (r & 0xFF) << 16 \| (g & 0xFF) << 8 \| (b & 0xFF));
		}

		@Override

core/jni/android_view_GLES20Canvas.cpp

+18 −4

Original line number	Diff line number	Diff line
		@@ -18,9 +18,11 @@
		#include <nativehelper/JNIHelp.h>
		#include <android_runtime/AndroidRuntime.h>

		#include <UIOpenGLRenderer.h>
		#include <SkXfermode.h>

		#define UI ((UIOpenGLRenderer*) renderer)
		#include <OpenGLRenderer.h>

		#define UI ((OpenGLRenderer*) renderer)

		namespace android {

		@@ -28,8 +30,8 @@ namespace android {
		// Constructors
		// ----------------------------------------------------------------------------

		static UIOpenGLRenderer* android_view_GLES20Renderer_createRenderer(JNIEnv* env, jobject canvas) {
		return new UIOpenGLRenderer;
		static OpenGLRenderer* android_view_GLES20Renderer_createRenderer(JNIEnv* env, jobject canvas) {
		return new OpenGLRenderer;
		}

		static void android_view_GLES20Renderer_destroyRenderer(JNIEnv* env, jobject canvas, jint renderer) {
		@@ -51,6 +53,16 @@ static void android_view_GLES20Renderer_prepare(JNIEnv* env, jobject canvas, jin
		UI->prepare();
		}

		// ----------------------------------------------------------------------------
		// Draw color
		// ----------------------------------------------------------------------------

		static void android_view_GLES20Renderer_drawColor(JNIEnv* env, jobject canvas, jint renderer,
		jint color, jint mode) {

		UI->drawColor(color, (SkXfermode::Mode) mode);
		}

		// ----------------------------------------------------------------------------
		// JNI Glue
		// ----------------------------------------------------------------------------
		@@ -62,6 +74,8 @@ static JNINativeMethod gMethods[] = {
		{ "nDestroyRenderer", "(I)V", (void*) android_view_GLES20Renderer_destroyRenderer },
		{ "nSetViewport", "(III)V", (void*) android_view_GLES20Renderer_setViewport },
		{ "nPrepare", "(I)V", (void*) android_view_GLES20Renderer_prepare },

		{ "nDrawColor", "(III)V", (void*) android_view_GLES20Renderer_drawColor },
		};

		int register_android_view_GLES20Canvas(JNIEnv* env) {

graphics/java/android/graphics/PorterDuff.java

+5 −1

Original line number	Diff line number	Diff line
		@@ -61,6 +61,10 @@ public class PorterDuff {
		Mode(int nativeInt) {
		this.nativeInt = nativeInt;
		}
		final int nativeInt;

		/**
		* @hide
		*/
		public final int nativeInt;
		}
		}

libs/hwui/Android.mk

+17 −3

Original line number	Diff line number	Diff line
		# Does not build for the simulator
		ifneq ($(TARGET_SIMULATOR), true)

		LOCAL_PATH:= $(call my-dir)
		include $(CLEAR_VARS)

		LOCAL_SRC_FILES:= \
		UIMatrix.cpp \
		UIOpenGLRenderer.cpp
		Matrix.cpp \
		OpenGLRenderer.cpp

		LOCAL_C_INCLUDES += \
		$(JNI_H_INCLUDE) \
		$(LOCAL_PATH)/../../include/utils \
		external/skia/include/core \
		external/skia/include/effects \
		external/skia/include/images \
		external/skia/src/ports \
		external/skia/include/utils

		LOCAL_MODULE_CLASS := SHARED_LIBRARIES
		LOCAL_SHARED_LIBRARIES := libcutils libutils libGLESv2
		LOCAL_SHARED_LIBRARIES := libcutils libutils libGLESv2 libskia
		LOCAL_MODULE:= libhwui
		LOCAL_PRELINK_MODULE := false

		include $(BUILD_SHARED_LIBRARY)

		endif #simulator

libs/hwui/UIMatrix.cpp→libs/hwui/Matrix.cpp

+1 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@

		#include <utils/Log.h>

		#include "UIMatrix.h"
		#include "Matrix.h"

		namespace android {