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

am a79dad48: Now the .pb.h files are generated to arch-neutral dir

Browse Source 
* commit 'a79dad48e004d2355317bc486e17c31443694b83':
  Now the .pb.h files are generated to arch-neutral dir
This commit is contained in:
Ying Wang
2014-02-25 21:47:16 +00:00
committed by Android Git Automerger
parent 0f2f50695a a79dad48e0
commit 1b50031785
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libwvdrmengine/Android.mk
View File

@@ -48,24 +48,23 @@ LOCAL_C_INCLUDES := \
LOCAL_SRC_FILES := $(call all-proto-files-under, cdm/core/src) LOCAL_SRC_FILES := $(call all-proto-files-under, cdm/core/src)
# $(call local-intermediates-dir)/proto/$(LOCAL_PATH)/cdm/core/src is used generated_sources_dir := $(call local-generated-sources-dir)
# $(generated_sources_dir)/proto/$(LOCAL_PATH)/cdm/core/src is used
# to locate *.pb.h by cdm source # to locate *.pb.h by cdm source
# $(call local-intermediates-dir)/proto is used to locate *.pb.h included # $(generated_sources_dir)/proto is used to locate *.pb.h included
# 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 library will have LOCAL_C_INCLUDES prepended
# with this path. # with this path.
# Use "=" instead of ":=", so $(intermediates) will be expanded to the LOCAL_EXPORT_C_INCLUDE_DIRS := \
# correct intermediates depending on it's for the 1st arch or 2nd arch. $(generated_sources_dir)/proto \
LOCAL_EXPORT_C_INCLUDE_DIRS = \ $(generated_sources_dir)/proto/$(LOCAL_PATH)/cdm/core/src
$(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)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------