diff options
| 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 |
| commit | 24f5475996d0ccb8183bddd52ce824bf5078c952 (patch) | |
| tree | b8ef03e4204b2ff79ecedd78bb69dc8f49a07975 /rs | |
| parent | c92ea513f281992fd4bd80919d7ccd1b6d8f9434 (diff) | |
| parent | b90a8a87d938281b1d759a7beb127dff9382ef54 (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
Diffstat (limited to 'rs')
| -rw-r--r-- | rs/jni/Android.mk | 2 |
1 files changed, 1 insertions, 1 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 |