commit 3eba1ab83a7db418bc8a02a32d6d0c24496a7549
author Orion Hodson <oth@google.com> Thu Jul 02 13:50:33 2020 +0100
committer Orion Hodson <oth@google.com> Thu Jul 02 13:50:33 2020 +0100
tree b83bd6753589f5ccca410cca562d5cb5c4f6241d
parent 5bc91ca167fa63b3450999fa1ca03b556650b3d1

Use jni_headers instead of JNI_H_INCLUDE

Bug: 152482542
Test: m librs_jni DynamicCodeLoggerNativeTestLibrary
Exempt-From-Owner-Approval: build refactoring
Change-Id: I3069c513f333afc202505081992c59e80b536ed6

rs/jni/Android.mk

diff --git a/rs/jni/Android.mk b/rs/jni/Android.mk
index 0854b95..def67ce 100644
--- a/rs/jni/Android.mk
+++ b/rs/jni/Android.mk
@@ -19,10 +19,10 @@
     libjnigraphics
 
 LOCAL_HEADER_LIBRARIES := \
+    jni_headers \
     libbase_headers
 
 LOCAL_C_INCLUDES += \
-    $(JNI_H_INCLUDE) \
     frameworks/rs
 
 LOCAL_CFLAGS += -Wno-unused-parameter