diff --git a/camera/Android.bp b/camera/Android.bp
index 8f732d0781e..2d0e47f1b3c 100644
--- a/camera/Android.bp
+++ b/camera/Android.bp
@@ -55,6 +55,8 @@ cc_aconfig_library {
     name: "camera_platform_flags_c_lib",
     aconfig_declarations: "camera_platform_flags",
     host_supported: true,
+    vendor_available: true,
+    double_loadable: true,
 }
 
 java_aconfig_library {
@@ -70,6 +72,14 @@ cc_library_headers {
 cc_library {
     name: "libcamera_client",
     defaults: ["camera_parameter_library_defaults"],
+    // Legacy (pre-Treble) vendor camera HALs (device/asus/flo) link this
+    // directly -- see project README/lineage-21 notes. Additive: does not
+    // remove the existing platform variant.
+    vendor_available: true,
+    // libmediandk (an NDK-facing library) also links this, so it must be
+    // safe to load into both vendor and platform process address spaces
+    // simultaneously.
+    double_loadable: true,
 
     aidl: {
         export_aidl_headers: true,
@@ -117,6 +127,15 @@ cc_library {
         "lib-platform-compat-native-api",
     ],
 
+    // ICameraClient.cpp/ICameraRecordingProxy.cpp/ICamera.cpp include
+    // media/hardware/HardwareAPI.h. On the platform variant this resolved
+    // transitively through another shared_lib; that path doesn't extend to
+    // this module's new vendor variant, so declare the real dependency
+    // directly. media_plugin_headers is already vendor_available.
+    header_libs: [
+        "media_plugin_headers",
+    ],
+
     include_dirs: [
         "system/media/private/camera/include",
         "frameworks/native/include/media/openmax",
@@ -165,12 +184,22 @@ cc_library_host_static {
 
 cc_library_static {
     name: "libcamera_parameters",
+    vendor_available: true,
 
     export_include_dirs: [
         "include",
     ],
     srcs: ["CameraParameters.cpp"],
-
+    // utils/Log.h (libutils) isn't available to the vendor variant; the
+    // vendor-safe replacement is log/log.h (liblog), which provides the
+    // same ALOG*/LOG_TAG macros this file actually uses.
+    header_libs: ["liblog_headers"],
+    // CameraParameters.h itself uses utils/KeyedVector.h and utils/String8.h
+    // (real libutils types, not a deprecated shim like Log.h -- libutils is
+    // VNDK-core, so vendor code can link it directly). libcamera_client
+    // already declares this same dependency; libcamera_parameters was
+    // simply missing it.
+    shared_libs: ["libutils"],
 }
 
 // AIDL interface between camera clients and the camera service.
diff --git a/camera/CameraParameters.cpp b/camera/CameraParameters.cpp
index 272b113f230..c7c63d08209 100644
--- a/camera/CameraParameters.cpp
+++ b/camera/CameraParameters.cpp
@@ -16,7 +16,7 @@
 */
 
 #define LOG_TAG "CameraParams"
-#include <utils/Log.h>
+#include <log/log.h>
 
 #include <string.h>
 #include <stdlib.h>