commit 70402ca5b8eeb3969d5a64acb65188856d48240a
author Philip P. Moltmann <moltmann@google.com> Tue Aug 28 16:57:52 2018 +0000
committer Philip P. Moltmann <moltmann@google.com> Tue Aug 28 10:01:00 2018 -0700
tree fed16a0794e87ff35a1ce663ace3c05f87ce0966
parent 7b4a547ee48fdb2e47e24d483a246c3c7e4a62ef

Revert "Revert "Update dexmaker on AOSP to same version as on internal master""

This reverts commit 0ad4f18077e9cac496e836c82ef99763bd7ce094.

Reason for revert: Fix in I5094fa145fc5f6d5c5d9426b07d764c07e545819

Change-Id: I5015d35f5fd464f6f86631ecb5b45e2fbbedffab

update_source.sh

diff --git a/update_source.sh b/update_source.sh
index ff7cc66..fc0c053 100755
--- a/update_source.sh
+++ b/update_source.sh
@@ -23,13 +23,18 @@
 SOURCE="https://github.com/linkedin/dexmaker"
 INCLUDE="
     LICENSE
+
     dexmaker
     dexmaker-mockito
-    dexmaker-mockito-tests
     dexmaker-mockito-inline
+    dexmaker-mockito-inline-extended
+
     dexmaker-mockito-inline-dispatcher
-    dexmaker-mockito-inline-tests/src
-    dexmaker-tests/src
+
+    dexmaker-tests
+    dexmaker-mockito-tests
+    dexmaker-mockito-inline-tests
+    dexmaker-mockito-inline-extended-tests
     "
 
 EXCLUDE="
@@ -58,11 +63,6 @@
   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