Revert "Update dexmaker on AOSP to same version as on internal master"
This reverts commit 8708c9c6ff7ae1eef4b4e0633dd727d8794534bd.
Reason for revert: Breaks errorprone build
Change-Id: Ic923d241b27365bb9845d3d8dff67d485116424d
diff --git a/update_source.sh b/update_source.sh
index fc0c053..ff7cc66 100755
--- a/update_source.sh
+++ b/update_source.sh
@@ -23,18 +23,13 @@
SOURCE="https://github.com/linkedin/dexmaker"
INCLUDE="
LICENSE
-
dexmaker
dexmaker-mockito
- dexmaker-mockito-inline
- dexmaker-mockito-inline-extended
-
- dexmaker-mockito-inline-dispatcher
-
- dexmaker-tests
dexmaker-mockito-tests
- dexmaker-mockito-inline-tests
- dexmaker-mockito-inline-extended-tests
+ dexmaker-mockito-inline
+ dexmaker-mockito-inline-dispatcher
+ dexmaker-mockito-inline-tests/src
+ dexmaker-tests/src
"
EXCLUDE="
@@ -63,6 +58,11 @@
rm -r $exclude
done;
+# Move the dexmaker-tests AndroidManifest.xml into the correct position.
+mv dexmaker-tests/src/main/AndroidManifest.xml dexmaker-tests/AndroidManifest.xml
+mv dexmaker-mockito-tests/src/main/AndroidManifest.xml dexmaker-mockito-tests/AndroidManifest.xml
+mv dexmaker-mockito-inline-tests/src/main/AndroidManifest.xml dexmaker-mockito-inline-tests/AndroidManifest.xml
+
# Remove 3rd party code
rm -r dexmaker-mockito-inline/external
