Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-04-14 02:13:21 +00:00
committed by Android (Google) Code Review
parent 1ad7ff32b1 f13eb2e0c7
commit 9b2ed2b7c4
4 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Android.mk
View File

@@ -569,11 +569,11 @@ LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp bouncycastle ext
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
framework-protos \ framework-protos \
android.hardware.health@1.0-java-constants \ android.hardware.health-V1.0-java-constants \
android.hardware.thermal@1.0-java-constants \ android.hardware.thermal-V1.0-java-constants \
android.hardware.tv.input@1.0-java-constants \ android.hardware.tv.input-V1.0-java-constants \
android.hardware.usb@1.0-java-constants \ android.hardware.usb-V1.0-java-constants \
android.hardware.vibrator@1.0-java-constants \ android.hardware.vibrator-V1.0-java-constants \
# Loaded with System.loadLibrary by android.view.textclassifier # Loaded with System.loadLibrary by android.view.textclassifier
LOCAL_REQUIRED_MODULES += libtextclassifier LOCAL_REQUIRED_MODULES += libtextclassifier

4
services/Android.mk
View File

@@ -40,8 +40,8 @@ services := \
# The convention is to name each service module 'services.$(module_name)' # The convention is to name each service module 'services.$(module_name)'
LOCAL_STATIC_JAVA_LIBRARIES := $(addprefix services.,$(services)) \ LOCAL_STATIC_JAVA_LIBRARIES := $(addprefix services.,$(services)) \
android.hidl.base@1.0-java-static \ android.hidl.base-V1.0-java-static \
android.hardware.biometrics.fingerprint@2.1-java-static android.hardware.biometrics.fingerprint-V2.1-java-static
ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true) ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true)
LOCAL_EMMA_INSTRUMENT := true LOCAL_EMMA_INSTRUMENT := true

14
services/core/Android.mk
View File

@@ -20,17 +20,17 @@ LOCAL_AIDL_INCLUDES += \
LOCAL_JAVA_LIBRARIES := \ LOCAL_JAVA_LIBRARIES := \
services.net \ services.net \
android.hardware.light@2.0-java \ android.hardware.light-V2.0-java \
android.hardware.power@1.0-java \ android.hardware.power-V1.0-java \
android.hardware.tv.cec@1.0-java \ android.hardware.tv.cec-V1.0-java \
android.hidl.manager@1.0-java android.hidl.manager-V1.0-java
LOCAL_STATIC_JAVA_LIBRARIES := \ LOCAL_STATIC_JAVA_LIBRARIES := \
tzdata_shared2 \ tzdata_shared2 \
tzdata_update2 \ tzdata_update2 \
android.hidl.base@1.0-java-static \ android.hidl.base-V1.0-java-static \
android.hardware.biometrics.fingerprint@2.1-java-static \ android.hardware.biometrics.fingerprint-V2.1-java-static \
android.hardware.vibrator@1.0-java-constants \ android.hardware.vibrator-V1.0-java-constants \
ifneq ($(INCREMENTAL_BUILDS),) ifneq ($(INCREMENTAL_BUILDS),)
LOCAL_PROGUARD_ENABLED := disabled LOCAL_PROGUARD_ENABLED := disabled

4
services/usb/Android.mk
View File

@@ -8,7 +8,7 @@ LOCAL_SRC_FILES += \
$(call all-java-files-under,java) $(call all-java-files-under,java)
LOCAL_JAVA_LIBRARIES := services.core LOCAL_JAVA_LIBRARIES := services.core
LOCAL_STATIC_JAVA_LIBRARIES := android.hardware.usb@1.0-java-static \ LOCAL_STATIC_JAVA_LIBRARIES := android.hardware.usb-V1.0-java-static \
android.hidl.manager@1.0-java-static android.hidl.manager-V1.0-java-static
include $(BUILD_STATIC_JAVA_LIBRARY) include $(BUILD_STATIC_JAVA_LIBRARY)