widevine-partner/android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Workaround for the intermediate dir in exported include path for multilib build

Browse Source 
Change-Id: Id8a810f84c6bd383b338df54c2207ce3d0bd4e9a
This commit is contained in:
Ying Wang
2014-02-24 18:17:11 -08:00
parent d6b79557ab
commit 4fe637b638
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
libwvdrmengine/Android.mk
View File

@@ -54,15 +54,18 @@ LOCAL_SRC_FILES := $(call all-proto-files-under, cdm/core/src)
# by *.pb.cc # by *.pb.cc
# The module that depends on this prebuilt will have LOCAL_C_INCLUDES prepended # The module that depends on this prebuilt will have LOCAL_C_INCLUDES prepended
# with this path. # with this path.
LOCAL_EXPORT_C_INCLUDE_DIRS := \ # Use "=" instead of ":=", so $(intermediates) will be expanded to the
$(call local-intermediates-dir)/proto \ # correct intermediates depending on it's for the 1st arch or 2nd arch.
$(call local-intermediates-dir)/proto/$(LOCAL_PATH)/cdm/core/src LOCAL_EXPORT_C_INCLUDE_DIRS = \
$(intermediates)/proto \
$(intermediates)/proto/$(LOCAL_PATH)/cdm/core/src
include $(BUILD_STATIC_LIBRARY) include $(BUILD_STATIC_LIBRARY)
# proto_generated_headers is a build system internal variable defined in # proto_generated_headers is a build system internal variable defined in
# $(BUILD_STATIC_LIBRARY). We can use cdm_proto_gen_headers later to establish # $(BUILD_STATIC_LIBRARY). We can use cdm_proto_gen_headers later to establish
# the dependency. # the dependency.
# TODO: fix cdm_proto_gen_headers for multilib build.
cdm_proto_gen_headers := $(proto_generated_headers) cdm_proto_gen_headers := $(proto_generated_headers)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------