commit 8708c9c6ff7ae1eef4b4e0633dd727d8794534bd
author Philip P. Moltmann <moltmann@google.com> Tue Aug 14 16:20:31 2018 -0700
committer Philip P. Moltmann <moltmann@google.com> Tue Aug 21 23:50:15 2018 +0000
tree fed16a0794e87ff35a1ce663ace3c05f87ce0966
parent 67df318139d2d965ec83f82c72a019f10cb248db

Update dexmaker on AOSP to same version as on internal master

Bug: 109745050
Test: atest CtsMockingTestCases
            CtsInlineMockingTestCases
            CtsMockingDebuggableTestCases
            CtsExtendedMockingTestCases
Change-Id: I8d33026843b9721bd7f597e0f87b85ecf88bd69c
Merged-In: I33c12311cb17366b936f4716c1bf89a5d2e18074

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