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

Remove setup of proto generated include/header dependency.

Browse Source 
They are now set up automatically by the build system.

Bug: 20093047
Change-Id: I3ab1256952915e402adf6510c0f6fdb158feb802
This commit is contained in:
Ying Wang
2015-04-07 12:09:55 -07:00
parent 71ccb7f032
commit 0c850a4cb3
5 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
libwvdrmengine/Android.mk
View File

@@ -56,11 +56,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \
include $(BUILD_STATIC_LIBRARY) 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.
cdm_proto_gen_headers := $(proto_generated_headers)
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# Builds libwvdrmengine.so # Builds libwvdrmengine.so
# #
@@ -101,8 +96,6 @@ LOCAL_SHARED_LIBRARIES := \
LOCAL_WHOLE_STATIC_LIBRARIES := libcdm_protos LOCAL_WHOLE_STATIC_LIBRARIES := libcdm_protos
LOCAL_ADDITIONAL_DEPENDENCIES := $(cdm_proto_gen_headers)
LOCAL_MODULE := libwvdrmengine LOCAL_MODULE := libwvdrmengine
LOCAL_MODULE_RELATIVE_PATH := mediadrm LOCAL_MODULE_RELATIVE_PATH := mediadrm
@@ -121,6 +114,3 @@ include vendor/widevine/libwvdrmengine/cdm/Android.mk
include vendor/widevine/libwvdrmengine/level3/Android.mk include vendor/widevine/libwvdrmengine/level3/Android.mk
include vendor/widevine/libwvdrmengine/mediacrypto/Android.mk include vendor/widevine/libwvdrmengine/mediacrypto/Android.mk
include vendor/widevine/libwvdrmengine/mediadrm/Android.mk include vendor/widevine/libwvdrmengine/mediadrm/Android.mk
# clean up temp vars
cdm_proto_gen_headers :=

1
libwvdrmengine/cdm/Android.mk
View File

@@ -14,7 +14,6 @@ LOCAL_C_INCLUDES += \
external/protobuf/src external/protobuf/src
LOCAL_STATIC_LIBRARIES := libcdm_protos libcrypto_static LOCAL_STATIC_LIBRARIES := libcdm_protos libcrypto_static
LOCAL_ADDITIONAL_DEPENDENCIES := $(cdm_proto_gen_headers)
SRC_DIR := src SRC_DIR := src
CORE_SRC_DIR := core/src CORE_SRC_DIR := core/src

2
libwvdrmengine/cdm/test/unit-test.mk
View File

@@ -29,8 +29,6 @@ LOCAL_C_INCLUDES := \
LOCAL_C_INCLUDES += external/protobuf/src LOCAL_C_INCLUDES += external/protobuf/src
LOCAL_ADDITIONAL_DEPENDENCIES := $(cdm_proto_gen_headers)
LOCAL_STATIC_LIBRARIES := \ LOCAL_STATIC_LIBRARIES := \
libcdm \ libcdm \
libcdm_protos \ libcdm_protos \

9
libwvdrmengine/mediacrypto/test/Android.mk
View File

@@ -33,18 +33,9 @@ LOCAL_SHARED_LIBRARIES := \
libstagefright_foundation \ libstagefright_foundation \
libutils \ libutils \
# CDM's protobuffers are not part of the library
PROTO_SRC_DIR := $(proto_generated_cc_sources_dir)/$(LOCAL_PATH)/core/src
LOCAL_SRC_FILES += \
$(PROTO_SRC_DIR)/license_protocol.pb.cc \
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(proto_generated_cc_sources_dir)/$(LOCAL_PATH)/core/src \
external/protobuf/src \ external/protobuf/src \
LOCAL_ADDITIONAL_DEPENDENCIES += $(proto_generated_headers)
# End protobuf section # End protobuf section
LOCAL_MODULE := libwvdrmmediacrypto_test LOCAL_MODULE := libwvdrmmediacrypto_test

9
libwvdrmengine/mediadrm/test/Android.mk
View File

@@ -33,18 +33,9 @@ LOCAL_SHARED_LIBRARIES := \
libprotobuf-cpp-lite \ libprotobuf-cpp-lite \
libutils \ libutils \
# CDM's protobuffers are not part of the library
PROTO_SRC_DIR := $(proto_generated_cc_sources_dir)/$(LOCAL_PATH)/core/src
LOCAL_SRC_FILES += \
$(PROTO_SRC_DIR)/license_protocol.pb.cc \
LOCAL_C_INCLUDES += \ LOCAL_C_INCLUDES += \
$(proto_generated_cc_sources_dir)/$(LOCAL_PATH)/core/src \
external/protobuf/src \ external/protobuf/src \
LOCAL_ADDITIONAL_DEPENDENCIES += $(proto_generated_headers)
# End protobuf section # End protobuf section
LOCAL_MODULE := libwvdrmdrmplugin_test LOCAL_MODULE := libwvdrmdrmplugin_test