commit aa573273fba7030405fb3b12d10bd5de85b90aa3
author Andreas Huber <andih@google.com> Thu Apr 13 09:58:06 2017 -0700
committer Andreas Huber <andih@google.com> Thu Apr 13 15:17:47 2017 -0700
tree 82784d791c0a3fd39af1d291aece6b8dec51050c
parent 2cf4b9a9c85d1912aad2a644da97045e9ae01339

Changed the naming scheme for Treble java libraries (both static and dynamic)

android.hardware.foo@1.0-java => android.hardware.foo-V1.0-java

Bug: 37207894
Test: make
Change-Id: I0f62c49a098400a9798b31d0912f0155bbe75c08
Merged-In: Ia87b63d5c90772e4620aa9fe3ce431b297be117b

main.cpp

diff --git a/main.cpp b/main.cpp
index f82d33f..68e033c 100644
--- a/main.cpp
+++ b/main.cpp
@@ -131,6 +131,14 @@
     return packageFQName.string();
 }
 
+static std::string makeJavaLibraryName(const FQName &packageFQName) {
+    std::string out;
+    out = packageFQName.package();
+    out += "-V";
+    out += packageFQName.version();
+    return out;
+}
+
 static void generatePackagePathsSection(
         Formatter &out,
         Coordinator *coordinator,
@@ -484,7 +492,7 @@
         return -errno;
     }
 
-    const std::string libraryName = makeLibraryName(packageFQName);
+    const std::string libraryName = makeJavaLibraryName(packageFQName);
 
     Formatter out(file);
 
@@ -528,7 +536,7 @@
             out.indent();
             for (const auto &importedPackage : importedPackages) {
                 out << "\n"
-                    << makeLibraryName(importedPackage)
+                    << makeJavaLibraryName(importedPackage)
                     << "-java"
                     << staticSuffix
                     << " \\";