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

Use jni_headers instead of JNI_H_INCLUDE

Browse Source 
Bug: 152482542
Test: m librs_jni DynamicCodeLoggerNativeTestLibrary
Exempt-From-Owner-Approval: build refactoring
Change-Id: I3069c513f333afc202505081992c59e80b536ed6
This commit is contained in:
Orion Hodson
2020-07-02 13:50:33 +01:00
parent 5bc91ca167
commit 3eba1ab83a
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