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

Commit a04af1cf authored by Andreas Huber's avatar Andreas Huber Committed by android-build-merger
Browse files

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

am: 8afd952d

Change-Id: If26dc4c5bb23ea23ed48d35aa8618e0b7f2825a3
parents bb43d5e2 8afd952d

audio/2.0/Android.mk

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



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.audio@2.0-java-constants

LOCAL_MODULE := android.hardware.audio-V2.0-java-constants

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



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

audio/common/2.0/Android.mk

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



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.audio.common@2.0-java-constants

LOCAL_MODULE := android.hardware.audio.common-V2.0-java-constants

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



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

audio/effect/2.0/Android.mk

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



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.audio.effect@2.0-java-constants

LOCAL_MODULE := android.hardware.audio.effect-V2.0-java-constants

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



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

automotive/vehicle/2.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.automotive.vehicle@2.0-java

LOCAL_MODULE := android.hardware.automotive.vehicle-V2.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 \





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



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.automotive.vehicle@2.0-java-static

LOCAL_MODULE := android.hardware.automotive.vehicle-V2.0-java-static

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



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





#

automotive/vehicle/2.1/Android.mk

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



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.automotive.vehicle@2.1-java

LOCAL_MODULE := android.hardware.automotive.vehicle-V2.1-java

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



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



LOCAL_JAVA_LIBRARIES := \

    android.hardware.automotive.vehicle@2.0-java \

    android.hidl.base@1.0-java \

    android.hardware.automotive.vehicle-V2.0-java \

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





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



include $(CLEAR_VARS)

LOCAL_MODULE := android.hardware.automotive.vehicle@2.1-java-static

LOCAL_MODULE := android.hardware.automotive.vehicle-V2.1-java-static

LOCAL_MODULE_CLASS := JAVA_LIBRARIES



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



LOCAL_STATIC_JAVA_LIBRARIES := \

    android.hardware.automotive.vehicle@2.0-java-static \

    android.hidl.base@1.0-java-static \

    android.hardware.automotive.vehicle-V2.0-java-static \

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





#