From 717837ff00e9057f8daee53c05d73522d88ccb6f Mon Sep 17 00:00:00 2001 From: Fred Gylys-Colwell Date: Wed, 30 Jul 2014 12:59:38 -0700 Subject: [PATCH] Update Protobuf Directory in Makefile (DO NOT MERGE) This update to Android.mk allows the protobuffers to be compiled and the code to see them in the correct directories. This change is manualy merged from master, so should not be merged back. bug 15987446 Change-Id: I8676567c33a6ebb87a2904bff9f3aa9ce093664b --- libwvdrmengine/Android.mk | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk index d5a3bd92..34681f98 100644 --- a/libwvdrmengine/Android.mk +++ b/libwvdrmengine/Android.mk @@ -48,15 +48,17 @@ LOCAL_C_INCLUDES := \ 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 -# $(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 -# 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. LOCAL_EXPORT_C_INCLUDE_DIRS := \ - $(call local-intermediates-dir)/proto \ - $(call local-intermediates-dir)/proto/$(LOCAL_PATH)/cdm/core/src + $(generated_sources_dir)/proto \ + $(generated_sources_dir)/proto/$(LOCAL_PATH)/cdm/core/src include $(BUILD_STATIC_LIBRARY) @@ -112,12 +114,16 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(cdm_proto_gen_headers) LOCAL_MODULE := libwvdrmengine -LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR_SHARED_LIBRARIES)/mediadrm +LOCAL_MODULE_RELATIVE_PATH := mediadrm LOCAL_MODULE_TAGS := optional LOCAL_MODULE_OWNER := widevine +LOCAL_PROPRIETARY_MODULE := true + +LOCAL_MODULE_TARGET_ARCH := arm mips x86 + include $(BUILD_SHARED_LIBRARY) include vendor/widevine/libwvdrmengine/cdm/Android.mk