Remove setup of proto generated include/header dependency.
They are now set up automatically by the build system. Bug: 20093047 Change-Id: I3ab1256952915e402adf6510c0f6fdb158feb802
This commit is contained in:
@@ -56,11 +56,6 @@ LOCAL_EXPORT_C_INCLUDE_DIRS := \
|
||||
|
||||
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
|
||||
#
|
||||
@@ -101,8 +96,6 @@ LOCAL_SHARED_LIBRARIES := \
|
||||
|
||||
LOCAL_WHOLE_STATIC_LIBRARIES := libcdm_protos
|
||||
|
||||
LOCAL_ADDITIONAL_DEPENDENCIES := $(cdm_proto_gen_headers)
|
||||
|
||||
LOCAL_MODULE := libwvdrmengine
|
||||
|
||||
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/mediacrypto/Android.mk
|
||||
include vendor/widevine/libwvdrmengine/mediadrm/Android.mk
|
||||
|
||||
# clean up temp vars
|
||||
cdm_proto_gen_headers :=
|
||||
|
||||
Reference in New Issue
Block a user