summaryrefslogtreecommitdiff
path: root/rs
diff options
context:
space:
mode:
author Orion Hodson <oth@google.com> 2020-07-06 10:30:12 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-07-06 10:30:12 +0000
commitb90a8a87d938281b1d759a7beb127dff9382ef54 (patch)
treedde33774ec98b84ac295554fa5a79534816436e2 /rs
parent49d6cd84c46acace39157d2b5b45aaab86f457db (diff)
parentfe576af25af39859245b1b4b58215751e13a9674 (diff)
Merge "Use jni_headers instead of JNI_H_INCLUDE" am: 75a5b44258 am: b842272135 am: 61ea9dd847 am: fe576af25a
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354482 Change-Id: I322ff6b914fc4002da01d60eebb6a7c8e45f0fa8
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 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