Build widevide modules with BOARD_VNDK_VERSION

Header libs are added since global include path is not provided when
building with BOARD_VNDK_VERSION. Also, some static libs are marked as
proprietary so that they can be linked against to the drm hal
service.

Bug: 33241851
Test: BOARD_VNDK_VERSION=current m -j
android.hardware.drm@1.0-service.widevine
Change-Id: Iab85869e21917ea212a09d6eaabdb6ba3ace9248

libwvdrmengine/Android.mk

@@ -25,6 +25,9 @@ LOCAL_SHARED_LIBRARIES := \
   libwvhidl \
   libbinder \
 
+LOCAL_HEADER_LIBRARIES := \
+  libstagefright_foundation_headers
+
 LOCAL_MODULE := android.hardware.drm@1.0-service.widevine
 LOCAL_INIT_RC := src_hidl/android.hardware.drm@1.0-service.widevine.rc
 LOCAL_MODULE_PATH := $(TARGET_OUT_VENDOR)/bin/hw
@@ -44,6 +47,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libcdm_utils
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_STATIC_LIBRARIES := libcrypto_static
 
@@ -53,6 +57,12 @@ LOCAL_C_INCLUDES := \
     vendor/widevine/libwvdrmengine/oemcrypto/include \
     vendor/widevine/libwvdrmengine/third_party/stringencoders/src
 
+LOCAL_HEADER_LIBRARIES := \
+    libutils_headers \
+
+LOCAL_SHARED_LIBRARIES := \
+    liblog
+
 SRC_DIR := cdm/src
 CORE_SRC_DIR := cdm/core/src
 LOCAL_SRC_FILES := \
@@ -78,6 +88,7 @@ include $(CLEAR_VARS)
 
 LOCAL_MODULE := libcdm_protos
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
+LOCAL_PROPRIETARY_MODULE := true
 
 CORE_PROTO_SRC_FILES := $(call all-proto-files-under, cdm/core/src)
 METRICS_PROTO_SRC_FILES := $(call all-proto-files-under, cdm/metrics/src)
@@ -104,6 +115,7 @@ include $(BUILD_STATIC_LIBRARY)
 include $(CLEAR_VARS)
 
 LOCAL_MODULE := libwidevinehidl_utils
+LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
 
@@ -113,6 +125,9 @@ LOCAL_C_INCLUDES := \
 LOCAL_SRC_FILES := \
     src_hidl/TypeConvert.cpp
 
+LOCAL_HEADER_LIBRARIES := \
+  libstagefright_headers
+
 LOCAL_SHARED_LIBRARIES := \
   android.hardware.drm@1.0
 
@@ -159,6 +174,10 @@ LOCAL_SHARED_LIBRARIES := \
   libstagefright_foundation \
   libutils \
 
+LOCAL_HEADER_LIBRARIES := \
+  libutils_headers \
+  libstagefright_headers
+
 LOCAL_MODULE := libwvdrmengine
 
 LOCAL_MODULE_RELATIVE_PATH := mediadrm

libwvdrmengine/cdm/Android.mk

@@ -15,6 +15,9 @@ LOCAL_C_INCLUDES += \
     external/jsmn \
     external/protobuf/src \
 
+LOCAL_HEADER_LIBRARIES := \
+    libutils_headers
+
 LOCAL_STATIC_LIBRARIES := libcdm_protos libcrypto_static
 
 SRC_DIR := src
@@ -45,5 +48,6 @@ LOCAL_SRC_FILES := \
 
 LOCAL_MODULE := libcdm
 LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
 
 include $(BUILD_STATIC_LIBRARY)

libwvdrmengine/cdm/src/log.cpp

@@ -22,6 +22,9 @@
 #include "log.h"
 #include <utils/Log.h>
 
+#include <stdio.h>
+#include <stdarg.h>
+
 /*
  * Uncomment the line below if you want to have the LOGV messages to print
  * IMPORTANT : this will affect all of CDM

libwvdrmengine/mediacrypto/Android.mk

@@ -18,10 +18,14 @@ LOCAL_C_INCLUDES := \
   vendor/widevine/libwvdrmengine/mediacrypto/include \
   vendor/widevine/libwvdrmengine/oemcrypto/include \
 
+LOCAL_HEADER_LIBRARIES := \
+  libutils_headers
+
 LOCAL_STATIC_LIBRARIES := \
   libcrypto_static \
 
 LOCAL_MODULE := libwvdrmcryptoplugin
+LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_MODULE_TAGS := optional
 
@@ -47,6 +51,9 @@ LOCAL_C_INCLUDES := \
   vendor/widevine/libwvdrmengine/mediacrypto/include \
   vendor/widevine/libwvdrmengine/oemcrypto/include \
 
+LOCAL_HEADER_LIBRARIES := \
+  libutils_headers
+
 LOCAL_STATIC_LIBRARIES := \
   libcrypto_static \
   libwidevinehidl_utils \
@@ -57,6 +64,7 @@ LOCAL_SHARED_LIBRARIES := \
   libhidlmemory \
 
 LOCAL_MODULE := libwvdrmcryptoplugin_hidl
+LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_MODULE_TAGS := optional
 

libwvdrmengine/mediadrm/Android.mk

@@ -19,7 +19,11 @@ LOCAL_C_INCLUDES := \
   vendor/widevine/libwvdrmengine/mediadrm/include \
   vendor/widevine/libwvdrmengine/oemcrypto/include \
 
+LOCAL_HEADER_LIBRARIES := \
+  libutils_headers
+
 LOCAL_MODULE := libwvdrmdrmplugin
+LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_MODULE_TAGS := optional
 
@@ -46,6 +50,9 @@ LOCAL_C_INCLUDES := \
   vendor/widevine/libwvdrmengine/mediadrm/include \
   vendor/widevine/libwvdrmengine/oemcrypto/include \
 
+LOCAL_HEADER_LIBRARIES := \
+  libutils_headers \
+
 LOCAL_STATIC_LIBRARIES := libcrypto_static
 
 LOCAL_SHARED_LIBRARIES := \
@@ -53,6 +60,7 @@ LOCAL_SHARED_LIBRARIES := \
   android.hidl.memory@1.0 \
 
 LOCAL_MODULE := libwvdrmdrmplugin_hidl
+LOCAL_PROPRIETARY_MODULE := true
 
 LOCAL_MODULE_TAGS := optional
 

libwvdrmengine/vts/vendor_module/Android.mk

@@ -35,6 +35,7 @@ LOCAL_SHARED_LIBRARIES := \
 LOCAL_MODULE := libvtswidevine
 LOCAL_MODULE_RELATIVE_PATH := drm-vts-test-libs
 LOCAL_MODULE_TAGS := optional
+LOCAL_PROPRIETARY_MODULE := true
 
 
 include $(BUILD_SHARED_LIBRARY)