diff options
| author | Orion Hodson <oth@google.com> | 2020-07-02 13:50:33 +0100 |
|---|---|---|
| committer | Orion Hodson <oth@google.com> | 2020-07-02 13:50:33 +0100 |
| commit | 3eba1ab83a7db418bc8a02a32d6d0c24496a7549 (patch) | |
| tree | b83bd6753589f5ccca410cca562d5cb5c4f6241d | |
| parent | 5bc91ca167fa63b3450999fa1ca03b556650b3d1 (diff) | |
Use jni_headers instead of JNI_H_INCLUDE
Bug: 152482542
Test: m librs_jni DynamicCodeLoggerNativeTestLibrary
Exempt-From-Owner-Approval: build refactoring
Change-Id: I3069c513f333afc202505081992c59e80b536ed6
| -rw-r--r-- | rs/jni/Android.mk | 2 | ||||
| -rw-r--r-- | tests/DynamicCodeLoggerIntegrationTests/Android.mk | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk index 0854b9582187..def67ceb596f 100644 --- a/rs/jni/Android.mk +++ b/rs/jni/Android.mk @@ -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 diff --git a/tests/DynamicCodeLoggerIntegrationTests/Android.mk b/tests/DynamicCodeLoggerIntegrationTests/Android.mk index 62c1ba89653c..2d58ce8baddc 100644 --- a/tests/DynamicCodeLoggerIntegrationTests/Android.mk +++ b/tests/DynamicCodeLoggerIntegrationTests/Android.mk @@ -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 |