Merges to android Pi release (part 4)

These are a set of CLs merged from the wv cdm repo to the android repo.

* Correct RELEASE_ALL_USAGE_INFO_ERRORs

  Author: Rahul Frias <rfrias@google.com>

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

  RELEASE_ALL_USAGE_INFO_ERROR_4 and 5 were introduced and made use of in
  http://go/wvgerrit/24022 (branch: oc-dev). The error code definitions
  were merged over in http://go/wvgerrit/24602.

  When http://go/wvgerrit/24622 from cdm_partners_3.2 was merged to master
  (http://go/wvgerrit/27723) there was conflict in error codes. The error
  codes were adjusted to RELEASE_ALL_USAGE_INFO_ERROR_3 and 4
  and were made use of.

  To avoid renaming the errors between oc-dev and master, new errors
  RELEASE_ALL_USAGE_INFO_ERROR_6 and 7 have been added to handle the
  scenarios noted in the merge from cdm_partner_3.2. The other
  errors have been reverted back to RELEASE_ALL_USAGE_INFO_ERROR_4 and 5.
  They will be used when http://go/wvgerrit/24602 is merged.

* Address compilation issues

  Author: Rahul Frias <rfrias@google.com>

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

  These changes enable compilation of most of the cdm code on android
  expect for OEMCrypto unit tests (b/62739406) on wv master.

* Add property for binary/base64 provisioning msgs.

  Author: Gene Morgan <gmorgan@google.com>

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

  Property is "provisioning_messages_are_binary". Its default setting is
  false in the CE CDM, but it can be overridden by integrators.

  Added section to integration guide that discusses Provisioning Server
  message formats and the new property.

  Link: https://docs.google.com/document/d/1cBVbhgrajLpDe2W3_vzLzUqzpdDt73chvm4_sZlZlS8/edit#heading=h.hgxw53ddw7jo

BUG: 71650075
Test: Not currently passing. Will be addressed in a subsequent
      commit in the chain.

Change-Id: I9168193819974d1ff65d9a94dbd762e45ecc43ca

libwvdrmengine/run_all_unit_tests.sh

@@ -19,10 +19,12 @@ fi
 adb_shell_run() {
   local test_file=$1
   shift
-  if adb shell ls /data/widevine_tests/$test_file &> /dev/null; then
-    test_file=/data/widevine_tests/$test_file
+  if adb shell ls /data/bin/$test_file &> /dev/null; then
+    test_file=/data/bin/$test_file
   else
-    test_file=/vendor/bin/$test_file
+    echo "Please install the test on the device in /data/bin, "
+    echo "or begin execution by running ./build_and_run_all_unit_tests.sh"
+    exit 1
   fi
   echo $test_file
   local tmp_log="$OUT/mediadrmtest.log"
@@ -49,7 +51,7 @@ if [ -z "$ANDROID_BUILD_TOP" ]; then
 fi
 
 echo "waiting for device"
-ADB_OUTPUT=`adb root && adb wait-for-device remount`
+ADB_OUTPUT=`adb root && echo ". " && adb wait-for-device remount`
 echo $ADB_OUTPUT
 if echo $ADB_OUTPUT | grep -qi "verity"; then
   echo
@@ -62,31 +64,40 @@ fi
 # Disable DroidGuard to prevent provisioning collisions
 set_droidguard disable
 
+# Run oemcrypto tests first due to historical test order issues
 adb_shell_run oemcrypto_test \
   GTEST_FILTER="$GTEST_FILTER:*Level1Required" FORCE_LEVEL3_OEMCRYPTO=yes
 adb_shell_run oemcrypto_test
+
+# Run request_license_test next to ensure device is provisioned
 adb_shell_run request_license_test
+
 # cdm_extended_duration_test takes >30 minutes to run.
 # adb_shell_run cdm_extended_duration_test
-adb_shell_run policy_engine_unittest
-adb_shell_run policy_engine_constraints_unittest
-adb_shell_run libwvdrmmediacrypto_test
-adb_shell_run libwvdrmmediacrypto_hidl_test
-adb_shell_run libwvdrmdrmplugin_test
-adb_shell_run libwvdrmdrmplugin_hidl_test
+
+# Additional tests
+adb_shell_run base64_test
+adb_shell_run buffer_reader_test
 adb_shell_run cdm_engine_test
 adb_shell_run cdm_session_unittest
-adb_shell_run file_store_unittest
-adb_shell_run file_utils_unittest
-adb_shell_run license_unittest
-adb_shell_run license_keys_unittest
-adb_shell_run initialization_data_unittest
 adb_shell_run device_files_unittest
-adb_shell_run service_certificate_unittest
-adb_shell_run timer_unittest
-adb_shell_run buffer_reader_test
 adb_shell_run distribution_test
 adb_shell_run event_metric_test
+adb_shell_run file_store_unittest
+adb_shell_run file_utils_unittest
+adb_shell_run http_socket_test
+adb_shell_run initialization_data_unittest
+adb_shell_run libwvdrmdrmplugin_hidl_test
+adb_shell_run libwvdrmdrmplugin_test
+adb_shell_run libwvdrmmediacrypto_hidl_test
+adb_shell_run libwvdrmmediacrypto_test
+adb_shell_run license_keys_unittest
+adb_shell_run license_unittest
+adb_shell_run policy_engine_constraints_unittest
+adb_shell_run policy_engine_unittest
+adb_shell_run service_certificate_unittest
+adb_shell_run timer_unittest
+adb_shell_run usage_table_header_unittest
 
 # Run the non-Treble test on non-Treble devices
 if adb shell ls /vendor/lib/mediadrm/libwvdrmengine.so &> /dev/null ||