Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f37bea87 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Changed the naming scheme for Treble java libraries (both static and dynamic)"

parents b0bb01d8 6733baff

bluetooth/1.0/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) 
################################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.bluetooth@1.0-java

LOCAL_MODULE := android.hardware.bluetooth-V1.0-java

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)
@@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) 
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



LOCAL_JAVA_LIBRARIES := \

    android.hidl.base@1.0-java \

    android.hidl.base-V1.0-java \





#
@@ -84,7 +84,7 @@ include $(BUILD_JAVA_LIBRARY) 
################################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.bluetooth@1.0-java-static

LOCAL_MODULE := android.hardware.bluetooth-V1.0-java-static

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)
@@ -92,7 +92,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) 
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 \





#

boot/1.0/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) 
################################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.boot@1.0-java

LOCAL_MODULE := android.hardware.boot-V1.0-java

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)
@@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) 
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



LOCAL_JAVA_LIBRARIES := \

    android.hidl.base@1.0-java \

    android.hidl.base-V1.0-java \





#
@@ -80,7 +80,7 @@ include $(BUILD_JAVA_LIBRARY) 
################################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.boot@1.0-java-static

LOCAL_MODULE := android.hardware.boot-V1.0-java-static

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)
@@ -88,7 +88,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) 
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 \





#

configstore/1.0/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) 
################################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.configstore@1.0-java

LOCAL_MODULE := android.hardware.configstore-V1.0-java

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)
@@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) 
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



LOCAL_JAVA_LIBRARIES := \

    android.hidl.base@1.0-java \

    android.hidl.base-V1.0-java \





#
@@ -156,7 +156,7 @@ include $(BUILD_JAVA_LIBRARY) 
################################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.configstore@1.0-java-static

LOCAL_MODULE := android.hardware.configstore-V1.0-java-static

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)
@@ -164,7 +164,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) 
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 \





#

ir/1.0/Android.mk

+4 −4
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) 
################################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.ir@1.0-java

LOCAL_MODULE := android.hardware.ir-V1.0-java

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)
@@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) 
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



LOCAL_JAVA_LIBRARIES := \

    android.hidl.base@1.0-java \

    android.hidl.base-V1.0-java \





#
@@ -61,7 +61,7 @@ include $(BUILD_JAVA_LIBRARY) 
################################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.ir@1.0-java-static

LOCAL_MODULE := android.hardware.ir-V1.0-java-static

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)
@@ -69,7 +69,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) 
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 \





#

nfc/1.0/Android.mk

+5 −5
Original line number Diff line number Diff line
@@ -5,7 +5,7 @@ LOCAL_PATH := $(call my-dir) 
################################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.nfc@1.0-java

LOCAL_MODULE := android.hardware.nfc-V1.0-java

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)
@@ -13,7 +13,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) 
HIDL := $(HOST_OUT_EXECUTABLES)/hidl-gen$(HOST_EXECUTABLE_SUFFIX)



LOCAL_JAVA_LIBRARIES := \

    android.hidl.base@1.0-java \

    android.hidl.base-V1.0-java \





#
@@ -103,7 +103,7 @@ include $(BUILD_JAVA_LIBRARY) 
################################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.nfc@1.0-java-static

LOCAL_MODULE := android.hardware.nfc-V1.0-java-static

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)
@@ -111,7 +111,7 @@ intermediates := $(call local-generated-sources-dir, COMMON) 
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 \





#
@@ -201,7 +201,7 @@ include $(BUILD_STATIC_JAVA_LIBRARY) 
################################################################################



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.nfc@1.0-java-constants

LOCAL_MODULE := android.hardware.nfc-V1.0-java-constants

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



intermediates := $(call local-generated-sources-dir, COMMON)