GN: Side-load dex files as well as native code in incremental installs

build/android/devil/android/device_utils_test.py

Index: build/android/devil/android/device_utils_test.py
diff --git a/build/android/devil/android/device_utils_test.py b/build/android/devil/android/device_utils_test.py
index 3fd5e0c60ae6bc9235bad3a5141d9d921dfc2d53..b564ab522a7e80e147d6f511f7c4d14b4fed43c0 100755
--- a/build/android/devil/android/device_utils_test.py
+++ b/build/android/devil/android/device_utils_test.py
@@ -601,7 +601,7 @@ class DeviceUtilsInstallTest(DeviceUtilsTest):
          'test.package'),
         (self.call.device._GetApplicationPathsInternal('test.package'),
          ['/fake/data/app/test.package.apk']),
-        self.call.adb.Uninstall('test.package', False),
+        self.call.device.Uninstall('test.package'),
         self.call.adb.Install('/fake/test/app.apk', reinstall=False)):
       self.device.Install('/fake/test/app.apk', retries=0, permissions=[])
 
@@ -684,12 +684,18 @@ class DeviceUtilsInstallSplitApkTest(DeviceUtilsTest):
 
 
 class DeviceUtilsUninstallTest(DeviceUtilsTest):
-
   def testUninstall_callsThrough(self):
     with self.assertCalls(
+        (self.call.device._GetApplicationPathsInternal('test.package'),
+         ['/path.apk']),
         self.call.adb.Uninstall('test.package', True)):
       self.device.Uninstall('test.package', True)
 
+  def testUninstall_noop(self):
+    with self.assertCalls(
+        (self.call.device._GetApplicationPathsInternal('test.package'), [])):
+      self.device.Uninstall('test.package', True)
+
 
 class DeviceUtilsSuTest(DeviceUtilsTest):
   def testSu_preM(self):