diff options
author | Andreas Huber | 2017-04-13 11:53:54 -0500 |
---|---|---|
committer | Andreas Huber | 2017-04-13 17:23:46 -0500 |
commit | 6fa374ad303ad4478014d175298222ca92a43593 (patch) | |
tree | f6a5011e41fd8dbddf870a059a7307ec95474fdd /tv | |
parent | e70bffdf3c8c26f944d71b44b69356b9e7239c0e (diff) | |
download | platform-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 'tv')
-rw-r--r-- | tv/cec/1.0/Android.mk | 8 | ||||
-rw-r--r-- | tv/input/1.0/Android.mk | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/tv/cec/1.0/Android.mk b/tv/cec/1.0/Android.mk index b08099e2..1e3853d0 100644 --- a/tv/cec/1.0/Android.mk +++ b/tv/cec/1.0/Android.mk | |||
@@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) | |||
5 | ################################################################################ | 5 | ################################################################################ |
6 | 6 | ||
7 | include $(CLEAR_VARS) | 7 | include $(CLEAR_VARS) |
8 | LOCAL_MODULE := android.hardware.tv.cec@1.0-java | 8 | LOCAL_MODULE := android.hardware.tv.cec-V1.0-java |
9 | LOCAL_MODULE_CLASS := JAVA_LIBRARIES | 9 | LOCAL_MODULE_CLASS := JAVA_LIBRARIES |
10 | 10 | ||
11 | intermediates := $(call local-generated-sources-dir, COMMON) | 11 | intermediates := $(call local-generated-sources-dir, COMMON) |
@@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) | |||
13 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | 13 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) |
14 | 14 | ||
15 | LOCAL_JAVA_LIBRARIES := \ | 15 | LOCAL_JAVA_LIBRARIES := \ |
16 | android.hidl.base@1.0-java \ | 16 | android.hidl.base-V1.0-java \ |
17 | 17 | ||
18 | 18 | ||
19 | # | 19 | # |
@@ -293,7 +293,7 @@ include $(BUILD_JAVA_LIBRARY) | |||
293 | ################################################################################ | 293 | ################################################################################ |
294 | 294 | ||
295 | include $(CLEAR_VARS) | 295 | include $(CLEAR_VARS) |
296 | LOCAL_MODULE := android.hardware.tv.cec@1.0-java-static | 296 | LOCAL_MODULE := android.hardware.tv.cec-V1.0-java-static |
297 | LOCAL_MODULE_CLASS := JAVA_LIBRARIES | 297 | LOCAL_MODULE_CLASS := JAVA_LIBRARIES |
298 | 298 | ||
299 | intermediates := $(call local-generated-sources-dir, COMMON) | 299 | intermediates := $(call local-generated-sources-dir, COMMON) |
@@ -301,7 +301,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) | |||
301 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) | 301 | HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX) |
302 | 302 | ||
303 | LOCAL_STATIC_JAVA_LIBRARIES := \ | 303 | LOCAL_STATIC_JAVA_LIBRARIES := \ |
304 | android.hidl.base@1.0-java-static \ | 304 | android.hidl.base-V1.0-java-static \ |
305 | 305 | ||
306 | 306 | ||
307 | # | 307 | # |
diff --git a/tv/input/1.0/Android.mk b/tv/input/1.0/Android.mk index 87654da1..aa1cf70d 100644 --- a/tv/input/1.0/Android.mk +++ b/tv/input/1.0/Android.mk | |||
@@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) | |||
5 | ################################################################################ | 5 | ################################################################################ |
6 | 6 | ||
7 | include $(CLEAR_VARS) | 7 | include $(CLEAR_VARS) |
8 | LOCAL_MODULE := android.hardware.tv.input@1.0-java-constants | 8 | LOCAL_MODULE := android.hardware.tv.input-V1.0-java-constants |
9 | LOCAL_MODULE_CLASS := JAVA_LIBRARIES | 9 | LOCAL_MODULE_CLASS := JAVA_LIBRARIES |
10 | 10 | ||
11 | intermediates := $(call local-generated-sources-dir, COMMON) | 11 | intermediates := $(call local-generated-sources-dir, COMMON) |