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" am: 75a5b44258 am: b842272135 am: 61ea9dd847 am: fe576af25a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354482

Change-Id: I322ff6b914fc4002da01d60eebb6a7c8e45f0fa8
This commit is contained in:
Orion Hodson
2020-07-06 10:30:12 +00:00
committed by Automerger Merge Worker
parent 49d6cd84c4 fe576af25a
commit b90a8a87d9
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
LOCAL_HEADER_LIBRARIES := \
jni_headers \
libbase_headers
LOCAL_C_INCLUDES += \
$(JNI_H_INCLUDE) \
frameworks/rs
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 := DynamicCodeLoggerNativeTestLibrary
LOCAL_SRC_FILES := src/cpp/com_android_dcl_Jni.cpp
LOCAL_C_INCLUDES += \
$(JNI_H_INCLUDE)
LOCAL_HEADER_LIBRARIES := jni_headers
LOCAL_SDK_VERSION := 28
LOCAL_NDK_STL_VARIANT := c++_static