soong: fix TARGET_CAMERA_NEEDS_CLIENT_INFO cppflags
Change-Id: I21851845769007e99fcaf5ddf2b4b9836f508e85
diff --git a/build/soong/Android.bp b/build/soong/Android.bp
index 77e93be..3c13b40 100644
--- a/build/soong/Android.bp
+++ b/build/soong/Android.bp
@@ -208,18 +208,18 @@
}
soong_config_module_type {
- name: "target_camera_needs_client_info",
+ name: "camera_needs_client_info",
module_type: "cc_defaults",
config_namespace: "blissGlobalVars",
- bool_variables: ["target_camera_needs_client_info"],
+ bool_variables: ["camera_needs_client_info"],
properties: ["cppflags"],
}
-target_camera_needs_client_info {
- name: "target_camera_needs_client_info_defaults",
+camera_needs_client_info {
+ name: "camera_needs_client_info_defaults",
soong_config_variables: {
- target_camera_needs_client_info: {
- cppflags: ["-DTARGET_NEEDS_CLIENT_INFO"],
+ camera_needs_client_info: {
+ cppflags: ["-DCAMERA_NEEDS_CLIENT_INFO"],
},
},
}
diff --git a/config/BoardConfigSoong.mk b/config/BoardConfigSoong.mk
index 1a8d8c7..9ee5069 100644
--- a/config/BoardConfigSoong.mk
+++ b/config/BoardConfigSoong.mk
@@ -35,7 +35,7 @@
has_memfd_backport \
ignores_ftp_pptp_conntrack_failure \
needs_netd_direct_connect_rule \
- target_camera_needs_client_info \
+ camera_needs_client_info \
target_init_vendor_lib \
target_inputdispatcher_skip_event_key \
target_ld_shim_libs \
@@ -72,7 +72,7 @@
SOONG_CONFIG_blissGlobalVars_has_memfd_backport := $(TARGET_HAS_MEMFD_BACKPORT)
SOONG_CONFIG_blissGlobalVars_ignores_ftp_pptp_conntrack_failure := $(TARGET_IGNORES_FTP_PPTP_CONNTRACK_FAILURE)
SOONG_CONFIG_blissGlobalVars_needs_netd_direct_connect_rule := $(TARGET_NEEDS_NETD_DIRECT_CONNECT_RULE)
-SOONG_CONFIG_blissGlobalVars_target_camera_needs_client_info := $(TARGET_CAMERA_NEEDS_CLIENT_INFO)
+SOONG_CONFIG_blissGlobalVars_camera_needs_client_info := $(TARGET_CAMERA_NEEDS_CLIENT_INFO)
SOONG_CONFIG_blissNvidiaVars_uses_nvidia_enhancements := $(NV_ANDROID_FRAMEWORK_ENHANCEMENTS)
SOONG_CONFIG_blissQcomVars_legacy_hw_disk_encryption := $(TARGET_LEGACY_HW_DISK_ENCRYPTION)
SOONG_CONFIG_blissQcomVars_should_wait_for_qsee := $(TARGET_KEYMASTER_WAIT_FOR_QSEE)