StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aconfig: rename test flag disabled_rw_2 -> disabled_rw_in_other_namespace

Browse Source 
The flag `disabled_rw_2` is used to verify that aconfig can
auto-generate code for flags in different namespaces. Rename the flag to
`disabled_rw_in_other_namespace` to highlight that it belongs to a
different namespace than the other flags.

This CL is a semantic change only.

Bug: None
Test: atest aconfig.test
Change-Id: Ib82fdce0ca3f7cd56b9b3f80e44fe424a03a2ae4
This commit is contained in:
Mårten Kongstad
2023-11-17 09:37:06 +01:00
parent 8fc7cf6301
commit bc76a3d9a0
7 changed files with 67 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
tools/aconfig/src/codegen_cpp.rs
View File

@@ -165,7 +165,7 @@ public:
virtual bool disabled_rw() = 0;
virtual bool disabled_rw_2() = 0;
virtual bool disabled_rw_in_other_namespace() = 0;
virtual bool enabled_fixed_ro() = 0;
@@ -184,8 +184,8 @@ inline bool disabled_rw() {
return provider_->disabled_rw();
}
inline bool disabled_rw_2() {
return provider_->disabled_rw_2();
inline bool disabled_rw_in_other_namespace() {
return provider_->disabled_rw_in_other_namespace();
}
inline bool enabled_fixed_ro() {
@@ -209,7 +209,7 @@ bool com_android_aconfig_test_disabled_ro();
bool com_android_aconfig_test_disabled_rw();
bool com_android_aconfig_test_disabled_rw_2();
bool com_android_aconfig_test_disabled_rw_in_other_namespace();
bool com_android_aconfig_test_enabled_fixed_ro();
@@ -244,9 +244,9 @@ public:
virtual void disabled_rw(bool val) = 0;
virtual bool disabled_rw_2() = 0;
virtual bool disabled_rw_in_other_namespace() = 0;
virtual void disabled_rw_2(bool val) = 0;
virtual void disabled_rw_in_other_namespace(bool val) = 0;
virtual bool enabled_fixed_ro() = 0;
@@ -281,12 +281,12 @@ inline void disabled_rw(bool val) {
provider_->disabled_rw(val);
}
inline bool disabled_rw_2() {
return provider_->disabled_rw_2();
inline bool disabled_rw_in_other_namespace() {
return provider_->disabled_rw_in_other_namespace();
}
inline void disabled_rw_2(bool val) {
provider_->disabled_rw_2(val);
inline void disabled_rw_in_other_namespace(bool val) {
provider_->disabled_rw_in_other_namespace(val);
}
inline bool enabled_fixed_ro() {
@@ -330,9 +330,9 @@ bool com_android_aconfig_test_disabled_rw();
void set_com_android_aconfig_test_disabled_rw(bool val);
bool com_android_aconfig_test_disabled_rw_2();
bool com_android_aconfig_test_disabled_rw_in_other_namespace();
void set_com_android_aconfig_test_disabled_rw_2(bool val);
void set_com_android_aconfig_test_disabled_rw_in_other_namespace(bool val);
bool com_android_aconfig_test_enabled_fixed_ro();
@@ -379,11 +379,11 @@ namespace com::android::aconfig::test {
return cache_[0];
}
virtual bool disabled_rw_2() override {
virtual bool disabled_rw_in_other_namespace() override {
if (cache_[1] == -1) {
cache_[1] = server_configurable_flags::GetServerConfigurableFlag(
"aconfig_flags.other_namespace",
"com.android.aconfig.test.disabled_rw_2",
"com.android.aconfig.test.disabled_rw_in_other_namespace",
"false") == "true";
}
return cache_[1];
@@ -423,8 +423,8 @@ bool com_android_aconfig_test_disabled_rw() {
return com::android::aconfig::test::disabled_rw();
}
bool com_android_aconfig_test_disabled_rw_2() {
return com::android::aconfig::test::disabled_rw_2();
bool com_android_aconfig_test_disabled_rw_in_other_namespace() {
return com::android::aconfig::test::disabled_rw_in_other_namespace();
}
bool com_android_aconfig_test_enabled_fixed_ro() {
@@ -487,20 +487,20 @@ namespace com::android::aconfig::test {
overrides_["disabled_rw"] = val;
}
virtual bool disabled_rw_2() override {
auto it = overrides_.find("disabled_rw_2");
virtual bool disabled_rw_in_other_namespace() override {
auto it = overrides_.find("disabled_rw_in_other_namespace");
if (it != overrides_.end()) {
return it->second;
} else {
return server_configurable_flags::GetServerConfigurableFlag(
"aconfig_flags.other_namespace",
"com.android.aconfig.test.disabled_rw_2",
"com.android.aconfig.test.disabled_rw_in_other_namespace",
"false") == "true";
}
}
virtual void disabled_rw_2(bool val) override {
overrides_["disabled_rw_2"] = val;
virtual void disabled_rw_in_other_namespace(bool val) override {
overrides_["disabled_rw_in_other_namespace"] = val;
}
virtual bool enabled_fixed_ro() override {
@@ -572,13 +572,13 @@ void set_com_android_aconfig_test_disabled_rw(bool val) {
com::android::aconfig::test::disabled_rw(val);
}
bool com_android_aconfig_test_disabled_rw_2() {
return com::android::aconfig::test::disabled_rw_2();
bool com_android_aconfig_test_disabled_rw_in_other_namespace() {
return com::android::aconfig::test::disabled_rw_in_other_namespace();
}
void set_com_android_aconfig_test_disabled_rw_2(bool val) {
com::android::aconfig::test::disabled_rw_2(val);
void set_com_android_aconfig_test_disabled_rw_in_other_namespace(bool val) {
com::android::aconfig::test::disabled_rw_in_other_namespace(val);
}