commit 9d8eab444ea267c92390264e93f602e4dfa06900
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Apr 14 03:59:22 2017 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Apr 14 03:59:22 2017 +0000
tree 5555383c67d3032dd25ac467abb5b777d6053e59
parent 7c23319656671ca1df0a4c90702272209ce2c504
parent e038a71e5b2ed2df21393a92c19397dcb3402bc9

Merge "libhidl: export cutils headers" into oc-dev

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 \
 
 
 #