Skip to content

Commit ce1bf5c

Browse files
committed
aidl: camera: Partially return to soong_config_module_type usage
This partially reverts commit 00809a1, that broke too many devices that weren't ready yet. Change-Id: I4d234e79a99da15542b81e1741290336e9f08d0b
1 parent 44c057f commit ce1bf5c

1 file changed

Lines changed: 28 additions & 14 deletions

File tree

aidl/camera/libhardware_headers/Android.bp

Lines changed: 28 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -3,21 +3,35 @@
33
// SPDX-License-Identifier: Apache-2.0
44
//
55

6-
cc_defaults {
6+
soong_config_module_type {
7+
name: "samsung_camera3",
8+
module_type: "cc_defaults",
9+
config_namespace: "samsungCameraVars",
10+
bool_variables: [
11+
"needs_sec_get_cam_pos_v1",
12+
"needs_sec_get_cam_pos_v2",
13+
"needs_sec_reserved_field",
14+
"usage_64bit",
15+
],
16+
properties: ["cflags"],
17+
}
18+
19+
samsung_camera3 {
720
name: "samsung_camera3_defaults",
8-
cppflags: select(soong_config_variable("samsungCameraVars", "needs_sec_get_cam_pos_v1"), {
9-
true: ["-DCAMERA_NEEDS_SEC_GET_CAM_POS_V1"],
10-
default: [],
11-
}) + select(soong_config_variable("samsungCameraVars", "needs_sec_get_cam_pos_v2"), {
12-
true: ["-DCAMERA_NEEDS_SEC_GET_CAM_POS_V2"],
13-
default: [],
14-
}) + select(soong_config_variable("samsungCameraVars", "needs_sec_reserved_field"), {
15-
true: ["-DCAMERA_NEEDS_SEC_RESERVED_FIELD"],
16-
default: [],
17-
}) + select(soong_config_variable("samsungCameraVars", "usage_64bit"), {
18-
true: ["-DCAMERA_64BIT_USAGE"],
19-
default: [],
20-
}),
21+
soong_config_variables: {
22+
needs_sec_get_cam_pos_v1: {
23+
cflags: ["-DCAMERA_NEEDS_SEC_GET_CAM_POS_V1"],
24+
},
25+
needs_sec_get_cam_pos_v2: {
26+
cflags: ["-DCAMERA_NEEDS_SEC_GET_CAM_POS_V2"],
27+
},
28+
needs_sec_reserved_field: {
29+
cflags: ["-DCAMERA_NEEDS_SEC_RESERVED_FIELD"],
30+
},
31+
usage_64bit: {
32+
cflags: ["-DCAMERA_64BIT_USAGE"],
33+
},
34+
},
2135
}
2236

2337
cc_library_headers {

0 commit comments

Comments
 (0)