commit fb9e8b655e67031c156687eeb4e561c976d04015
author Yifan Hong <elsk@google.com> Tue Jan 23 15:47:23 2018 -0800
committer Yifan Hong <elsk@google.com> Tue Jan 23 16:48:32 2018 -0800
tree 8ccf50bcc7185d92f471523763edee3c0c2eca81
parent f7e8b1bc78ce6a2981ebd4b1a3031b8a0fe3c726

AssembleVintf: add minor revision to kernel version

Test: builds
Bug: 72388844
Change-Id: I7af9aad696781be80af048dd48162e6c4e9fd9bf

AssembleVintf.cpp

diff --git a/AssembleVintf.cpp b/AssembleVintf.cpp
index d2fbb47..8951471 100644
--- a/AssembleVintf.cpp
+++ b/AssembleVintf.cpp
@@ -357,8 +357,7 @@
                 return false;
             }
             for (ConditionedConfig& conditionedConfig : conditionedConfigs) {
-                MatrixKernel kernel(KernelVersion{pair.first.majorVer, pair.first.minorVer, 0u},
-                                    std::move(conditionedConfig.second));
+                MatrixKernel kernel(KernelVersion{pair.first}, std::move(conditionedConfig.second));
                 if (conditionedConfig.first != nullptr)
                     kernel.mConditions.push_back(std::move(*conditionedConfig.first));
                 matrix->framework.mKernels.push_back(std::move(kernel));
@@ -583,12 +582,12 @@
         return *mCheckFile;
     }
 
-    bool hasKernelVersion(const Version& kernelVer) const override {
+    bool hasKernelVersion(const KernelVersion& kernelVer) const override {
         return mKernels.find(kernelVer) != mKernels.end();
     }
 
-    std::istream& addKernelConfigInputStream(const Version& kernelVer, const std::string& name,
-                                             Istream&& in) override {
+    std::istream& addKernelConfigInputStream(const KernelVersion& kernelVer,
+                                             const std::string& name, Istream&& in) override {
         auto&& kernel = mKernels[kernelVer];
         auto it = kernel.emplace(kernel.end(), name, std::move(in));
         return it->stream();
@@ -621,7 +620,7 @@
     Istream mCheckFile;
     bool mOutputMatrix = false;
     SerializeFlags mSerializeFlags = SerializeFlag::EVERYTHING;
-    std::map<Version, std::vector<NamedIstream>> mKernels;
+    std::map<KernelVersion, std::vector<NamedIstream>> mKernels;
     std::map<std::string, std::string> mFakeEnv;
 };
 
@@ -646,7 +645,7 @@
         std::cerr << "Unrecognized --kernel option '" << kernelArg << "'" << std::endl;
         return false;
     }
-    Version kernelVer;
+    KernelVersion kernelVer;
     if (!parse(tokens.front(), &kernelVer)) {
         std::cerr << "Unrecognized kernel version '" << tokens.front() << "'" << std::endl;
         return false;