commit 86c0968a0507eeaca12cec1dfccbd4bd4c45aa77
author Treehugger Robot <treehugger-gerrit@google.com> Thu Feb 15 07:41:37 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Feb 15 07:41:37 2018 +0000
tree 9796457334270d0580d386abc0cd47ddf7f41fef
parent 6f08ea2f38075b6ee33e1be91738e6c18952e8f8
parent 6a91a9ad8ac9d3df4b62e84f70cd19ea19b53d15

Merge "Build libsimplejni using SDK"

samples/SimpleJNI/jni/Android.mk

diff --git a/samples/SimpleJNI/jni/Android.mk b/samples/SimpleJNI/jni/Android.mk
index 1c2589f..dc6390f 100644
--- a/samples/SimpleJNI/jni/Android.mk
+++ b/samples/SimpleJNI/jni/Android.mk
@@ -31,18 +31,15 @@
     native.cpp
 
 # All of the shared libraries we link against.
-LOCAL_SHARED_LIBRARIES := \
-    liblog
+LOCAL_LDLIBS := -llog
 
 # No static libraries.
 LOCAL_STATIC_LIBRARIES :=
 
-# Also need the JNI headers.
-LOCAL_C_INCLUDES += \
-    $(JNI_H_INCLUDE)
-
 LOCAL_CFLAGS := -Wall -Werror
 
-LOCAL_CXX_STL := none
+LOCAL_NDK_STL_VARIANT := none
+
+LOCAL_SDK_VERSION := current
 
 include $(BUILD_SHARED_LIBRARY)

samples/SimpleJNI/jni/native.cpp

diff --git a/samples/SimpleJNI/jni/native.cpp b/samples/SimpleJNI/jni/native.cpp
index dd322c4..cb52233 100644
--- a/samples/SimpleJNI/jni/native.cpp
+++ b/samples/SimpleJNI/jni/native.cpp
@@ -15,12 +15,18 @@
  */
 
 #define LOG_TAG "simplejni native.cpp"
-#include <utils/Log.h>
+#include <android/log.h>
 
 #include <stdio.h>
 
 #include "jni.h"
 
+#define ALOGV(...) __android_log_print(ANDROID_LOG_VERBOSE, LOG_TAG, __VA_ARGS__)
+#define ALOGD(...) __android_log_print(ANDROID_LOG_DEBUG, LOG_TAG, __VA_ARGS__)
+#define ALOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
+#define ALOGW(...) __android_log_print(ANDROID_LOG_WARN, LOG_TAG, __VA_ARGS__)
+#define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
+
 static jint
 add(JNIEnv* /*env*/, jobject /*thiz*/, jint a, jint b) {
 int result = a + b;