diff --git a/aidl/camera/libhardware_headers/Android.bp b/aidl/camera/libhardware_headers/Android.bp
index ade4f41..cb7c8e3 100644
--- a/aidl/camera/libhardware_headers/Android.bp
+++ b/aidl/camera/libhardware_headers/Android.bp
@@ -3,21 +3,35 @@
 // SPDX-License-Identifier: Apache-2.0
 //
 
-cc_defaults {
+soong_config_module_type {
+    name: "samsung_camera3",
+    module_type: "cc_defaults",
+    config_namespace: "samsungCameraVars",
+    bool_variables: [
+        "needs_sec_get_cam_pos_v1",
+        "needs_sec_get_cam_pos_v2",
+        "needs_sec_reserved_field",
+        "usage_64bit",
+    ],
+    properties: ["cflags"],
+}
+
+samsung_camera3 {
     name: "samsung_camera3_defaults",
-    cppflags: select(soong_config_variable("samsungCameraVars", "needs_sec_get_cam_pos_v1"), {
-        true: ["-DCAMERA_NEEDS_SEC_GET_CAM_POS_V1"],
-        default: [],
-    }) + select(soong_config_variable("samsungCameraVars", "needs_sec_get_cam_pos_v2"), {
-        true: ["-DCAMERA_NEEDS_SEC_GET_CAM_POS_V2"],
-        default: [],
-    }) + select(soong_config_variable("samsungCameraVars", "needs_sec_reserved_field"), {
-        true: ["-DCAMERA_NEEDS_SEC_RESERVED_FIELD"],
-        default: [],
-    }) + select(soong_config_variable("samsungCameraVars", "usage_64bit"), {
-        true: ["-DCAMERA_64BIT_USAGE"],
-        default: [],
-    }),
+    soong_config_variables: {
+        needs_sec_get_cam_pos_v1: {
+            cflags: ["-DCAMERA_NEEDS_SEC_GET_CAM_POS_V1"],
+        },
+        needs_sec_get_cam_pos_v2: {
+            cflags: ["-DCAMERA_NEEDS_SEC_GET_CAM_POS_V2"],
+        },
+        needs_sec_reserved_field: {
+            cflags: ["-DCAMERA_NEEDS_SEC_RESERVED_FIELD"],
+        },
+        usage_64bit: {
+            cflags: ["-DCAMERA_64BIT_USAGE"],
+        },
+    },
 }
 
 cc_library_headers {