Merge "Merge TQ3A.230705.001 to aosp-main - DO NOT MERGE" into main
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Android.bp b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Android.bp
index bc72484..7d2d293 100644
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Android.bp
+++ b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Car/Android.bp
@@ -55,6 +55,7 @@
//
prebuilt_etc {
name: "parameter-framework.policy",
+ enabled: false, // TODO: This module depends on domaingeneratorpolicyrule_gen, which fails to build
filename_from_src: true,
vendor: true,
src: ":domaingeneratorpolicyrule_gen",
@@ -68,6 +69,7 @@
}
genrule {
name: "domaingeneratorpolicyrule_gen",
+ enabled: false, // TODO: This module fails to build
defaults: ["domaingeneratorpolicyrule"],
srcs: [
":audio_policy_pfw_toplevel",
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/CarEmu/Android.bp b/services/audiopolicy/engineconfigurable/parameter-framework/examples/CarEmu/Android.bp
index 11da8c7..f825e5f 100644
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/CarEmu/Android.bp
+++ b/services/audiopolicy/engineconfigurable/parameter-framework/examples/CarEmu/Android.bp
@@ -56,6 +56,7 @@
//
prebuilt_etc {
name: "parameter-framework.policy",
+ enabled: false, // TODO: This module depends on domaingeneratorpolicyrule_gen, which fails to build
filename_from_src: true,
vendor: true,
src: ":domaingeneratorpolicyrule_gen",
@@ -69,6 +70,7 @@
}
genrule {
name: "domaingeneratorpolicyrule_gen",
+ enabled: false, // TODO: This module fails to build
defaults: ["domaingeneratorpolicyrule"],
srcs: [
":audio_policy_pfw_toplevel",
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Phone/Android.bp b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Phone/Android.bp
index 91ffeb5..4a83cbc 100644
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/Phone/Android.bp
+++ b/services/audiopolicy/engineconfigurable/parameter-framework/examples/Phone/Android.bp
@@ -55,6 +55,7 @@
//
prebuilt_etc {
name: "parameter-framework.policy",
+ enabled: false, // TODO: This module depends on domaingeneratorpolicyrule_gen, which fails to build
filename_from_src: true,
vendor: true,
src: ":domaingeneratorpolicyrule_gen",
@@ -68,6 +69,7 @@
}
genrule {
name: "domaingeneratorpolicyrule_gen",
+ enabled: false, // TODO: This module fails to build
defaults: ["domaingeneratorpolicyrule"],
srcs: [
":audio_policy_pfw_toplevel",
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/SettingsNoInput/Android.bp b/services/audiopolicy/engineconfigurable/parameter-framework/examples/SettingsNoInput/Android.bp
index cac63fc..89ab892 100644
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/SettingsNoInput/Android.bp
+++ b/services/audiopolicy/engineconfigurable/parameter-framework/examples/SettingsNoInput/Android.bp
@@ -34,6 +34,7 @@
prebuilt_etc {
name: "parameter-framework.policy",
+ enabled: false, // TODO: This module depends on domaingeneratorpolicyrule_gen, which fails to build
filename_from_src: true,
vendor: true,
src: ":domaingeneratorpolicyrule_gen",
@@ -47,6 +48,7 @@
genrule {
name: "domaingeneratorpolicyrule_gen",
+ enabled: false, // TODO: This module fails to build
defaults: ["domaingeneratorpolicyrule"],
srcs: [
":audio_policy_pfw_toplevel",
diff --git a/services/audiopolicy/engineconfigurable/parameter-framework/examples/SettingsNoOutput/Android.bp b/services/audiopolicy/engineconfigurable/parameter-framework/examples/SettingsNoOutput/Android.bp
index 337f358..4880547 100644
--- a/services/audiopolicy/engineconfigurable/parameter-framework/examples/SettingsNoOutput/Android.bp
+++ b/services/audiopolicy/engineconfigurable/parameter-framework/examples/SettingsNoOutput/Android.bp
@@ -34,6 +34,7 @@
prebuilt_etc {
name: "parameter-framework.policy",
+ enabled: false, // TODO: This module depends on domaingeneratorpolicyrule_gen, which fails to build
filename_from_src: true,
vendor: true,
src: ":domaingeneratorpolicyrule_gen",
@@ -46,6 +47,7 @@
}
genrule {
name: "domaingeneratorpolicyrule_gen",
+ enabled: false, // TODO: This module fails to build
defaults: ["domaingeneratorpolicyrule"],
srcs: [
":audio_policy_pfw_toplevel",