From 4fe637b638c7eb0b3375e3dc95d409dd38961f84 Mon Sep 17 00:00:00 2001 From: Ying Wang Date: Mon, 24 Feb 2014 18:17:11 -0800 Subject: [PATCH] Workaround for the intermediate dir in exported include path for multilib build Change-Id: Id8a810f84c6bd383b338df54c2207ce3d0bd4e9a --- libwvdrmengine/Android.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk index 6f300174..20a768ca 100644 --- a/libwvdrmengine/Android.mk +++ b/libwvdrmengine/Android.mk @@ -54,15 +54,18 @@ LOCAL_SRC_FILES := $(call all-proto-files-under, cdm/core/src) # by *.pb.cc # The module that depends on this prebuilt will have LOCAL_C_INCLUDES prepended # with this path. -LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(call local-intermediates-dir)/proto \ - $(call local-intermediates-dir)/proto/$(LOCAL_PATH)/cdm/core/src +# Use "=" instead of ":=", so $(intermediates) will be expanded to the +# correct intermediates depending on it's for the 1st arch or 2nd arch. +LOCAL_EXPORT_C_INCLUDE_DIRS = \ + $(intermediates)/proto \ + $(intermediates)/proto/$(LOCAL_PATH)/cdm/core/src include $(BUILD_STATIC_LIBRARY) # proto_generated_headers is a build system internal variable defined in # $(BUILD_STATIC_LIBRARY). We can use cdm_proto_gen_headers later to establish # the dependency. +# TODO: fix cdm_proto_gen_headers for multilib build. cdm_proto_gen_headers := $(proto_generated_headers) # -----------------------------------------------------------------------------