Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Unified Diff: testing/android/native_test_apk.xml

Issue 10694128: Fix the conflict of input and output manifest files (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Copy AndroidManifest.xml from project base dir Created 8 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: testing/android/native_test_apk.xml
diff --git a/testing/android/native_test_apk.xml b/testing/android/native_test_apk.xml
index 03e565f4e23bc6e7e41273c54f746e7cfa5a6401..8fd05bb67eb6c090ca8e7495cdf8fe7a94774839 100644
--- a/testing/android/native_test_apk.xml
+++ b/testing/android/native_test_apk.xml
@@ -66,6 +66,13 @@ found in the LICENSE file.
</condition>
<property name="native.libs.absolute.dir" location="${out.dir}/libs" />
+ <!-- Copy the below manifest file to a new directory because the project
+ base directory and output directory are the same and manifest merge
+ task takes the same file as source and target when doing copying.
+ Otherwise it'll generate an empty manifest file. -->
+ <copy file="AndroidManifest.xml" todir="${out.dir}/manifest"/>
+ <property name="manifest.abs.file" location="${out.dir}/manifest/AndroidManifest.xml"/>
+
<target name="-post-compile">
<!-- copy gdbserver to main libs directory if building debug. -->
<if>
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698