commit 0d81f701045ff24a2c6a39520629a1898d5f8b65
author Adam Lesinski <adamlesinski@google.com> Tue Jun 27 15:51:09 2017 -0700
committer Adam Lesinski <adamlesinski@google.com> Tue Jun 27 18:46:58 2017 -0700
tree 3239380c90cfb67c12a77a9a6f1ba008638bb7fb
parent 366d27d31e9341def03ba6eea310d6f56be69abd

AAPT2: Honor --custom-package when writing Manifest.java

Bug: 62826426
Test: manual
Change-Id: I517ff5da2ef2a9147ddbfb13b074a1f60550f189

tools/aapt2/cmd/Link.cpp

diff --git a/tools/aapt2/cmd/Link.cpp b/tools/aapt2/cmd/Link.cpp
index 740a401..e6bf3a6 100644
--- a/tools/aapt2/cmd/Link.cpp
+++ b/tools/aapt2/cmd/Link.cpp
@@ -989,7 +989,8 @@
       manifest_class->GetCommentBuilder()->AppendComment(proper_annotation);
     }
 
-    const std::string& package_utf8 = context_->GetCompilationPackage();
+    const std::string package_utf8 =
+        options_.custom_java_package.value_or_default(context_->GetCompilationPackage());
 
     std::string out_path = options_.generate_java_class_path.value();
     file::AppendPath(&out_path, file::PackageToPath(package_utf8));