commit 2354b568379fe31ba4e774f7a92d4c685a60a2ab
author Adam Lesinski <adamlesinski@google.com> Fri May 26 16:31:38 2017 -0700
committer Adam Lesinski <adamlesinski@google.com> Fri May 26 16:56:34 2017 -0700
tree 585bb0c60c38428e2328beb330fd2fc79e11e7d2
parent bacaffa497de1877657f9cb3f59a82e3955f0f75

AAPT2: Follow symlinks when compiling

Bug: 62144459
Test: make AaptSymlinkTest
Change-Id: Idb3ab1ece17c52bb4fd174ec4c08a9e173289e55

tools/aapt2/cmd/Compile.cpp

diff --git a/tools/aapt2/cmd/Compile.cpp b/tools/aapt2/cmd/Compile.cpp
index 5adf04a..e09a3979 100644
--- a/tools/aapt2/cmd/Compile.cpp
+++ b/tools/aapt2/cmd/Compile.cpp
@@ -478,7 +478,8 @@
 
   {
     std::string content;
-    if (!android::base::ReadFileToString(path_data.source.path, &content)) {
+    if (!android::base::ReadFileToString(path_data.source.path, &content,
+                                         true /*follow_symlinks*/)) {
       context->GetDiagnostics()->Error(DiagMessage(path_data.source)
                                        << android::base::SystemErrorCodeToString(errno));
       return false;