Remove hidl support.

Merged from http://go/wvgerrit/161857

Test: streaming(Netflix, Play Movies & TV)
Test: ./build_and_run_all_unit_tests.sh
Test: adb shell ps | grep drm
Test: metrics_dump
Test: hardware/interfaces/drm/aidl/vts$ atest VtsAidlHalDrmTargetTest

Bug: 259299992
Change-Id: I76bcc82bbfb3fc60987b66265a580946a16c341d

libwvdrmengine/cdm/core/include/wv_cdm_constants.h

@@ -61,11 +61,8 @@ constexpr char ATSC_APP_PACKAGE_NAME[] = "org.atsc";
 // Define query keys, values here.
 // To expose these query items to Android update:
 //      android/mediadrm/src/WVDrmPlugin.cpp
-//      android/mediadrm/src_hidl/WVDrmPlugin.cpp
 // Update test QueryStatus and QueryStatusL3 test for all possible outputs:
 //      android/cdm/test/request_license_test.cpp
-// Update HIDL debug output:
-//      android/src_hidl/WVDrmFactory.cpp
 static const std::string QUERY_KEY_LICENSE_TYPE =
     "LicenseType";  // "Streaming", "Offline"
 static const std::string QUERY_KEY_PLAY_ALLOWED =

libwvdrmengine/cdm/core/include/wv_cdm_types.h

@@ -445,7 +445,6 @@ enum CdmResponseType : int32_t {
   // Don't forget to add new values to
   //  * core/test/test_printers.cpp.
   //  * android/include/mapErrors-inl.h
-  //  * android/include_hidl/HidlMapErrors-inl.h
 };
 
 enum CdmKeyStatus : int32_t {

libwvdrmengine/cdm/test/coverage-test.mk

@@ -3,15 +3,6 @@
 #
 include $(CLEAR_VARS)
 
-WV_UNITTESTS_BUILD_TARGET?=
-ifeq ($(WV_UNITTESTS_BUILD_TARGET), hidl)
-HIDL_EXTENSION := _hidl
-LIB_BINDER := libhidlbase
-else
-HIDL_EXTENSION :=
-LIB_BINDER := libbinder_ndk
-endif
-
 LOCAL_LICENSE_CONDITIONS := by_exception_only
 LOCAL_LICENSE_KINDS := legacy_by_exception_only
 LOCAL_MODULE := cdm_coverage_test
@@ -69,7 +60,7 @@ LOCAL_C_INCLUDES += external/protobuf/src
 LOCAL_STATIC_LIBRARIES := \
   libcdm \
   libcdm_protos \
-  libcdm_utils$(HIDL_EXTENSION) \
+  libcdm_utils \
   libjsmn \
   libgmock \
   libgtest \
@@ -81,7 +72,7 @@ LOCAL_SHARED_LIBRARIES := \
   libbase \
   libcrypto \
   libdl \
-  $(LIB_BINDER) \
+  libbinder_ndk \
   liblog \
   libmedia_omx \
   libprotobuf-cpp-lite \

libwvdrmengine/cdm/test/integration-test.mk

@@ -6,15 +6,6 @@ $(call assert-not-null,test_name)
 
 include $(CLEAR_VARS)
 
-WV_UNITTESTS_BUILD_TARGET?=
-ifeq ($(WV_UNITTESTS_BUILD_TARGET), hidl)
-HIDL_EXTENSION := _hidl
-LIB_BINDER := libhidlbase
-else
-HIDL_EXTENSION :=
-LIB_BINDER := libbinder_ndk
-endif
-
 LOCAL_MODULE := $(test_name)
 LOCAL_LICENSE_KINDS := legacy_by_exception_only
 LOCAL_LICENSE_CONDITIONS := by_exception_only
@@ -59,7 +50,7 @@ LOCAL_C_INCLUDES += external/protobuf/src
 LOCAL_STATIC_LIBRARIES := \
     libcdm \
     libcdm_protos \
-    libcdm_utils$(HIDL_EXTENSION) \
+    libcdm_utils \
     libjsmn \
     libgmock \
     libgtest \
@@ -71,7 +62,7 @@ LOCAL_SHARED_LIBRARIES := \
     libbase \
     libcrypto \
     libdl \
-    $(LIB_BINDER) \
+    libbinder_ndk \
     liblog \
     libmedia_omx \
     libprotobuf-cpp-lite \

libwvdrmengine/cdm/test/unit-test.mk

@@ -6,15 +6,6 @@ $(call assert-not-null,test_name)
 
 include $(CLEAR_VARS)
 
-WV_UNITTESTS_BUILD_TARGET?=
-ifeq ($(WV_UNITTESTS_BUILD_TARGET), hidl)
-HIDL_EXTENSION := _hidl
-LIB_BINDER := libhidlbase
-else
-HIDL_EXTENSION :=
-LIB_BINDER := libbinder_ndk
-endif
-
 LOCAL_MODULE := $(test_name)
 LOCAL_LICENSE_KINDS := legacy_by_exception_only
 LOCAL_LICENSE_CONDITIONS := by_exception_only
@@ -52,7 +43,7 @@ LOCAL_C_INCLUDES += external/protobuf/src
 LOCAL_STATIC_LIBRARIES := \
     libcdm \
     libcdm_protos \
-    libcdm_utils$(HIDL_EXTENSION) \
+    libcdm_utils \
     libjsmn \
     libgmock \
     libgtest \
@@ -63,8 +54,7 @@ LOCAL_SHARED_LIBRARIES := \
     libbase \
     libcrypto \
     libdl \
-    libhidlbase \
-    $(LIB_BINDER) \
+    libbinder_ndk \
     liblog \
     libmedia_omx \
     libprotobuf-cpp-lite \

libwvdrmengine/cdm/util/src/log.cpp

@@ -23,11 +23,7 @@
 
 #include "log.h"
 
-#ifdef IS_HIDL
-#  include <hwbinder/IPCThreadState.h>
-#else  // AIDL is the default
-#  include <android/binder_ibinder.h>
-#endif
+#include <android/binder_ibinder.h>
 #include <stdarg.h>
 #include <stdio.h>
 #include <sys/time.h>
@@ -80,12 +76,7 @@ void ClearLoggingUid() {
 uint32_t GetLoggingUid() { return tl_logging_uid_; }
 
 uint32_t GetIpcCallingUid() {
-#ifdef IS_HIDL
-  const auto self = android::hardware::IPCThreadState::selfOrNull();
-  return self ? self->getCallingUid() : UNKNOWN_UID;
-#else  // AIDL is the default
   return AIBinder_getCallingUid();
-#endif
 }
 
 void InitLogging() {}