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

Commit a5a93f55 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android Git Automerger
Browse files

am 7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev

* commit '7f416631':
  Check feature bits before loading optional services
parents 7bd287b7 7f416631
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -18,8 +18,6 @@ include $(CLEAR_VARS)

LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-subdir-Iaidl-files)

LOCAL_JAVA_LIBRARIES := services

LOCAL_PACKAGE_NAME := Keyguard

LOCAL_CERTIFICATE := platform
+10 −14
Original line number Diff line number Diff line
LOCAL_PATH:= $(call my-dir)

# the java library
# merge all required services into one jar
# ============================================================
include $(CLEAR_VARS)

LOCAL_SRC_FILES :=

# TODO: Move this to the product makefiles
REQUIRED_SERVICES := core accessibility appwidget backup devicepolicy print

include $(patsubst %,$(LOCAL_PATH)/%/java/service.mk,$(REQUIRED_SERVICES))

LOCAL_MODULE := services

LOCAL_JAVA_LIBRARIES := android.policy conscrypt telephony-common
LOCAL_SRC_FILES := $(call all-java-files-under,java)

#LOCAL_PROGUARD_ENABLED := full
#LOCAL_PROGUARD_FLAG_FILES := proguard.flags
LOCAL_STATIC_JAVA_LIBRARIES := \
    services.core \
    services.accessibility \
    services.appwidget \
    services.backup \
    services.devicepolicy \
    services.print

include $(BUILD_JAVA_LIBRARY)

include $(BUILD_DROIDDOC)

# native library
# =============================================================

+10 −0
Original line number Diff line number Diff line
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

LOCAL_MODULE := services.accessibility

LOCAL_SRC_FILES += \
      $(call all-java-files-under,java)

include $(BUILD_STATIC_JAVA_LIBRARY)
+0 −11
Original line number Diff line number Diff line
# Include only if the service is required
ifneq ($(findstring accessibility,$(REQUIRED_SERVICES)),)

SUB_DIR := accessibility/java

LOCAL_SRC_FILES += \
      $(call all-java-files-under,$(SUB_DIR))

#DEFINED_SERVICES += com.android.server.accessibility.AccessibilityManagerService

endif
+10 −0
Original line number Diff line number Diff line
LOCAL_PATH := $(call my-dir)

include $(CLEAR_VARS)

LOCAL_MODULE := services.appwidget

LOCAL_SRC_FILES += \
      $(call all-java-files-under,java)

include $(BUILD_STATIC_JAVA_LIBRARY)
Loading