Fix bug in enforceMinorVersionUprevs.

Every minor version uprev should extend the top-level
interfaces from the previous minor version. In hidl-gen,
we check that at least one interface is extended. Here,
there was a problem where if the minor version upgrade
contains an interface which is not in the previous package,
then this was counted as an extended interface.

The exact problem was that this statement:
lastFQName.getPackageAndVersion() == prevPackage.getPackageAndVersion()

considered an interface extended even if !lastFQNameExists. Since
lastFQName was always constructed from prevPackage, this statement
is always true.

Test: problematic interface fails
Test: hidl_version_test
Change-Id: I41983ad5c44eae1903123d49a9106509e4005f7b

1 files changed, 6 insertions, 1 deletions

diff --git a/Coordinator.cpp b/Coordinator.cpp
index b20b2a85..bd258a2f 100644
--- a/Coordinator.cpp
+++ b/Coordinator.cpp
@@ -580,7 +580,11 @@ status_t Coordinator::enforceMinorVersionUprevs(const FQName &currentPackage) co
 
         bool lastFQNameExists = lastAST != nullptr && lastAST->getInterface() != nullptr;
 
-        if (iface->superType()->fqName() != lastFQName && lastFQNameExists) {
+        if (!lastFQNameExists) {
+            continue;
+        }
+
+        if (iface->superType()->fqName() != lastFQName) {
             std::cerr << "ERROR: Cannot enforce minor version uprevs for "
                       << currentPackage.string() << ": " << iface->fqName().string() << " extends "
                       << iface->superType()->fqName().string()
@@ -590,6 +594,7 @@ status_t Coordinator::enforceMinorVersionUprevs(const FQName &currentPackage) co
         }
 
         // at least one interface must extend the previous version
+        // @2.0::IFoo does not work. It must be @2.1::IFoo for at least one interface.
         if (lastFQName.getPackageAndVersion() == prevPackage.getPackageAndVersion()) {
             extendedInterface = true;
         }