Merge "Update dependencies for new aconfig flag storage" into main am: daa3c71739
Original change: https://android-review.googlesource.com/c/platform/build/+/3068041 Change-Id: Iad23c5a46f16b23155c4cfdf27278d405bfd5907 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
@@ -161,6 +161,9 @@ cc_test {
|
|||||||
shared_libs: [
|
shared_libs: [
|
||||||
"server_configurable_flags",
|
"server_configurable_flags",
|
||||||
],
|
],
|
||||||
|
defaults: [
|
||||||
|
"aconfig_lib_cc_static_link.defaults",
|
||||||
|
],
|
||||||
test_suites: ["general-tests"],
|
test_suites: ["general-tests"],
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -176,6 +179,9 @@ cc_test {
|
|||||||
shared_libs: [
|
shared_libs: [
|
||||||
"server_configurable_flags",
|
"server_configurable_flags",
|
||||||
],
|
],
|
||||||
|
defaults: [
|
||||||
|
"aconfig_lib_cc_static_link.defaults",
|
||||||
|
],
|
||||||
test_suites: ["general-tests"],
|
test_suites: ["general-tests"],
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -199,6 +205,9 @@ cc_test {
|
|||||||
shared_libs: [
|
shared_libs: [
|
||||||
"server_configurable_flags",
|
"server_configurable_flags",
|
||||||
],
|
],
|
||||||
|
defaults: [
|
||||||
|
"aconfig_lib_cc_static_link.defaults",
|
||||||
|
],
|
||||||
test_suites: ["general-tests"],
|
test_suites: ["general-tests"],
|
||||||
}
|
}
|
||||||
*/
|
*/
|
||||||
@@ -215,6 +224,9 @@ cc_test {
|
|||||||
shared_libs: [
|
shared_libs: [
|
||||||
"server_configurable_flags",
|
"server_configurable_flags",
|
||||||
],
|
],
|
||||||
|
defaults: [
|
||||||
|
"aconfig_lib_cc_static_link.defaults",
|
||||||
|
],
|
||||||
test_suites: ["general-tests"],
|
test_suites: ["general-tests"],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user