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