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
                     << " \\";

test/java_test/Android.mk

diff --git a/test/java_test/Android.mk b/test/java_test/Android.mk
index efe4558..249398e 100644
--- a/test/java_test/Android.mk
+++ b/test/java_test/Android.mk
@@ -5,11 +5,11 @@
 LOCAL_MODULE := hidl_test_java_lib
 LOCAL_MODULE_STEM := hidl_test_java
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
-LOCAL_JAVA_LIBRARIES :=                         \
-    android.hidl.base@1.0-java                  \
-    android.hardware.tests.baz@1.0-java         \
-    android.hardware.tests.expression@1.0-java  \
-    android.hardware.tests.inheritance@1.0-java
+LOCAL_JAVA_LIBRARIES :=                          \
+    android.hidl.base-V1.0-java                  \
+    android.hardware.tests.baz-V1.0-java         \
+    android.hardware.tests.expression-V1.0-java  \
+    android.hardware.tests.inheritance-V1.0-java
 
 include $(BUILD_JAVA_LIBRARY)
 
@@ -26,7 +26,7 @@
 
 LOCAL_REQUIRED_MODULES :=                       \
     hidl_test_java_lib                          \
-    android.hidl.base@1.0-java                  \
-    android.hardware.tests.baz@1.0-java
+    android.hidl.base-V1.0-java                 \
+    android.hardware.tests.baz-V1.0-java
 
 include $(BUILD_PREBUILT)

test/java_test/hidl_test_java

diff --git a/test/java_test/hidl_test_java b/test/java_test/hidl_test_java
index a28a14f..ae1de07 100644
--- a/test/java_test/hidl_test_java
+++ b/test/java_test/hidl_test_java
@@ -1,5 +1,5 @@
 base=/system
-export CLASSPATH=$base/framework/hidl_test_java.jar:$base/framework/android.hardware.tests.baz@1.0-java.jar:$base/framework/android.hidl.base@1.0-java.jar
+export CLASSPATH=$base/framework/hidl_test_java.jar:$base/framework/android.hardware.tests.baz-V1.0-java.jar:$base/framework/android.hidl.base-V1.0-java.jar
 
 for SIZE in 64 32; do
     if [ -f /system/bin/hidl_test_java_native$SIZE ]; then

test/vendor/1.0/Android.mk

diff --git a/test/vendor/1.0/Android.mk b/test/vendor/1.0/Android.mk
index ef494ab..5caa041 100644
--- a/test/vendor/1.0/Android.mk
+++ b/test/vendor/1.0/Android.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := tests.vendor@1.0-java
+LOCAL_MODULE := tests.vendor-V1.0-java
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
 intermediates := $(call local-generated-sources-dir, COMMON)
@@ -13,8 +13,8 @@
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
 
 LOCAL_JAVA_LIBRARIES := \
-    android.hardware.tests.baz@1.0-java \
-    android.hidl.base@1.0-java \
+    android.hardware.tests.baz-V1.0-java \
+    android.hidl.base-V1.0-java \
 
 
 #
@@ -102,7 +102,7 @@
 ################################################################################
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := tests.vendor@1.0-java-static
+LOCAL_MODULE := tests.vendor-V1.0-java-static
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
 intermediates := $(call local-generated-sources-dir, COMMON)
@@ -110,8 +110,8 @@
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    android.hardware.tests.baz@1.0-java-static \
-    android.hidl.base@1.0-java-static \
+    android.hardware.tests.baz-V1.0-java-static \
+    android.hidl.base-V1.0-java-static \
 
 
 #
@@ -199,7 +199,7 @@
 ################################################################################
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := tests.vendor@1.0-java-constants
+LOCAL_MODULE := tests.vendor-V1.0-java-constants
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
 intermediates := $(call local-generated-sources-dir, COMMON)