From 8be2ccb1eae341f185d2655a2c84d7355ad5ec9f Mon Sep 17 00:00:00 2001 From: Steven Moreland Date: Thu, 25 Jan 2018 14:15:40 -0800 Subject: [PATCH] Make memtrack build with the VNDK. When the vndk is enabled (BOARD_VNDK_VERSION=current), vendor libraries must only link against vendor variants in the build system. This also means that they receive restricted sets of headers and that automatic global headers are restricted. Test: build memtrack with BOARD_VNDK_VERSION=current Bug: 69526027 Change-Id: Ie3cb9ffb72931fbb0cc816f5158a649e09f7bb43 --- msm8996/libmemtrack/Android.mk | 2 +- msm8996/libmemtrack/memtrack_msm.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/msm8996/libmemtrack/Android.mk b/msm8996/libmemtrack/Android.mk index a73cfd75..4907b850 100644 --- a/msm8996/libmemtrack/Android.mk +++ b/msm8996/libmemtrack/Android.mk @@ -20,7 +20,7 @@ include $(CLEAR_VARS) LOCAL_MODULE_RELATIVE_PATH := hw LOCAL_PROPRIETARY_MODULE := true -LOCAL_C_INCLUDES += hardware/libhardware/include +LOCAL_HEADER_LIBRARIES := libhardware_headers LOCAL_CFLAGS := -Wconversion -Wall -Werror -Wno-sign-conversion LOCAL_CLANG := true LOCAL_SHARED_LIBRARIES := liblog diff --git a/msm8996/libmemtrack/memtrack_msm.c b/msm8996/libmemtrack/memtrack_msm.c index 4e4b78a3..2f930170 100644 --- a/msm8996/libmemtrack/memtrack_msm.c +++ b/msm8996/libmemtrack/memtrack_msm.c @@ -17,7 +17,7 @@ #include #include #include -#include +#include #include