commit 8873aa245d7b17e5762287fdd60b588bf6537852
author Adam Seaton <aseaton@google.com> Thu Mar 16 17:07:23 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Mar 16 17:07:23 2017 +0000
tree 3f4b09514b95cc734221a9d1753e25fcc093f1ce
parent 003c280d294737a1c98530c4506b8b956b214467
parent acb61d098f073bf75b42c2faf4855333b77d697c

DO NOT MERGE : Update Security String to 2017-05-05 on klp-dev am: 3d0850957a am: f19c200a49 am: 4826d7e492  -s ours am: 1b9f1e8156  -s ours am: b3b5777fff am: bff6f7d991  -s ours am: b65c93dbcf am: 3ded290e7d am: 2996209f6f am: b6279913b3  -s ours am: 8d6607c91e am: b9a68b56fc
am: acb61d098f  -s ours

Change-Id: Id4601f83e700c98579c6a1aed8acf2791a4c7757

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