diff options
| author | Chris Wailes <chriswailes@google.com> | 2014-08-12 13:51:10 -0700 |
|---|---|---|
| committer | Stephen Hines <srhines@google.com> | 2014-08-20 18:14:27 -0700 |
| commit | 44bef6fba6244292b751387f3d6c31cca96c28ad (patch) | |
| tree | a9dd48535a1f3343315bc75f7751cf042c05dc67 /java | |
| parent | 4bb773ef75eeff5960852b733bcca5834020ee9e (diff) | |
| download | android_frameworks_rs-44bef6fba6244292b751387f3d6c31cca96c28ad.tar.gz android_frameworks_rs-44bef6fba6244292b751387f3d6c31cca96c28ad.tar.bz2 android_frameworks_rs-44bef6fba6244292b751387f3d6c31cca96c28ad.zip | |
Replace NULL macros with nullptr literals.
Change-Id: I918c40879aa547438f77e7d1a95fa2aa33bec398
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 58b95aa4..5f1bd17c 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); |