From 6e9eb297b2315edc0b2c41ae2025ceea4a305d04 Mon Sep 17 00:00:00 2001
From: Rahul Frias <rfrias@google.com>
Date: Thu, 2 Feb 2017 11:29:28 -0800
Subject: [PATCH] Include libcdm_protos archive as LOCAL_STATIC_LIBRARIES

[ Merge of http://go/wvgerrit/23533 ]

Prior to this CL libcdm_protos was included as LOCAL_WHOLE_STATIC_LIBRARIES

b/34393411

Test: Ran unittests and streaming/offline playback using playmovies.

Change-Id: I4cdea8620693ee7660c71e44d08122acd07843a2
---
 libwvdrmengine/Android.mk | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/libwvdrmengine/Android.mk b/libwvdrmengine/Android.mk
index c6f29870..3372b7ff 100644
--- a/libwvdrmengine/Android.mk
+++ b/libwvdrmengine/Android.mk
@@ -88,6 +88,7 @@ LOCAL_C_INCLUDES := \
 
 LOCAL_STATIC_LIBRARIES := \
   libcdm \
+  libcdm_protos \
   libcdm_utils \
   libcrypto_static \
   libjsmn \
@@ -104,8 +105,6 @@ LOCAL_SHARED_LIBRARIES := \
   libstagefright_foundation \
   libutils \
 
-LOCAL_WHOLE_STATIC_LIBRARIES := libcdm_protos
-
 LOCAL_MODULE := libwvdrmengine
 
 LOCAL_MODULE_RELATIVE_PATH := mediadrm