From 0c850a4cb32330a6536bf676e398d21018ab285f Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Tue, 7 Apr 2015 12:09:55 -0700
Subject: [PATCH] Remove setup of proto generated include/header dependency.

They are now set up automatically by the build system.

Bug: 20093047
Change-Id: I3ab1256952915e402adf6510c0f6fdb158feb802
---
 libwvdrmengine/Android.mk                  | 10 ----------
 libwvdrmengine/cdm/Android.mk              |  1 -
 libwvdrmengine/cdm/test/unit-test.mk       |  2 --
 libwvdrmengine/mediacrypto/test/Android.mk |  9 ---------
 libwvdrmengine/mediadrm/test/Android.mk    |  9 ---------
 5 files changed, 31 deletions(-)

diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk
index 8c348391..a4359a7c 100644
--- a/libwvdrmengine/Android.mk
+++ b/libwvdrmengine/Android.mk
@@ -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 :=
diff --git a/libwvdrmengine/cdm/Android.mk b/libwvdrmengine/cdm/Android.mk
index de699dbe..66d795b4 100644
--- a/libwvdrmengine/cdm/Android.mk
+++ b/libwvdrmengine/cdm/Android.mk
@@ -14,7 +14,6 @@ LOCAL_C_INCLUDES += \
     external/protobuf/src
 
 LOCAL_STATIC_LIBRARIES := libcdm_protos libcrypto_static
-LOCAL_ADDITIONAL_DEPENDENCIES := $(cdm_proto_gen_headers)
 
 SRC_DIR := src
 CORE_SRC_DIR := core/src
diff --git a/libwvdrmengine/cdm/test/unit-test.mk b/libwvdrmengine/cdm/test/unit-test.mk
index 1e35ac23..5417ba78 100644
--- a/libwvdrmengine/cdm/test/unit-test.mk
+++ b/libwvdrmengine/cdm/test/unit-test.mk
@@ -29,8 +29,6 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_C_INCLUDES += external/protobuf/src
 
-LOCAL_ADDITIONAL_DEPENDENCIES := $(cdm_proto_gen_headers)
-
 LOCAL_STATIC_LIBRARIES := \
     libcdm \
     libcdm_protos \
diff --git a/libwvdrmengine/mediacrypto/test/Android.mk b/libwvdrmengine/mediacrypto/test/Android.mk
index 8770a9ee..d5a2f79f 100644
--- a/libwvdrmengine/mediacrypto/test/Android.mk
+++ b/libwvdrmengine/mediacrypto/test/Android.mk
@@ -33,18 +33,9 @@ LOCAL_SHARED_LIBRARIES := \
   libstagefright_foundation \
   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 += \
-  $(proto_generated_cc_sources_dir)/$(LOCAL_PATH)/core/src \
   external/protobuf/src \
 
-LOCAL_ADDITIONAL_DEPENDENCIES += $(proto_generated_headers)
-
 # End protobuf section
 
 LOCAL_MODULE := libwvdrmmediacrypto_test
diff --git a/libwvdrmengine/mediadrm/test/Android.mk b/libwvdrmengine/mediadrm/test/Android.mk
index 980913c4..98c73b4f 100644
--- a/libwvdrmengine/mediadrm/test/Android.mk
+++ b/libwvdrmengine/mediadrm/test/Android.mk
@@ -33,18 +33,9 @@ LOCAL_SHARED_LIBRARIES := \
   libprotobuf-cpp-lite \
   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 += \
-  $(proto_generated_cc_sources_dir)/$(LOCAL_PATH)/core/src \
   external/protobuf/src \
 
-LOCAL_ADDITIONAL_DEPENDENCIES += $(proto_generated_headers)
-
 # End protobuf section
 
 LOCAL_MODULE := libwvdrmdrmplugin_test