summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Orion Hodson <oth@google.com> 2020-07-06 10:46:33 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-06 10:46:33 +0000
commit24f5475996d0ccb8183bddd52ce824bf5078c952 (patch)
treeb8ef03e4204b2ff79ecedd78bb69dc8f49a07975
parentc92ea513f281992fd4bd80919d7ccd1b6d8f9434 (diff)
parentb90a8a87d938281b1d759a7beb127dff9382ef54 (diff)
Merge "Use jni_headers instead of JNI_H_INCLUDE" am: 75a5b44258 am: b842272135 am: 61ea9dd847 am: fe576af25a am: b90a8a87d9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354482 Change-Id: Ieaf44ea19965b4c0ba9fef0cc2dfe9844ba0b3a2
-rw-r--r--rs/jni/Android.mk2
-rw-r--r--tests/DynamicCodeLoggerIntegrationTests/Android.mk3
2 files changed, 2 insertions, 3 deletions
diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk
index a734df7fc5b4..5c3f2d83fb00 100644
--- a/rs/jni/Android.mk
+++ b/rs/jni/Android.mk
@@ -18,10 +18,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