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

am 4fe637b6: Workaround for the intermediate dir in exported include path for multilib build

Browse Source 
* commit '4fe637b638c7eb0b3375e3dc95d409dd38961f84':
  Workaround for the intermediate dir in exported include path for multilib build
This commit is contained in:
Ying Wang
2014-02-25 18:03:08 +00:00
committed by Android Git Automerger
parent 6386692315 4fe637b638
commit 0f2f50695a
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
# 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)
# -----------------------------------------------------------------------------