commit 0a80ba6df7efd2df3f509935d2dfd245908cb056
author Andreas Huber <andih@google.com> Thu Apr 13 09:57:28 2017 -0700
committer Andreas Huber <andih@google.com> Thu Apr 13 15:17:07 2017 -0700
tree adb685ade65144929d907ff956ee8be0972c42e7
parent 95084fc0a5041af7039e5f48fbb18dbca95fbb43

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: Iad2fe667c4fb8594d513a0b3c08a4c3229d5b6a7
Merged-In: If80e117ef3a284ab2dcc67b7c6a91da22530d71f

transport/base/1.0/Android.mk

diff --git a/transport/base/1.0/Android.mk b/transport/base/1.0/Android.mk
index c4a1de9..2031a92 100644
--- a/transport/base/1.0/Android.mk
+++ b/transport/base/1.0/Android.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := android.hidl.base@1.0-java
+LOCAL_MODULE := android.hidl.base-V1.0-java
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
 intermediates := $(call local-generated-sources-dir, COMMON)
@@ -55,7 +55,7 @@
 ################################################################################
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := android.hidl.base@1.0-java-static
+LOCAL_MODULE := android.hidl.base-V1.0-java-static
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
 intermediates := $(call local-generated-sources-dir, COMMON)

transport/manager/1.0/Android.mk

diff --git a/transport/manager/1.0/Android.mk b/transport/manager/1.0/Android.mk
index ce0947c..8b20827 100644
--- a/transport/manager/1.0/Android.mk
+++ b/transport/manager/1.0/Android.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := android.hidl.manager@1.0-java
+LOCAL_MODULE := android.hidl.manager-V1.0-java
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
 intermediates := $(call local-generated-sources-dir, COMMON)
@@ -13,7 +13,7 @@
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
 
 LOCAL_JAVA_LIBRARIES := \
-    android.hidl.base@1.0-java \
+    android.hidl.base-V1.0-java \
 
 
 #
@@ -59,7 +59,7 @@
 ################################################################################
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := android.hidl.manager@1.0-java-static
+LOCAL_MODULE := android.hidl.manager-V1.0-java-static
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
 intermediates := $(call local-generated-sources-dir, COMMON)
@@ -67,7 +67,7 @@
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    android.hidl.base@1.0-java-static \
+    android.hidl.base-V1.0-java-static \
 
 
 #

transport/token/1.0/Android.mk

diff --git a/transport/token/1.0/Android.mk b/transport/token/1.0/Android.mk
index fe2e7bf..ea86d57 100644
--- a/transport/token/1.0/Android.mk
+++ b/transport/token/1.0/Android.mk
@@ -5,7 +5,7 @@
 ################################################################################
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := android.hidl.token@1.0-java
+LOCAL_MODULE := android.hidl.token-V1.0-java
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
 intermediates := $(call local-generated-sources-dir, COMMON)
@@ -13,7 +13,7 @@
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
 
 LOCAL_JAVA_LIBRARIES := \
-    android.hidl.base@1.0-java \
+    android.hidl.base-V1.0-java \
 
 
 #
@@ -39,7 +39,7 @@
 ################################################################################
 
 include $(CLEAR_VARS)
-LOCAL_MODULE := android.hidl.token@1.0-java-static
+LOCAL_MODULE := android.hidl.token-V1.0-java-static
 LOCAL_MODULE_CLASS := JAVA_LIBRARIES
 
 intermediates := $(call local-generated-sources-dir, COMMON)
@@ -47,7 +47,7 @@
 HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    android.hidl.base@1.0-java-static \
+    android.hidl.base-V1.0-java-static \
 
 
 #