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

Commit 61ea9dd8 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 

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

Change-Id: Ie88cee3d231c463c2eab96382f3084a4256d421d
parents f610cd79 b8422721

rs/jni/Android.mk

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

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