diff options
Diffstat (limited to 'platform_tools')
| -rw-r--r-- | platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp | 12 | ||||
| -rw-r--r-- | platform_tools/android/gyp/dependencies.gypi | 10 |
2 files changed, 11 insertions, 11 deletions
diff --git a/platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp b/platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp index 9817074c68..6098643b99 100644 --- a/platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp +++ b/platform_tools/android/app/jni/com_skia_SkiaSampleRenderer.cpp @@ -126,7 +126,7 @@ void SkEvent::SignalQueueTimer(SkMSec ms) return; } env->CallVoidMethod(gWindowGlue.m_obj, - gWindowGlue.m_startTimer, ms); + gWindowGlue.m_startTimer, ms); } void SkEvent::SignalNonEmptyQueue() @@ -157,7 +157,7 @@ static jmethodID GetJMethod(JNIEnv* env, jclass clazz, const char name[], JNIEXPORT void JNICALL Java_com_skia_SkiaSampleRenderer_init(JNIEnv* env, jobject thiz, jobject jsampleActivity) { - // setup jni hooks to the java activity + // setup jni hooks to the java activity gActivityGlue.m_env = env; jclass clazz = env->FindClass("com/skia/SkiaSampleActivity"); gActivityGlue.m_obj = env->NewWeakGlobalRef(jsampleActivity); @@ -246,19 +246,19 @@ JNIEXPORT void JNICALL Java_com_skia_SkiaSampleRenderer_handleClick(JNIEnv* env, JNIEXPORT void JNICALL Java_com_skia_SkiaSampleRenderer_nextSample( JNIEnv* env, jobject thiz) { - gWindow->nextSample(); + gWindow->nextSample(); } JNIEXPORT void JNICALL Java_com_skia_SkiaSampleRenderer_previousSample( JNIEnv* env, jobject thiz) { - gWindow->previousSample(); + gWindow->previousSample(); } JNIEXPORT void JNICALL Java_com_skia_SkiaSampleRenderer_goToSample( JNIEnv* env, jobject thiz, jint position) { - gWindow->goToSample(position); + gWindow->goToSample(position); } JNIEXPORT void JNICALL Java_com_skia_SkiaSampleRenderer_toggleRenderingMode( @@ -320,5 +320,5 @@ JNIEXPORT void JNICALL Java_com_skia_SkiaSampleRenderer_saveToPDF( JNIEXPORT void JNICALL Java_com_skia_SkiaSampleRenderer_postInval( JNIEnv* env, jobject thiz) { - gWindow->postInvalDelay(); + gWindow->postInvalDelay(); } diff --git a/platform_tools/android/gyp/dependencies.gypi b/platform_tools/android/gyp/dependencies.gypi index 4934903bf1..031e9c2035 100644 --- a/platform_tools/android/gyp/dependencies.gypi +++ b/platform_tools/android/gyp/dependencies.gypi @@ -1,12 +1,12 @@ # This GYP file stores the dependencies necessary to build Skia on the Android # platform. The OS doesn't provide many stable libraries as part of the -# distribution so we have to build a few of them ourselves. +# distribution so we have to build a few of them ourselves. # -# NOTE: We tried adding the gyp file to the android/ directory at the root of +# NOTE: We tried adding the gyp file to the android/ directory at the root of # the Skia repo, but that resulted in the generated makefiles being created # outside of the out directory. We may be able to move the bulk of this gyp # to the /android directory and put a simple shim here, but that has yet to be -# tested. +# tested. { 'variables': { @@ -210,7 +210,7 @@ 'direct_dependent_settings': { 'target_conditions': [ # '_type' is an 'automatic variable' which is defined for any - # target which defines a key-value pair with 'type' as the key (so, + # target which defines a key-value pair with 'type' as the key (so, # all of them). Conditionals inside 'target_conditions' are evaluated # *after* all other definitions and conditionals are evaluated, so # we're guaranteed that '_type' will be defined when we get here. @@ -239,7 +239,7 @@ 'direct_dependent_settings': { 'target_conditions': [ # '_type' is an 'automatic variable' which is defined for any - # target which defines a key-value pair with 'type' as the key (so, + # target which defines a key-value pair with 'type' as the key (so, # all of them). Conditionals inside 'target_conditions' are evaluated # *after* all other definitions and conditionals are evaluated, so # we're guaranteed that '_type' will be defined when we get here. |