Merge changes I6dd829f4,Id8384c58,I9228b9cc,I744a1e89 into sc-dev

* changes:
  Fix CDM Builds w/ OEMCrypto_ERROR_INVALID_ENTITLED_KEY_SESSION
  Fix unused param warnings in oemcrypto fuzz test
  Add http socket tests to other tests
  Turn on ODK tests in CE CDM test and fix test helper
This commit is contained in:
TreeHugger Robot
2021-04-27 19:20:34 +00:00
committed by Android (Google) Code Review
9 changed files with 49 additions and 63 deletions

View File

@@ -91,8 +91,7 @@ include $(LOCAL_PATH)/integration-test.mk
test_name := http_socket_test
test_src_dir := ../core/test
test_main :=
include $(LOCAL_PATH)/integration-test.mk
include $(LOCAL_PATH)/unit-test.mk
test_name := initialization_data_unittest
test_src_dir := ../core/test