Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e481df97 authored by Jiyong Park's avatar Jiyong Park Committed by android-build-merger
Browse files

Merge "Fix link-type check warning on PMTest_Java* test apps" am: 779f5616 

am: 78c71ca4

Change-Id: I4e97594663b711f18a3940e002fceac215575d1c
parents 2c426bc3 78c71ca4

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

+2 −5
Original line number Diff line number Diff line
@@ -29,13 +29,10 @@ LOCAL_MODULE_TAGS := tests 
LOCAL_SRC_FILES:= \

  native.cpp



# All of the shard libraries we link against.

LOCAL_SHARED_LIBRARIES := liblog

LOCAL_LDLIBS := -llog



LOCAL_CFLAGS += -Wall -Wextra -Werror



# Also need the JNI headers.

LOCAL_C_INCLUDES += \

	$(JNI_H_INCLUDE)

LOCAL_SDK_VERSION := current



include $(BUILD_SHARED_LIBRARY)

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

+4 −1
Original line number Diff line number Diff line
@@ -15,12 +15,15 @@ 
 */



#define LOG_TAG "pmtest32 native.cpp"

#include <utils/Log.h>

#include <android/log.h>



#include <stdio.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

add(JNIEnv */* env */, jobject /* thiz */, jint a, jint b) {

int result = a + b;

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

+2 −6
Original line number Diff line number Diff line
@@ -30,14 +30,10 @@ LOCAL_MODULE_TAGS := tests 
LOCAL_SRC_FILES:= \

  native.cpp



# All of the shared libraries we link against.

LOCAL_SHARED_LIBRARIES := \

	libutils liblog

LOCAL_LDLIBS := -llog



LOCAL_CFLAGS += -Wall -Wextra -Werror



# Also need the JNI headers.

LOCAL_C_INCLUDES += \

	$(JNI_H_INCLUDE)

LOCAL_SDK_VERSION := current



include $(BUILD_SHARED_LIBRARY)

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

+4 −1
Original line number Diff line number Diff line
@@ -15,12 +15,15 @@ 
 */



#define LOG_TAG "pmtest64 native.cpp"

#include <utils/Log.h>

#include <android/log.h>



#include <stdio.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

add(JNIEnv */* env */, jobject /* thiz */, jint a, jint b) {

int result = a + b;

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

+1 −5
Original line number Diff line number Diff line
@@ -29,14 +29,10 @@ LOCAL_MODULE_TAGS := tests 
LOCAL_SRC_FILES:= \

  native.cpp



# All of the shard libraries we link against.

LOCAL_LDLIBS = -llog

LOCAL_SHARED_LIBRARIES := liblog



LOCAL_CFLAGS += -Wall -Wextra -Werror



# Also need the JNI headers.

LOCAL_C_INCLUDES += \

	$(JNI_H_INCLUDE)

LOCAL_SDK_VERSION := current



include $(BUILD_SHARED_LIBRARY)