Field provisioning for L3 OEMCrypto

bug: 8621460

Merge of https://widevine-internal-review.googlesource.com/#/c/4955/
from Widevine CDM repository.

Change-Id: I30cf4314283db51c8e706c026501784259c87c13

libwvdrmengine/oemcrypto/test/Android.mk

@@ -4,8 +4,8 @@ LOCAL_PATH:= $(call my-dir)
 include $(CLEAR_VARS)
 
 LOCAL_SRC_FILES:= \
-    oemcrypto_test.cpp \
-    oemcrypto_keybox_test.cpp
+  oemcrypto_test.cpp \
+  oemcrypto_keybox_test.cpp
 
 LOCAL_MODULE_TAGS := tests
 
@@ -13,26 +13,28 @@ LOCAL_MODULE_TAGS := tests
 LOCAL_CFLAGS += -DCAN_INSTALL_KEYBOX
 
 LOCAL_C_INCLUDES += \
-    bionic \
-    external/gtest/include \
-    external/openssl/include \
-    external/stlport/stlport \
-    $(LOCAL_PATH)/../include \
-    $(LOCAL_PATH)/../mock/src \
+  bionic \
+  external/gtest/include \
+  external/openssl/include \
+  external/stlport/stlport \
+  $(LOCAL_PATH)/../include \
+  $(LOCAL_PATH)/../mock/src \
 
+# TODO(fredgc): fix order dependencies on libwvlevel3 and libwvwrapper.
 LOCAL_STATIC_LIBRARIES := \
-    libgtest \
-    libgtest_main \
-    libl3crypto \
+  libgtest \
+  libgtest_main \
+  libwvwrapper \
+  libwvlevel3 \
 
 LOCAL_SHARED_LIBRARIES := \
-    libcrypto \
-    libcutils \
-    libdl \
-    liblog \
-    libstlport \
-    libutils \
-    libz \
+  libcrypto \
+  libcutils \
+  libdl \
+  liblog \
+  libstlport \
+  libutils \
+  libz \
 
 LOCAL_MODULE:=oemcrypto_test