summaryrefslogtreecommitdiff
path: root/rs
diff options
context:
space:
mode:
author Orion Hodson <oth@google.com> 2020-07-06 09:46:25 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-06 09:46:25 +0000
commitb842272135d05f45ecb639b5e5e6d5a0a323503d (patch)
treedd7a5ce6c1b32ed706c9fb83fa0b893ea72de8b3 /rs
parentb65eff6a2996075b83a6e10f929659d656600a72 (diff)
parent75a5b44258ca90ecf2d1cd35f224e529a84485a4 (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
Diffstat (limited to 'rs')
-rw-r--r--rs/jni/Android.mk2
1 files changed, 1 insertions, 1 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