diff options
| author | 2020-07-06 09:59:48 +0000 | |
|---|---|---|
| committer | 2020-07-06 09:59:48 +0000 | |
| commit | 61ea9dd8478863f628ae5b142a4753d1311477a5 (patch) | |
| tree | fecf11672a959e6ece42c92edb43506a9e4d32bc | |
| parent | f610cd79bd23dc82ec3a6524dca3bde145e1d1b7 (diff) | |
| parent | b842272135d05f45ecb639b5e5e6d5a0a323503d (diff) | |
Merge "Use jni_headers instead of JNI_H_INCLUDE" am: 75a5b44258 am: b842272135
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354482
Change-Id: Ie88cee3d231c463c2eab96382f3084a4256d421d
| -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 a4bea661583b..95697e6f8bac 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 |