Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 24f54759 authored by Orion Hodson's avatar Orion Hodson Committed by Automerger Merge Worker
Browse files

Merge "Use jni_headers instead of JNI_H_INCLUDE" am: 75a5b442 am: b8422721... 

Merge "Use jni_headers instead of JNI_H_INCLUDE" am: 75a5b442 am: b8422721 am: 61ea9dd8 am: fe576af2 am: b90a8a87

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1354482

Change-Id: Ieaf44ea19965b4c0ba9fef0cc2dfe9844ba0b3a2
parents c92ea513 b90a8a87

rs/jni/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -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

tests/DynamicCodeLoggerIntegrationTests/Android.mk

+1 −2
Original line number Diff line number Diff line
@@ -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