commit a981ae128e835501df693a1af286c8d3765537d3
author Adam Seaton <aseaton@google.com> Thu Mar 16 16:58:15 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 16 16:58:15 2017 +0000
tree 3f4b09514b95cc734221a9d1753e25fcc093f1ce
parent 5c25a15889520e2640460dbd40e003dd995c3f59
parent ea8a508c66e73a7d996e6c1bc61c4d8cac12a81f

DO NOT MERGE : Update Security String to 2017-05-01 on lmp-dev am: e0b38c6277  -s ours am: 637f66925f am: 3481be638f  -s ours am: d4f9e95f7c am: 6962385144 am: 128b958afb am: 43cbfe0486  -s ours am: 0086be3401 am: 6af2006770
am: ea8a508c66  -s ours

Change-Id: Ia0c2195ad9c03298f8fb0c00ed4db3ad5a6467e4

core/pathmap.mk

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))