diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2017-08-18 16:55:54 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2017-08-18 16:55:54 +0000 |
| commit | 44db790aadd2ea63334f2fb346460dbcd6e1afc5 (patch) | |
| tree | 995ac9d26d23c672c6b1c04040c4a06b9e77875c | |
| parent | 5696309f44639f8d55cef3f6635ddb758183e9d8 (diff) | |
| parent | d3dafe11c489c77846e3225bf36e281cf72aed71 (diff) | |
Merge "Use new libbackup target for Dialer compilation."
| -rw-r--r-- | Android.mk | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/Android.mk b/Android.mk index 2da71a598..dfb0ee304 100644 --- a/Android.mk +++ b/Android.mk @@ -98,12 +98,6 @@ LOCAL_SRC_FILES := $(filter-out $(EXCLUDE_FILES),$(LOCAL_SRC_FILES)) LOCAL_SRC_FILES += java/com/android/voicemail/impl/com/google/internal/communications/voicemailtranscription/v1/VoicemailTranscriptionServiceGrpc.java LOCAL_SRC_FILES += $(call all-proto-files-under, $(SRC_DIRS)) -# Backup Library -BACKUP_LIB_SRC_DIR := ../../../external/libbackup/src/com/google/android/libraries/backup -EXCLUDE_BACKUP_LIB_SRCS := $(call all-java-files-under, $(BACKUP_LIB_SRC_DIR)/shadow) -LOCAL_SRC_FILES += $(call all-java-files-under, $(BACKUP_LIB_SRC_DIR)) -LOCAL_SRC_FILES := $(filter-out $(EXCLUDE_BACKUP_LIB_SRCS),$(LOCAL_SRC_FILES)) - LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH) LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(RES_DIRS)) @@ -151,6 +145,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ jsr305 \ libphonenumber \ volley \ + libbackup \ LOCAL_STATIC_ANDROID_LIBRARIES := \ android-support-core-ui \ @@ -228,8 +223,6 @@ PROCESSOR_LIBRARIES_TARGET := PROCESSOR_JARS := EXCLUDE_MANIFESTS := EXCLUDE_EXTRA_PACKAGES := -BACKUP_LIB_SRC_DIR := -EXCLUDE_BACKUP_LIB_SRCS := # Create references to prebuilt libraries. include $(CLEAR_VARS) |