diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-01-28 15:34:50 -0800 |
|---|---|---|
| committer | Adam Lesinski <adamlesinski@google.com> | 2014-02-05 19:26:40 +0000 |
| commit | 898c13df7b9b12ff10062f3542593e12fbe0c119 (patch) | |
| tree | 323bc4d7da06b48af2079f44c5f8d346d265e956 /services/Android.mk | |
| parent | df88d73092c62a1a3cd2b2056ca63ae2e70cc238 (diff) | |
| download | frameworks_base-898c13df7b9b12ff10062f3542593e12fbe0c119.zip frameworks_base-898c13df7b9b12ff10062f3542593e12fbe0c119.tar.gz frameworks_base-898c13df7b9b12ff10062f3542593e12fbe0c119.tar.bz2 | |
Check feature bits before loading optional services
At startup, we check with PackageManager whether a system service is
available before attempting to load it. A system service is available
if its associated feature (similar to hardware features) is present.
This does not remove unavailable services from the compiled jar.
Change-Id: I13571805083aa4e65519a74acb52efd17b9fb3d7
Diffstat (limited to 'services/Android.mk')
| -rw-r--r-- | services/Android.mk | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/services/Android.mk b/services/Android.mk index 80fd35a..a8881b6 100644 --- a/services/Android.mk +++ b/services/Android.mk @@ -1,27 +1,23 @@ 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_MODULE:= services +LOCAL_SRC_FILES := $(call all-java-files-under,java) -LOCAL_JAVA_LIBRARIES := android.policy conscrypt telephony-common - -#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 # ============================================================= |