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

Fix link-type check warning on PMTest_Java* test apps

Browse Source 
The test apps are built with SDK, but are using native libraries built
without SDK (libpmtest(32|64|dual)). This has been causing link-type check
warning, which will be errors soon.

Fixing the warning by building the native libraries with SDK.

Bug: 69899800
Test: mma -j under
frameworks/base/core/tests/hosttests/test-apps/SharedUid is successful
and does not show any link-type check warning

Change-Id: I660edb9accd8965ddd471f88f2b47f6b7285b83f
This commit is contained in:
Jiyong Park
2018-02-14 16:26:04 +09:00
parent d1134525fc
commit f11feb4745
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:= \
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)

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

@@ -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;

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

@@ -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)

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

@@ -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;

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

@@ -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)

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

@@ -15,12 +15,15 @@
*/
#define LOG_TAG "pmtestdual 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;