Only check gen directory for golden tests am: d23ba31cd5
Original change: https://android-review.googlesource.com/c/platform/system/tools/aidl/+/1919080
Change-Id: Ib0a9d7a82ff292c660cb07285b6399dda878255a
diff --git a/generate_cpp.cpp b/generate_cpp.cpp
index f3c2957..4c34f9c 100644
--- a/generate_cpp.cpp
+++ b/generate_cpp.cpp
@@ -1050,6 +1050,13 @@
} else {
out << " { ::android::Parcelable::Stability::STABILITY_LOCAL }";
}
+ } else if (auto type = variable->GetType().GetDefinedType(); type) {
+ if (auto enum_type = type->AsEnumDeclaration(); enum_type) {
+ if (!variable->GetType().IsArray()) {
+ // if an enum doesn't have explicit default value, do zero-initialization
+ out << " = " << cppType << "(0)";
+ }
+ }
}
out << ";\n";
}
diff --git a/generate_ndk.cpp b/generate_ndk.cpp
index 7d44ff0..f62cf69 100644
--- a/generate_ndk.cpp
+++ b/generate_ndk.cpp
@@ -1151,6 +1151,13 @@
}
if (variable->GetDefaultValue()) {
out << " = " << variable->ValueString(ConstantValueDecorator);
+ } else if (auto type = variable->GetType().GetDefinedType(); type) {
+ if (auto enum_type = type->AsEnumDeclaration(); enum_type) {
+ if (!variable->GetType().IsArray()) {
+ // if an enum doesn't have explicit default value, do zero-initialization
+ out << " = " << NdkNameOf(types, variable->GetType(), StorageMode::STACK) << "(0)";
+ }
+ }
}
out << ";\n";
}
diff --git a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/StructuredParcelable.h b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/StructuredParcelable.h
index 9c124bc..7673eeb 100644
--- a/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/StructuredParcelable.h
+++ b/tests/golden_output/aidl-test-interface-cpp-source/gen/include/android/aidl/tests/StructuredParcelable.h
@@ -24,9 +24,9 @@
::std::vector<int32_t> shouldContainThreeFs;
int32_t f = 0;
::std::string shouldBeJerry;
- ::android::aidl::tests::ByteEnum shouldBeByteBar;
- ::android::aidl::tests::IntEnum shouldBeIntBar;
- ::android::aidl::tests::LongEnum shouldBeLongBar;
+ ::android::aidl::tests::ByteEnum shouldBeByteBar = ::android::aidl::tests::ByteEnum(0);
+ ::android::aidl::tests::IntEnum shouldBeIntBar = ::android::aidl::tests::IntEnum(0);
+ ::android::aidl::tests::LongEnum shouldBeLongBar = ::android::aidl::tests::LongEnum(0);
::std::vector<::android::aidl::tests::ByteEnum> shouldContainTwoByteFoos;
::std::vector<::android::aidl::tests::IntEnum> shouldContainTwoIntFoos;
::std::vector<::android::aidl::tests::LongEnum> shouldContainTwoLongFoos;
@@ -59,16 +59,16 @@
::std::vector<int64_t> int64_1 = {1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L};
int32_t hexInt32_pos_1 = 1;
int32_t hexInt64_pos_1 = 1;
- ::android::aidl::tests::ConstantExpressionEnum const_exprs_1;
- ::android::aidl::tests::ConstantExpressionEnum const_exprs_2;
- ::android::aidl::tests::ConstantExpressionEnum const_exprs_3;
- ::android::aidl::tests::ConstantExpressionEnum const_exprs_4;
- ::android::aidl::tests::ConstantExpressionEnum const_exprs_5;
- ::android::aidl::tests::ConstantExpressionEnum const_exprs_6;
- ::android::aidl::tests::ConstantExpressionEnum const_exprs_7;
- ::android::aidl::tests::ConstantExpressionEnum const_exprs_8;
- ::android::aidl::tests::ConstantExpressionEnum const_exprs_9;
- ::android::aidl::tests::ConstantExpressionEnum const_exprs_10;
+ ::android::aidl::tests::ConstantExpressionEnum const_exprs_1 = ::android::aidl::tests::ConstantExpressionEnum(0);
+ ::android::aidl::tests::ConstantExpressionEnum const_exprs_2 = ::android::aidl::tests::ConstantExpressionEnum(0);
+ ::android::aidl::tests::ConstantExpressionEnum const_exprs_3 = ::android::aidl::tests::ConstantExpressionEnum(0);
+ ::android::aidl::tests::ConstantExpressionEnum const_exprs_4 = ::android::aidl::tests::ConstantExpressionEnum(0);
+ ::android::aidl::tests::ConstantExpressionEnum const_exprs_5 = ::android::aidl::tests::ConstantExpressionEnum(0);
+ ::android::aidl::tests::ConstantExpressionEnum const_exprs_6 = ::android::aidl::tests::ConstantExpressionEnum(0);
+ ::android::aidl::tests::ConstantExpressionEnum const_exprs_7 = ::android::aidl::tests::ConstantExpressionEnum(0);
+ ::android::aidl::tests::ConstantExpressionEnum const_exprs_8 = ::android::aidl::tests::ConstantExpressionEnum(0);
+ ::android::aidl::tests::ConstantExpressionEnum const_exprs_9 = ::android::aidl::tests::ConstantExpressionEnum(0);
+ ::android::aidl::tests::ConstantExpressionEnum const_exprs_10 = ::android::aidl::tests::ConstantExpressionEnum(0);
::std::string addString1 = "hello world!";
::std::string addString2 = "The quick brown fox jumps over the lazy dog.";
int32_t shouldSetBit0AndBit2 = 0;
diff --git a/tests/golden_output/aidl-test-interface-ndk-source/gen/include/aidl/android/aidl/tests/StructuredParcelable.h b/tests/golden_output/aidl-test-interface-ndk-source/gen/include/aidl/android/aidl/tests/StructuredParcelable.h
index e937efc..39f163c 100644
--- a/tests/golden_output/aidl-test-interface-ndk-source/gen/include/aidl/android/aidl/tests/StructuredParcelable.h
+++ b/tests/golden_output/aidl-test-interface-ndk-source/gen/include/aidl/android/aidl/tests/StructuredParcelable.h
@@ -29,9 +29,9 @@
std::vector<int32_t> shouldContainThreeFs;
int32_t f = 0;
std::string shouldBeJerry;
- ::aidl::android::aidl::tests::ByteEnum shouldBeByteBar;
- ::aidl::android::aidl::tests::IntEnum shouldBeIntBar;
- ::aidl::android::aidl::tests::LongEnum shouldBeLongBar;
+ ::aidl::android::aidl::tests::ByteEnum shouldBeByteBar = ::aidl::android::aidl::tests::ByteEnum(0);
+ ::aidl::android::aidl::tests::IntEnum shouldBeIntBar = ::aidl::android::aidl::tests::IntEnum(0);
+ ::aidl::android::aidl::tests::LongEnum shouldBeLongBar = ::aidl::android::aidl::tests::LongEnum(0);
std::vector<::aidl::android::aidl::tests::ByteEnum> shouldContainTwoByteFoos;
std::vector<::aidl::android::aidl::tests::IntEnum> shouldContainTwoIntFoos;
std::vector<::aidl::android::aidl::tests::LongEnum> shouldContainTwoLongFoos;
@@ -64,16 +64,16 @@
std::vector<int64_t> int64_1 = {1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L, 1L};
int32_t hexInt32_pos_1 = 1;
int32_t hexInt64_pos_1 = 1;
- ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_1;
- ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_2;
- ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_3;
- ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_4;
- ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_5;
- ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_6;
- ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_7;
- ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_8;
- ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_9;
- ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_10;
+ ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_1 = ::aidl::android::aidl::tests::ConstantExpressionEnum(0);
+ ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_2 = ::aidl::android::aidl::tests::ConstantExpressionEnum(0);
+ ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_3 = ::aidl::android::aidl::tests::ConstantExpressionEnum(0);
+ ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_4 = ::aidl::android::aidl::tests::ConstantExpressionEnum(0);
+ ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_5 = ::aidl::android::aidl::tests::ConstantExpressionEnum(0);
+ ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_6 = ::aidl::android::aidl::tests::ConstantExpressionEnum(0);
+ ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_7 = ::aidl::android::aidl::tests::ConstantExpressionEnum(0);
+ ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_8 = ::aidl::android::aidl::tests::ConstantExpressionEnum(0);
+ ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_9 = ::aidl::android::aidl::tests::ConstantExpressionEnum(0);
+ ::aidl::android::aidl::tests::ConstantExpressionEnum const_exprs_10 = ::aidl::android::aidl::tests::ConstantExpressionEnum(0);
std::string addString1 = "hello world!";
std::string addString2 = "The quick brown fox jumps over the lazy dog.";
int32_t shouldSetBit0AndBit2 = 0;
