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

Merge "Use jni_headers instead of JNI_H_INCLUDE"

Browse Source
This commit is contained in:
Orion Hodson
2020-07-06 09:34:10 +00:00
committed by Gerrit Code Review
parent fb723fabac 3eba1ab83a
commit 75a5b44258
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
rs/jni/Android.mk
View File

@@ -19,10 +19,10 @@ LOCAL_SHARED_LIBRARIES := \
libjnigraphics libjnigraphics
LOCAL_HEADER_LIBRARIES := \ LOCAL_HEADER_LIBRARIES := \
jni_headers \
libbase_headers libbase_headers
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(JNI_H_INCLUDE) \
frameworks/rs frameworks/rs
LOCAL_CFLAGS += -Wno-unused-parameter LOCAL_CFLAGS += -Wno-unused-parameter

3
tests/DynamicCodeLoggerIntegrationTests/Android.mk
View File

@@ -36,8 +36,7 @@ include $(CLEAR_VARS)
LOCAL_MODULE_TAGS := tests LOCAL_MODULE_TAGS := tests
LOCAL_MODULE := DynamicCodeLoggerNativeTestLibrary LOCAL_MODULE := DynamicCodeLoggerNativeTestLibrary
LOCAL_SRC_FILES := src/cpp/com_android_dcl_Jni.cpp LOCAL_SRC_FILES := src/cpp/com_android_dcl_Jni.cpp
LOCAL_C_INCLUDES += \ LOCAL_HEADER_LIBRARIES := jni_headers
$(JNI_H_INCLUDE)
LOCAL_SDK_VERSION := 28 LOCAL_SDK_VERSION := 28
LOCAL_NDK_STL_VARIANT := c++_static LOCAL_NDK_STL_VARIANT := c++_static