Merge changes Iee17fa80,Id9ee50be into lmp-dev am: 9e63540d01 am: 12e0186aa1 am: 724c3d4bd9 am: f73b5cbd1f am: f84d2ddb50 am: d236029c61 am: a34ba7f284 am: 72c26c936b am: fcac1e2dda
am: 51c0c361a6
Change-Id: Ibf968d0954a4f148e91902ccd117b2e217b223d0
diff --git a/core/pathmap.mk b/core/pathmap.mk
index effc878..26a661d 100644
--- a/core/pathmap.mk
+++ b/core/pathmap.mk
@@ -126,26 +126,27 @@
v14/preference \
v17/preference-leanback \
documents-archive \
- customtabs
+ customtabs \
+ exifinterface
#
# A list of all source roots under frameworks/multidex.
#
FRAMEWORKS_MULTIDEX_SUBDIRS := \
- multidex/library/src \
- multidex/instrumentation/src
+ multidex/library/src \
+ multidex/instrumentation/src
#
# A version of FRAMEWORKS_SUPPORT_SUBDIRS that is expanded to full paths from
# the root of the tree.
#
FRAMEWORKS_SUPPORT_JAVA_SRC_DIRS := \
- $(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) \
- $(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS)) \
- frameworks/support/graphics/drawable/animated \
- frameworks/support/graphics/drawable/static \
- frameworks/support/v7/appcompat/src \
- frameworks/support/v7/recyclerview/src
+ $(addprefix frameworks/support/,$(FRAMEWORKS_SUPPORT_SUBDIRS)) \
+ $(addprefix frameworks/,$(FRAMEWORKS_MULTIDEX_SUBDIRS)) \
+ frameworks/support/graphics/drawable/animated \
+ frameworks/support/graphics/drawable/static \
+ frameworks/support/v7/appcompat/src \
+ frameworks/support/v7/recyclerview/src
#
# A list of support library modules.
@@ -164,14 +165,14 @@
# A list of all documented source roots under frameworks/data-binding.
#
FRAMEWORKS_DATA_BINDING_SUBDIRS := \
- baseLibrary/src/main \
- extensions/library/src/main \
- extensions/library/src/doc
+ baseLibrary/src/main \
+ extensions/library/src/main \
+ extensions/library/src/doc
#
# A version of FRAMEWORKS_DATA_BINDING_SUBDIRS that is expanded to full paths from
# the root of the tree.
#
FRAMEWORKS_DATA_BINDING_JAVA_SRC_DIRS := \
- $(addprefix frameworks/data-binding/,$(FRAMEWORKS_DATA_BINDING_SUBDIRS))
+ $(addprefix frameworks/data-binding/,$(FRAMEWORKS_DATA_BINDING_SUBDIRS))
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index e42903a..0b55b3f 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -114,7 +114,7 @@
# It must be of the form "YYYY-MM-DD" on production devices.
# It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
# If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
- PLATFORM_SECURITY_PATCH := 2017-06-05
+ PLATFORM_SECURITY_PATCH := 2017-05-05
endif
ifeq "" "$(PLATFORM_BASE_OS)"