Merge "[DO NOT MERGE] Updating security string to 2017-07-01 in lmp-dev bug:38342695" into lmp-dev am: 18fc68549b -s ours am: 0a97d3f909 am: ddac9519eb -s ours am: 7ad3c1407c am: 16dcd532a0 am: 535ade48f8 am: 3f5593376d -s ours am: 288fd15d69 am: 701dc24fb9
am: 75864440c3 -s ours
Change-Id: I358507c9526f70125bf28b5af87f9bfaa9e867fa
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)"