diff options
| author | 2020-07-06 09:46:25 +0000 | |
|---|---|---|
| committer | 2020-07-06 09:46:25 +0000 | |
| commit | b842272135d05f45ecb639b5e5e6d5a0a323503d (patch) | |
| tree | dd7a5ce6c1b32ed706c9fb83fa0b893ea72de8b3 | |
| parent | b65eff6a2996075b83a6e10f929659d656600a72 (diff) | |
| parent | 75a5b44258ca90ecf2d1cd35f224e529a84485a4 (diff) | |
Merge "Use jni_headers instead of JNI_H_INCLUDE" am: 75a5b44258
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354482
Change-Id: I23b611db1d096074381d0b5c93bad0df18e0a8c9
| -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 |