Clarify VINTF stability error. am: e460aa358c am: 8c047c373d am: d685cb82f3 am: 00acfb344a

Original change: https://android-review.googlesource.com/c/platform/system/tools/aidl/+/2517675

Change-Id: I587856080d78889b7f16c700b9fc6608bf731a1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2 files changed, 7 insertions, 4 deletions

diff --git a/aidl.cpp b/aidl.cpp
index 038a11b0..3b6f2ee8 100644
--- a/aidl.cpp
+++ b/aidl.cpp
@@ -641,7 +641,8 @@ AidlError load_and_validate_aidl(const std::string& input_file_name, const Optio
         !isStable) {
       err = AidlError::NOT_STRUCTURED;
       AIDL_ERROR(type) << type.GetCanonicalName()
-                       << " does not have VINTF level stability, but this interface requires it in "
+                       << " does not have VINTF level stability (marked @VintfStability), but this "
+                          "interface requires it in "
                        << to_string(options.TargetLanguage());
     }
 
diff --git a/aidl_unittest.cpp b/aidl_unittest.cpp
index 41a20829..2d401143 100644
--- a/aidl_unittest.cpp
+++ b/aidl_unittest.cpp
@@ -476,7 +476,8 @@ TEST_P(AidlTest, VintfStabilityAppliesToNestedTypesAsWell) {
   CaptureStderr();
   EXPECT_EQ(nullptr, Parse("Foo.aidl", "parcelable Foo {}", typenames_, GetLanguage(), nullptr,
                            {"--structured", "--stability", "vintf"}));
-  EXPECT_THAT(GetCapturedStderr(), HasSubstr("Foo does not have VINTF level stability"));
+  EXPECT_THAT(GetCapturedStderr(),
+              HasSubstr("Foo does not have VINTF level stability (marked @VintfStability)"));
 }
 
 TEST_F(AidlTest, ParsesJavaOnlyStableParcelable) {
@@ -547,8 +548,9 @@ TEST_P(AidlTest, NdkAndJavaStabilityIsVintfStable) {
     EXPECT_EQ(GetCapturedStderr(), "");
   } else {
     EXPECT_EQ(result, nullptr);
-    EXPECT_THAT(GetCapturedStderr(),
-                HasSubstr("NonPortableThing does not have VINTF level stability"));
+    EXPECT_THAT(
+        GetCapturedStderr(),
+        HasSubstr("NonPortableThing does not have VINTF level stability (marked @VintfStability)"));
   }
 }