Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix link-type check warning on PMTest_Java* test apps"

Browse Source
This commit is contained in:
Treehugger Robot
2018-02-14 15:02:22 +00:00
committed by Gerrit Code Review
parent 46b4862d20 f11feb4745
commit 779f561650
6 changed files with 17 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/tests/hosttests/test-apps/SharedUid/32/jni/Android.mk
View File

@@ -29,13 +29,10 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= \
native.cpp native.cpp
# All of the shard libraries we link against. LOCAL_LDLIBS := -llog
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_CFLAGS += -Wall -Wextra -Werror LOCAL_CFLAGS += -Wall -Wextra -Werror
# Also need the JNI headers. LOCAL_SDK_VERSION := current
LOCAL_C_INCLUDES += \
$(JNI_H_INCLUDE)
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

5
core/tests/hosttests/test-apps/SharedUid/32/jni/native.cpp
View File

@@ -15,12 +15,15 @@
*/ */
#define LOG_TAG "pmtest32 native.cpp" #define LOG_TAG "pmtest32 native.cpp"
#include <utils/Log.h> #include <android/log.h>
#include <stdio.h> #include <stdio.h>
#include "jni.h" #include "jni.h"
#define ALOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
#define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
static jint static jint
add(JNIEnv */* env */, jobject /* thiz */, jint a, jint b) { add(JNIEnv */* env */, jobject /* thiz */, jint a, jint b) {
int result = a + b; int result = a + b;

8
core/tests/hosttests/test-apps/SharedUid/64/jni/Android.mk
View File

@@ -30,14 +30,10 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= \
native.cpp native.cpp
# All of the shared libraries we link against. LOCAL_LDLIBS := -llog
LOCAL_SHARED_LIBRARIES := \
libutils liblog
LOCAL_CFLAGS += -Wall -Wextra -Werror LOCAL_CFLAGS += -Wall -Wextra -Werror
# Also need the JNI headers. LOCAL_SDK_VERSION := current
LOCAL_C_INCLUDES += \
$(JNI_H_INCLUDE)
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

5
core/tests/hosttests/test-apps/SharedUid/64/jni/native.cpp
View File

@@ -15,12 +15,15 @@
*/ */
#define LOG_TAG "pmtest64 native.cpp" #define LOG_TAG "pmtest64 native.cpp"
#include <utils/Log.h> #include <android/log.h>
#include <stdio.h> #include <stdio.h>
#include "jni.h" #include "jni.h"
#define ALOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
#define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
static jint static jint
add(JNIEnv */* env */, jobject /* thiz */, jint a, jint b) { add(JNIEnv */* env */, jobject /* thiz */, jint a, jint b) {
int result = a + b; int result = a + b;

6
core/tests/hosttests/test-apps/SharedUid/dual/jni/Android.mk
View File

@@ -29,14 +29,10 @@ LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES:= \ LOCAL_SRC_FILES:= \
native.cpp native.cpp
# All of the shard libraries we link against.
LOCAL_LDLIBS = -llog LOCAL_LDLIBS = -llog
LOCAL_SHARED_LIBRARIES := liblog
LOCAL_CFLAGS += -Wall -Wextra -Werror LOCAL_CFLAGS += -Wall -Wextra -Werror
# Also need the JNI headers. LOCAL_SDK_VERSION := current
LOCAL_C_INCLUDES += \
$(JNI_H_INCLUDE)
include $(BUILD_SHARED_LIBRARY) include $(BUILD_SHARED_LIBRARY)

5
core/tests/hosttests/test-apps/SharedUid/dual/jni/native.cpp
View File

@@ -15,12 +15,15 @@
*/ */
#define LOG_TAG "pmtestdual native.cpp" #define LOG_TAG "pmtestdual native.cpp"
#include <utils/Log.h> #include <android/log.h>
#include <stdio.h> #include <stdio.h>
#include "jni.h" #include "jni.h"
#define ALOGI(...) __android_log_print(ANDROID_LOG_INFO, LOG_TAG, __VA_ARGS__)
#define ALOGE(...) __android_log_print(ANDROID_LOG_ERROR, LOG_TAG, __VA_ARGS__)
static jint static jint
add(JNIEnv */* env */, jobject /* thiz */, jint a, jint b) { add(JNIEnv */* env */, jobject /* thiz */, jint a, jint b) {
int result = a + b; int result = a + b;