diff options
| author | Adam Lesinski <adamlesinski@google.com> | 2014-02-06 20:16:30 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-02-06 20:16:30 +0000 |
| commit | a5a93f559d337ad5b79716b05ea43707eb779dc8 (patch) | |
| tree | aeaf5708202369f8035298433acd9376552c1fbe /services/backup | |
| parent | 7bd287b70a1c95c96663a6028e9809fd3844f55a (diff) | |
| parent | 7f416631413e75a1756bd316a2e1906725d72f24 (diff) | |
| download | frameworks_base-a5a93f559d337ad5b79716b05ea43707eb779dc8.zip frameworks_base-a5a93f559d337ad5b79716b05ea43707eb779dc8.tar.gz frameworks_base-a5a93f559d337ad5b79716b05ea43707eb779dc8.tar.bz2 | |
am 7f416631: Merge "Check feature bits before loading optional services" into klp-modular-dev
* commit '7f416631413e75a1756bd316a2e1906725d72f24':
Check feature bits before loading optional services
Diffstat (limited to 'services/backup')
| -rw-r--r-- | services/backup/Android.mk | 12 | ||||
| -rw-r--r-- | services/backup/java/service.mk | 11 |
2 files changed, 12 insertions, 11 deletions
diff --git a/services/backup/Android.mk b/services/backup/Android.mk new file mode 100644 index 0000000..3e686d1 --- /dev/null +++ b/services/backup/Android.mk @@ -0,0 +1,12 @@ +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/backup/java/service.mk b/services/backup/java/service.mk deleted file mode 100644 index bd22b95..0000000 --- a/services/backup/java/service.mk +++ /dev/null @@ -1,11 +0,0 @@ -# Include only if the service is required -ifneq ($(findstring backup,$(REQUIRED_SERVICES)),) - -SUB_DIR := backup/java - -LOCAL_SRC_FILES += \ - $(call all-java-files-under,$(SUB_DIR)) - -#DEFINED_SERVICES += com.android.server.backup.BackupManagerService - -endif |