commit 5f78eddeddf98531561863b1772330eb397b0b14
author Andreas Huber <andih@google.com> Fri Apr 14 04:18:08 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Apr 14 04:18:08 2017 +0000
tree 1b70594cc040b6685cb070517b4009e1dcca46f2
parent 7469f338762faa13edbb9195b89762feab6cbb89
parent 05973ee6045b24fe45c74ec90207fa35d9bc31f4

Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)" into oc-dev
am: 05973ee604

Change-Id: Ia3b96fb4c8ae5b6d52bac804128b94fe55b094c5

service/Android.mk

diff --git a/service/Android.mk b/service/Android.mk
index 9a49755..46bb9da 100644
--- a/service/Android.mk
+++ b/service/Android.mk
@@ -38,8 +38,8 @@
 
 LOCAL_JAVA_LIBRARIES += android.car
 LOCAL_STATIC_JAVA_LIBRARIES += \
-        android.hardware.automotive.vehicle@2.0-java-static \
-        android.hardware.automotive.vehicle@2.1-java-static \
+        android.hardware.automotive.vehicle-V2.0-java-static \
+        android.hardware.automotive.vehicle-V2.1-java-static \
         vehicle-hal-support-lib \
         car-systemtest \
 
@@ -57,8 +57,8 @@
 
 LOCAL_JAVA_LIBRARIES += android.car
 LOCAL_STATIC_JAVA_LIBRARIES += \
-        android.hardware.automotive.vehicle@2.0-java-static \
-        android.hardware.automotive.vehicle@2.1-java-static \
+        android.hardware.automotive.vehicle-V2.0-java-static \
+        android.hardware.automotive.vehicle-V2.1-java-static \
         vehicle-hal-support-lib \
         car-systemtest \
 

tests/EmbeddedKitchenSinkApp/Android.mk

diff --git a/tests/EmbeddedKitchenSinkApp/Android.mk b/tests/EmbeddedKitchenSinkApp/Android.mk
index 274e6a4..57a0620 100644
--- a/tests/EmbeddedKitchenSinkApp/Android.mk
+++ b/tests/EmbeddedKitchenSinkApp/Android.mk
@@ -37,7 +37,7 @@
 LOCAL_DEX_PREOPT := false
 
 LOCAL_STATIC_JAVA_LIBRARIES += \
-        android.hardware.automotive.vehicle@2.0-java-static \
+        android.hardware.automotive.vehicle-V2.0-java-static \
         vehicle-hal-support-lib \
         car-service-lib-for-test \
 

tests/android_car_api_test/Android.mk

diff --git a/tests/android_car_api_test/Android.mk b/tests/android_car_api_test/Android.mk
index f5f40d0..306a240 100644
--- a/tests/android_car_api_test/Android.mk
+++ b/tests/android_car_api_test/Android.mk
@@ -35,7 +35,7 @@
 LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
 LOCAL_STATIC_JAVA_LIBRARIES += \
         android-support-test \
-        android.hardware.automotive.vehicle@2.0-java-static \
+        android.hardware.automotive.vehicle-V2.0-java-static \
 
 LOCAL_JAVA_LIBRARIES := android.car android.test.runner
 

tests/vehiclehal_test/Android.mk

diff --git a/tests/vehiclehal_test/Android.mk b/tests/vehiclehal_test/Android.mk
index 56327bc..43aa41f 100644
--- a/tests/vehiclehal_test/Android.mk
+++ b/tests/vehiclehal_test/Android.mk
@@ -33,8 +33,8 @@
 
 LOCAL_STATIC_JAVA_LIBRARIES += vehicle-hal-support-lib \
                                android-support-test \
-                               android.hardware.automotive.vehicle@2.0-java-static \
-                               android.hardware.automotive.vehicle@2.1-java-static
+                               android.hardware.automotive.vehicle-V2.0-java-static \
+                               android.hardware.automotive.vehicle-V2.1-java-static
 
 LOCAL_JAVA_LIBRARIES := android.car android.test.runner
 

vehicle-hal-support-lib/Android.mk

diff --git a/vehicle-hal-support-lib/Android.mk b/vehicle-hal-support-lib/Android.mk
index 9370efa..638e5cf 100644
--- a/vehicle-hal-support-lib/Android.mk
+++ b/vehicle-hal-support-lib/Android.mk
@@ -24,8 +24,8 @@
 LOCAL_SRC_FILES := $(call all-java-files-under, src)
 
 LOCAL_STATIC_JAVA_LIBRARIES := \
-    android.hardware.automotive.vehicle@2.0-java-static \
-    android.hardware.automotive.vehicle@2.1-java-static \
+    android.hardware.automotive.vehicle-V2.0-java-static \
+    android.hardware.automotive.vehicle-V2.1-java-static \
     junit \
     legacy-android-test