diff options
| author | Stephen Hines <srhines@google.com> | 2014-08-21 23:27:46 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-08-21 23:27:46 -0700 |
| commit | 61db21cef81cbc8439b34a8f1d32952339ffc190 (patch) | |
| tree | 62a54045fbfe51a5ebb65c0ae6e7c67fa1037549 /java | |
| parent | 4c513c12f0f620c336efce7b92b8f26aae39ffdd (diff) | |
| parent | 81cfa2c51d4e8316f9e3519917b7dae7ceeb500d (diff) | |
| download | rs-61db21cef81cbc8439b34a8f1d32952339ffc190.tar.gz | |
resolved conflicts for merge of 81cfa2c5 to lmp-dev-plus-aosp
Change-Id: Ia3a7f084693825d4e46a4864788332a7d039d38f
Diffstat (limited to 'java')
| -rw-r--r-- | java/tests/HelloComputeNDK/Android.mk | 2 | ||||
| -rw-r--r-- | java/tests/HelloComputeNDK/libhellocomputendk/Android.mk | 1 | ||||
| -rw-r--r-- | java/tests/HelloComputeNDK/libhellocomputendk/helloComputeNDK.cpp | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/java/tests/HelloComputeNDK/Android.mk b/java/tests/HelloComputeNDK/Android.mk index 830399e9..d4194b52 100644 --- a/java/tests/HelloComputeNDK/Android.mk +++ b/java/tests/HelloComputeNDK/Android.mk @@ -17,6 +17,8 @@ LOCAL_PATH := $(call my-dir) include $(CLEAR_VARS) +LOCAL_CFLAGS := -std=c++11 + LOCAL_MODULE_TAGS := tests LOCAL_SRC_FILES := $(call all-java-files-under, src) \ diff --git a/java/tests/HelloComputeNDK/libhellocomputendk/Android.mk b/java/tests/HelloComputeNDK/libhellocomputendk/Android.mk index 2b197f1d..5f3a51d9 100644 --- a/java/tests/HelloComputeNDK/libhellocomputendk/Android.mk +++ b/java/tests/HelloComputeNDK/libhellocomputendk/Android.mk @@ -28,6 +28,7 @@ LOCAL_C_INCLUDES += frameworks/rs/cpp LOCAL_C_INCLUDES += frameworks/rs LOCAL_C_INCLUDES += external/stlport/stlport bionic/ bionic/libstdc++/include +LOCAL_CFLAGS := -std=c++11 LOCAL_LDFLAGS := -Wl,-Bsymbolic LOCAL_SHARED_LIBRARIES := libdl liblog libjnigraphics LOCAL_STATIC_LIBRARIES := libRScpp_static diff --git a/java/tests/HelloComputeNDK/libhellocomputendk/helloComputeNDK.cpp b/java/tests/HelloComputeNDK/libhellocomputendk/helloComputeNDK.cpp index 4985664d..1aab0566 100644 --- a/java/tests/HelloComputeNDK/libhellocomputendk/helloComputeNDK.cpp +++ b/java/tests/HelloComputeNDK/libhellocomputendk/helloComputeNDK.cpp @@ -27,13 +27,13 @@ Java_com_example_android_rs_hellocomputendk_HelloComputeNDK_nativeMono(JNIEnv * ) { - void* inputPtr = NULL; - void* outputPtr = NULL; + void* inputPtr = nullptr; + void* outputPtr = nullptr; AndroidBitmap_lockPixels(env, jbitmapIn, &inputPtr); AndroidBitmap_lockPixels(env, jbitmapOut, &outputPtr); - const char * path = env->GetStringUTFChars(pathObj, NULL); + const char * path = env->GetStringUTFChars(pathObj, nullptr); sp<RS> rs = new RS(); rs->init(path); env->ReleaseStringUTFChars(pathObj, path); |