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

Commit f13eb2e0 authored by Andreas Huber's avatar Andreas Huber
Browse files

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: Ica91a6813956f4ea99001c5f427be94865e48fde
Merged-In: I2d8912dc752f904188457c3e6dac10da1afd287a
parent 1be9766a

Android.mk

+5 −5
Original line number Diff line number Diff line
@@ -569,11 +569,11 @@ LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp bouncycastle ext 


LOCAL_STATIC_JAVA_LIBRARIES :=                          \

    framework-protos                                    \

    android.hardware.health@1.0-java-constants          \

    android.hardware.thermal@1.0-java-constants         \

    android.hardware.tv.input@1.0-java-constants        \

    android.hardware.usb@1.0-java-constants             \

    android.hardware.vibrator@1.0-java-constants        \

    android.hardware.health-V1.0-java-constants          \

    android.hardware.thermal-V1.0-java-constants         \

    android.hardware.tv.input-V1.0-java-constants        \

    android.hardware.usb-V1.0-java-constants             \

    android.hardware.vibrator-V1.0-java-constants        \



# Loaded with System.loadLibrary by android.view.textclassifier

LOCAL_REQUIRED_MODULES += libtextclassifier

services/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -40,8 +40,8 @@ services := \ 


# The convention is to name each service module 'services.$(module_name)'

LOCAL_STATIC_JAVA_LIBRARIES := $(addprefix services.,$(services)) \

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

    android.hardware.biometrics.fingerprint@2.1-java-static

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

    android.hardware.biometrics.fingerprint-V2.1-java-static



ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true)

LOCAL_EMMA_INSTRUMENT := true

services/core/Android.mk

+7 −7
Original line number Diff line number Diff line
@@ -20,17 +20,17 @@ LOCAL_AIDL_INCLUDES += \ 


LOCAL_JAVA_LIBRARIES := \

    services.net \

    android.hardware.light@2.0-java \

    android.hardware.power@1.0-java \

    android.hardware.tv.cec@1.0-java \

    android.hidl.manager@1.0-java

    android.hardware.light-V2.0-java \

    android.hardware.power-V1.0-java \

    android.hardware.tv.cec-V1.0-java \

    android.hidl.manager-V1.0-java



LOCAL_STATIC_JAVA_LIBRARIES := \

    tzdata_shared2 \

    tzdata_update2 \

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

    android.hardware.biometrics.fingerprint@2.1-java-static \

    android.hardware.vibrator@1.0-java-constants \

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

    android.hardware.biometrics.fingerprint-V2.1-java-static \

    android.hardware.vibrator-V1.0-java-constants \



ifneq ($(INCREMENTAL_BUILDS),)

    LOCAL_PROGUARD_ENABLED := disabled

services/usb/Android.mk

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ LOCAL_SRC_FILES += \ 
      $(call all-java-files-under,java)



LOCAL_JAVA_LIBRARIES := services.core

LOCAL_STATIC_JAVA_LIBRARIES := android.hardware.usb@1.0-java-static \

android.hidl.manager@1.0-java-static

LOCAL_STATIC_JAVA_LIBRARIES := android.hardware.usb-V1.0-java-static \

android.hidl.manager-V1.0-java-static



include $(BUILD_STATIC_JAVA_LIBRARY)