Merge changes from topic "librmnetctl-pre-uplink" into r
* changes:
soong: Add SOONG_CONFIG_DATASERVICES_USES_PRE_UPLINK_FEATURES_NETMGRD
extract_utils: Set `filename_from_src: true` for `CLASS=ETC` targets
diff --git a/build/tools/extract_utils.sh b/build/tools/extract_utils.sh
index 7c05284..cf7399b 100644
--- a/build/tools/extract_utils.sh
+++ b/build/tools/extract_utils.sh
@@ -438,6 +438,7 @@
printf '\tname: "%s",\n' "$PKGNAME"
printf '\towner: "%s",\n' "$VENDOR"
printf '\tsrc: "%s/etc/%s",\n' "$SRC" "$FILE"
+ printf '\tfilename_from_src: true,\n'
elif [ "$CLASS" = "EXECUTABLES" ]; then
if [ "$EXTENSION" = "sh" ]; then
printf 'sh_binary {\n'
diff --git a/config/BoardConfigQcom.mk b/config/BoardConfigQcom.mk
index 924fad5..126d768 100644
--- a/config/BoardConfigQcom.mk
+++ b/config/BoardConfigQcom.mk
@@ -96,3 +96,7 @@
# Allow a device to opt-out hardset of PRODUCT_SOONG_NAMESPACES
QCOM_SOONG_NAMESPACE ?= hardware/qcom-caf/$(QCOM_HARDWARE_VARIANT)
PRODUCT_SOONG_NAMESPACES += $(QCOM_SOONG_NAMESPACE)
+
+SOONG_CONFIG_NAMESPACES += DATASERVICES
+SOONG_CONFIG_DATASERVICES += USES_PRE_UPLINK_FEATURES_NETMGRD
+SOONG_CONFIG_DATASERVICES_USES_PRE_UPLINK_FEATURES_NETMGRD := $(TARGET_USES_PRE_UPLINK_FEATURES_NETMGRD)