Snap for 12399304 from 70a2a32350 to 25Q1-release

Change-Id: I8443175003896ce854ffae6d7ca16d2b75840e37

cast_auth/mediadrm/Android.bp

@@ -1,7 +1,11 @@
-
 // ----------------------------------------------------------------------------
 // Builds android.hardware.drm-service.castkey
 //
+// TODO(b/366426322): Merge these targets into `device/google/gs-common`.
+
+soong_namespace {
+}
+
 package {
     // See: http://go/android-license-faq
     // A large-scale-change added 'default_applicable_licenses' to import
@@ -32,7 +36,10 @@ cc_defaults {
 
     relative_install_path: "hw",
 
-    cflags: ["-Wall", "-Werror"],
+    cflags: [
+        "-Wall",
+        "-Werror",
+    ],
 
     include_dirs: [
         "device/google/tangorpro/cast_auth/mediadrm/include",

device-tangorpro.mk

@@ -258,7 +258,10 @@ PRODUCT_VENDOR_PROPERTIES += \
 PRODUCT_SOONG_NAMESPACES += \
 	vendor/lib64
 
+# TODO(b/366426322): Merge CastKey Drm plugin into `device/google/gs-common`.
 # CastKey Drm plugin modules
+PRODUCT_SOONG_NAMESPACES += \
+	device/google/tangorpro/cast_auth/mediadrm
 PRODUCT_PACKAGES += \
 	android.hardware.drm-service.castkey