Update oc-dr1-dev to v11.1 RC16
This moves the branch forward from v11.1 RC06.
This release contains fixes for the following bugs:
Bug: 37275934 63518188 64038420 64098692 64125770 64363054 64693073
Test: make
Change-Id: If70e86738a66a264a8aae17a24dee69495a7d180
Merged-In: I5bd65215a42744ba4149a9359e443679306b6cc0
diff --git a/Android.mk b/Android.mk
index beccd86..17823e7 100644
--- a/Android.mk
+++ b/Android.mk
@@ -189,6 +189,13 @@
LOCAL_SRC_FILES := $(call all-java-files-under, $(SRC_DIRS))
LOCAL_SRC_FILES := $(filter-out $(EXCLUDE_FILES),$(LOCAL_SRC_FILES))
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 := \
@@ -365,6 +372,8 @@
DIALER_MANIFEST_FILES :=
PROCESSOR_LIBRARIES_TARGET :=
PROCESSOR_JARS :=
+BACKUP_LIB_SRC_DIR :=
+EXCLUDE_BACKUP_LIB_SRCS :=
# Create references to prebuilt libraries.
include $(CLEAR_VARS)