summaryrefslogtreecommitdiffstats
path: root/ir
diff options
context:
space:
mode:
authorAndreas Huber2017-04-13 11:53:54 -0500
committerAndreas Huber2017-04-13 17:23:46 -0500
commit6fa374ad303ad4478014d175298222ca92a43593 (patch)
treef6a5011e41fd8dbddf870a059a7307ec95474fdd /ir
parente70bffdf3c8c26f944d71b44b69356b9e7239c0e (diff)
downloadplatform-hardware-interfaces-6fa374ad303ad4478014d175298222ca92a43593.tar.gz
platform-hardware-interfaces-6fa374ad303ad4478014d175298222ca92a43593.tar.xz
platform-hardware-interfaces-6fa374ad303ad4478014d175298222ca92a43593.zip
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: I177f4cfd42f635aaf096107af8309d1a82ed41c0 Merged-In: I8b91881dfaf507c0d852d56ebbb53ff0987e5a34
Diffstat (limited to 'ir')
-rw-r--r--ir/1.0/Android.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/ir/1.0/Android.mk b/ir/1.0/Android.mk
index d43286c3..bdb3b295 100644
--- a/ir/1.0/Android.mk
+++ b/ir/1.0/Android.mk
@@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir)
5################################################################################ 5################################################################################
6 6
7include $(CLEAR_VARS) 7include $(CLEAR_VARS)
8LOCAL_MODULE := android.hardware.ir@1.0-java 8LOCAL_MODULE := android.hardware.ir-V1.0-java
9LOCAL_MODULE_CLASS := JAVA_LIBRARIES 9LOCAL_MODULE_CLASS := JAVA_LIBRARIES
10 10
11intermediates := $(call local-generated-sources-dir, COMMON) 11intermediates := $(call local-generated-sources-dir, COMMON)
@@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON)
13HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) 13HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
14 14
15LOCAL_JAVA_LIBRARIES := \ 15LOCAL_JAVA_LIBRARIES := \
16 android.hidl.base@1.0-java \ 16 android.hidl.base-V1.0-java \
17 17
18 18
19# 19#
@@ -61,7 +61,7 @@ include $(BUILD_JAVA_LIBRARY)
61################################################################################ 61################################################################################
62 62
63include $(CLEAR_VARS) 63include $(CLEAR_VARS)
64LOCAL_MODULE := android.hardware.ir@1.0-java-static 64LOCAL_MODULE := android.hardware.ir-V1.0-java-static
65LOCAL_MODULE_CLASS := JAVA_LIBRARIES 65LOCAL_MODULE_CLASS := JAVA_LIBRARIES
66 66
67intermediates := $(call local-generated-sources-dir, COMMON) 67intermediates := $(call local-generated-sources-dir, COMMON)
@@ -69,7 +69,7 @@ intermediates := $(call local-generated-sources-dir, COMMON)
69HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) 69HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)
70 70
71LOCAL_STATIC_JAVA_LIBRARIES := \ 71LOCAL_STATIC_JAVA_LIBRARIES := \
72 android.hidl.base@1.0-java-static \ 72 android.hidl.base-V1.0-java-static \
73 73
74 74
75# 75#