diff options
34 files changed, 183 insertions, 316 deletions
diff --git a/services/Android.bp b/services/Android.bp index 84c45fe7f6bd..5e75c371d171 100644 --- a/services/Android.bp +++ b/services/Android.bp @@ -1,3 +1,46 @@ +// merge all required services into one jar +// ============================================================ +java_library { + name: "services", + + dex_preopt: { + app_image: true, + profile: "art-profile", + }, + + srcs: [ + "java/**/*.java", + ], + + // The convention is to name each service module 'services.$(module_name)' + static_libs: [ + "services.core.priorityboosted", + "services.accessibility", + "services.appwidget", + "services.autofill", + "services.backup", + "services.companion", + "services.coverage", + "services.devicepolicy", + "services.midi", + "services.net", + "services.print", + "services.restrictions", + "services.usage", + "services.usb", + "services.voiceinteraction", + "android.hidl.base-V1.0-java", + ], + + libs: [ + "android.hidl.manager-V1.0-java", + ], + + // Uncomment to enable output of certain warnings (deprecated, unchecked) + //javacflags: ["-Xlint"], + +} + // native library // ============================================================= diff --git a/services/Android.mk b/services/Android.mk deleted file mode 100644 index 81d8181077b8..000000000000 --- a/services/Android.mk +++ /dev/null @@ -1,67 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -# merge all required services into one jar -# ============================================================ -include $(CLEAR_VARS) - -LOCAL_MODULE := services -LOCAL_DEX_PREOPT_APP_IMAGE := true -LOCAL_DEX_PREOPT_GENERATE_PROFILE := true -LOCAL_DEX_PREOPT_PROFILE_CLASS_LISTING := $(LOCAL_PATH)/art-profile - -LOCAL_SRC_FILES := $(call all-java-files-under,java) - -# EventLogTags files. -LOCAL_SRC_FILES += \ - core/java/com/android/server/EventLogTags.logtags - -# Uncomment to enable output of certain warnings (deprecated, unchecked) -# LOCAL_JAVACFLAGS := -Xlint - -# Services that will be built as part of services.jar -# These should map to directory names relative to this -# Android.mk. -services := \ - core \ - accessibility \ - appwidget \ - autofill \ - backup \ - companion \ - coverage\ - devicepolicy \ - midi \ - net \ - print \ - restrictions \ - usage \ - usb \ - voiceinteraction - -# The convention is to name each service module 'services.$(module_name)' -LOCAL_STATIC_JAVA_LIBRARIES := $(addprefix services.,$(services)) \ - android.hidl.base-V1.0-java \ - android.hardware.biometrics.fingerprint-V2.1-java - -LOCAL_JAVA_LIBRARIES := \ - android.hidl.manager-V1.0-java - -ifeq ($(EMMA_INSTRUMENT_FRAMEWORK),true) -LOCAL_EMMA_INSTRUMENT := true -endif - -include $(BUILD_JAVA_LIBRARY) - -# ============================================================= - -ifeq (,$(ONE_SHOT_MAKEFILE)) -# A full make is happening, so make everything. -include $(call all-makefiles-under,$(LOCAL_PATH)) -else -# If we ran an mm[m] command, we still want to build the individual -# services that we depend on. This differs from the above condition -# by only including service makefiles and not any tests or other -# modules. -include $(patsubst %,$(LOCAL_PATH)/%/Android.mk,$(services)) -endif - diff --git a/services/accessibility/Android.bp b/services/accessibility/Android.bp new file mode 100644 index 000000000000..f991d7b50fcb --- /dev/null +++ b/services/accessibility/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.accessibility", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/accessibility/Android.mk b/services/accessibility/Android.mk deleted file mode 100644 index ce89aa7697ae..000000000000 --- a/services/accessibility/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.accessibility - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/appwidget/Android.bp b/services/appwidget/Android.bp new file mode 100644 index 000000000000..aad2ad198bb7 --- /dev/null +++ b/services/appwidget/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.appwidget", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/appwidget/Android.mk b/services/appwidget/Android.mk deleted file mode 100644 index e9bab4a94a30..000000000000 --- a/services/appwidget/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.appwidget - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/autofill/Android.bp b/services/autofill/Android.bp new file mode 100644 index 000000000000..2768c1851314 --- /dev/null +++ b/services/autofill/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.autofill", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/autofill/Android.mk b/services/autofill/Android.mk deleted file mode 100644 index a1f19fd4c72d..000000000000 --- a/services/autofill/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.autofill - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/backup/Android.bp b/services/backup/Android.bp new file mode 100644 index 000000000000..ef03d83d4916 --- /dev/null +++ b/services/backup/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.backup", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/backup/Android.mk b/services/backup/Android.mk deleted file mode 100644 index 3e686d122668..000000000000 --- a/services/backup/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.backup - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/companion/Android.bp b/services/companion/Android.bp new file mode 100644 index 000000000000..d2dac357a227 --- /dev/null +++ b/services/companion/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.companion", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/companion/Android.mk b/services/companion/Android.mk deleted file mode 100644 index be48761cbae5..000000000000 --- a/services/companion/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.companion - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/core/Android.bp b/services/core/Android.bp new file mode 100644 index 000000000000..446c2a52be22 --- /dev/null +++ b/services/core/Android.bp @@ -0,0 +1,57 @@ +java_library_static { + name: "services.core", + + aidl: { + include_dirs: [ + "frameworks/native/aidl/binder", + "system/core/storaged/binder", + "system/netd/server/binder", + "system/vold/binder", + ], + }, + srcs: [ + "java/**/*.java", + ":netd_aidl", + ":netd_metrics_aidl", + ":installd_aidl", + ":storaged_aidl", + ":vold_aidl", + "java/com/android/server/EventLogTags.logtags", + "java/com/android/server/am/EventLogTags.logtags", + ], + + libs: [ + "services.net", + "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", + ], + + static_libs: [ + "time_zone_distro", + "time_zone_distro_installer", + "android.hardware.health-V1.0-java", + "android.hardware.health-V2.0-java", + "android.hardware.weaver-V1.0-java", + "android.hardware.biometrics.fingerprint-V2.1-java", + "android.hardware.oemlock-V1.0-java", + "android.hardware.tetheroffload.control-V1.0-java", + "android.hardware.vibrator-V1.0-java", + "android.hardware.configstore-V1.0-java", + "android.hardware.contexthub-V1.0-java", + ], +} + +java_genrule { + name: "services.core.priorityboosted", + srcs: [":services.core"], + tools: ["lockedregioncodeinjection"], + cmd: "$(location lockedregioncodeinjection) " + + " --targets \"Lcom/android/server/am/ActivityManagerService;,Lcom/android/server/wm/WindowHashMap;\" " + + " --pre \"com/android/server/am/ActivityManagerService.boostPriorityForLockedSection,com/android/server/wm/WindowManagerService.boostPriorityForLockedSection\" " + + " --post \"com/android/server/am/ActivityManagerService.resetPriorityAfterLockedSection,com/android/server/wm/WindowManagerService.resetPriorityAfterLockedSection\" " + + " -o $(out) " + + " -i $(in)", + out: ["services.core.priorityboosted.jar"], +} diff --git a/services/core/Android.mk b/services/core/Android.mk deleted file mode 100644 index 3d81baf27958..000000000000 --- a/services/core/Android.mk +++ /dev/null @@ -1,72 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.core - -LOCAL_AIDL_INCLUDES := \ - frameworks/native/aidl/binder \ - system/core/storaged/binder \ - system/netd/server/binder \ - system/vold/binder - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) \ - java/com/android/server/EventLogTags.logtags \ - java/com/android/server/am/EventLogTags.logtags \ - ../../../../system/core/storaged/binder/android/os/IStoraged.aidl \ - ../../../../system/netd/server/binder/android/net/INetd.aidl \ - ../../../../system/netd/server/binder/android/net/metrics/INetdEventListener.aidl \ - ../../../../system/vold/binder/android/os/IVold.aidl \ - ../../../../system/vold/binder/android/os/IVoldListener.aidl \ - ../../../../system/vold/binder/android/os/IVoldTaskListener.aidl \ - ../../../native/cmds/installd/binder/android/os/IInstalld.aidl \ - -LOCAL_AIDL_INCLUDES += \ - system/netd/server/binder - -LOCAL_JAVA_LIBRARIES := \ - services.net \ - 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 := \ - time_zone_distro \ - time_zone_distro_installer \ - android.hidl.base-V1.0-java \ - android.hardware.health-V1.0-java \ - android.hardware.health-V2.0-java \ - android.hardware.weaver-V1.0-java \ - android.hardware.biometrics.fingerprint-V2.1-java \ - android.hardware.oemlock-V1.0-java \ - android.hardware.tetheroffload.control-V1.0-java \ - android.hardware.vibrator-V1.0-java \ - android.hardware.configstore-V1.0-java \ - android.hardware.contexthub-V1.0-java - -ifneq ($(INCREMENTAL_BUILDS),) - LOCAL_PROGUARD_ENABLED := disabled - LOCAL_JACK_ENABLED := incremental -endif - -LOCAL_JACK_FLAGS := \ - -D jack.transformations.boost-locked-region-priority=true \ - -D jack.transformations.boost-locked-region-priority.classname=com.android.server.am.ActivityManagerService,com.android.server.wm.WindowHashMap \ - -D jack.transformations.boost-locked-region-priority.request=com.android.server.am.ActivityManagerService\#boostPriorityForLockedSection,com.android.server.wm.WindowManagerService\#boostPriorityForLockedSection \ - -D jack.transformations.boost-locked-region-priority.reset=com.android.server.am.ActivityManagerService\#resetPriorityAfterLockedSection,com.android.server.wm.WindowManagerService\#resetPriorityAfterLockedSection - -LOCAL_JAR_PROCESSOR := lockedregioncodeinjection -# Use = instead of := to delay evaluation of ${in} and ${out} -LOCAL_JAR_PROCESSOR_ARGS = \ - --targets \ - "Lcom/android/server/am/ActivityManagerService;,Lcom/android/server/wm/WindowHashMap;" \ - --pre \ - "com/android/server/am/ActivityManagerService.boostPriorityForLockedSection,com/android/server/wm/WindowManagerService.boostPriorityForLockedSection" \ - --post \ - "com/android/server/am/ActivityManagerService.resetPriorityAfterLockedSection,com/android/server/wm/WindowManagerService.resetPriorityAfterLockedSection" \ - -o ${out} \ - -i ${in} - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/coverage/Android.bp b/services/coverage/Android.bp new file mode 100644 index 000000000000..16c9c1bfcdaa --- /dev/null +++ b/services/coverage/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.coverage", + srcs: ["java/**/*.java"], + libs: ["jacocoagent"], +} diff --git a/services/coverage/Android.mk b/services/coverage/Android.mk deleted file mode 100644 index da99994d6b4c..000000000000 --- a/services/coverage/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.coverage - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := jacocoagent - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/devicepolicy/Android.bp b/services/devicepolicy/Android.bp new file mode 100644 index 000000000000..05052047e0fb --- /dev/null +++ b/services/devicepolicy/Android.bp @@ -0,0 +1,9 @@ +java_library_static { + name: "services.devicepolicy", + srcs: ["java/**/*.java"], + + libs: [ + "conscrypt", + "services.core", + ], +} diff --git a/services/devicepolicy/Android.mk b/services/devicepolicy/Android.mk deleted file mode 100644 index 7020f174fefe..000000000000 --- a/services/devicepolicy/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.devicepolicy - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := conscrypt services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/midi/Android.bp b/services/midi/Android.bp new file mode 100644 index 000000000000..3745e89e8034 --- /dev/null +++ b/services/midi/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.midi", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/midi/Android.mk b/services/midi/Android.mk deleted file mode 100644 index faac01cd86f4..000000000000 --- a/services/midi/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.midi - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/net/Android.bp b/services/net/Android.bp new file mode 100644 index 000000000000..e0ae68f20483 --- /dev/null +++ b/services/net/Android.bp @@ -0,0 +1,4 @@ +java_library_static { + name: "services.net", + srcs: ["java/**/*.java"], +} diff --git a/services/net/Android.mk b/services/net/Android.mk deleted file mode 100644 index 408794e7d0b9..000000000000 --- a/services/net/Android.mk +++ /dev/null @@ -1,13 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.net - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_AIDL_INCLUDES += \ - system/netd/server/binder - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/print/Android.bp b/services/print/Android.bp new file mode 100644 index 000000000000..80a8c7560de6 --- /dev/null +++ b/services/print/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.print", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/print/Android.mk b/services/print/Android.mk deleted file mode 100644 index 00eb2e4f9f98..000000000000 --- a/services/print/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.print - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/restrictions/Android.bp b/services/restrictions/Android.bp new file mode 100644 index 000000000000..979e891ada5f --- /dev/null +++ b/services/restrictions/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.restrictions", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/restrictions/Android.mk b/services/restrictions/Android.mk deleted file mode 100644 index 57d1c465f825..000000000000 --- a/services/restrictions/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.restrictions - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/tests/Android.mk b/services/tests/Android.mk deleted file mode 100644 index 40369ee2ec5c..000000000000 --- a/services/tests/Android.mk +++ /dev/null @@ -1,3 +0,0 @@ -LOCAL_PATH:= $(call my-dir) - -include $(call all-makefiles-under, $(LOCAL_PATH)) diff --git a/services/usage/Android.bp b/services/usage/Android.bp new file mode 100644 index 000000000000..1064b6ed802f --- /dev/null +++ b/services/usage/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.usage", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/usage/Android.mk b/services/usage/Android.mk deleted file mode 100644 index f1cbe98586bb..000000000000 --- a/services/usage/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.usage - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/usb/Android.bp b/services/usb/Android.bp new file mode 100644 index 000000000000..0cd9ac306dfb --- /dev/null +++ b/services/usb/Android.bp @@ -0,0 +1,14 @@ +java_library_static { + name: "services.usb", + srcs: ["java/**/*.java"], + + libs: [ + "services.core", + "android.hidl.manager-V1.0-java", + ], + + static_libs: [ + "android.hardware.usb-V1.0-java", + "android.hardware.usb-V1.1-java", + ], +} diff --git a/services/usb/Android.mk b/services/usb/Android.mk deleted file mode 100644 index 55bfccfcef85..000000000000 --- a/services/usb/Android.mk +++ /dev/null @@ -1,16 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.usb - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core \ -android.hidl.manager-V1.0-java - -LOCAL_STATIC_JAVA_LIBRARIES := android.hardware.usb-V1.0-java \ -android.hardware.usb-V1.1-java - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/services/voiceinteraction/Android.bp b/services/voiceinteraction/Android.bp new file mode 100644 index 000000000000..390406f97264 --- /dev/null +++ b/services/voiceinteraction/Android.bp @@ -0,0 +1,5 @@ +java_library_static { + name: "services.voiceinteraction", + srcs: ["java/**/*.java"], + libs: ["services.core"], +} diff --git a/services/voiceinteraction/Android.mk b/services/voiceinteraction/Android.mk deleted file mode 100644 index c9e5dd02cbbe..000000000000 --- a/services/voiceinteraction/Android.mk +++ /dev/null @@ -1,12 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(CLEAR_VARS) - -LOCAL_MODULE := services.voiceinteraction - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,java) - -LOCAL_JAVA_LIBRARIES := services.core - -include $(BUILD_STATIC_JAVA_LIBRARY) diff --git a/tools/locked_region_code_injection/Android.bp b/tools/locked_region_code_injection/Android.bp index 6dd6059dcc4f..5f81a2eeb130 100644 --- a/tools/locked_region_code_injection/Android.bp +++ b/tools/locked_region_code_injection/Android.bp @@ -1,4 +1,4 @@ -java_library_host { +java_binary_host { name: "lockedregioncodeinjection", manifest: "manifest.txt", srcs: ["src/**/*.java"], |