Commit Graph

913 Commits

Author SHA1 Message Date
Manoj Boopathi Raj
6e2018b7eb Merge "Added CTS to test dual stack socket for TCP & UDP" am: f4f12703bf am: 397ebd2edb
am: d0b69020dd

Change-Id: I11884ed92fbec0119ecb70289409d8e0f5d1493b
2018-01-04 18:59:03 +00:00
Manoj Boopathi Raj
d0b69020dd Merge "Added CTS to test dual stack socket for TCP & UDP" am: f4f12703bf
am: 397ebd2edb

Change-Id: I401e26896dfb47f8c95d27a029fe4893e8d88b70
2018-01-04 18:53:11 +00:00
Sudheer Shanka
2afa7e6e4b Merge "Skip unsupported tests on low ram devices." into stage-aosp-oc-mr1-cts-dev am: e352866bee am: dfc9fb0901
am: 87c8dbbc39

Change-Id: Ie190f774998de77843b8af9ef25bbfef615c66bb
2018-01-03 20:42:05 +00:00
Sudheer Shanka
87c8dbbc39 Merge "Skip unsupported tests on low ram devices." into stage-aosp-oc-mr1-cts-dev am: e352866bee
am: dfc9fb0901

Change-Id: I81f9100fa7e10c1a18225733a6ce5c3645876a46
2018-01-03 20:32:37 +00:00
manojboopathi
f1c7d18cf2 Added CTS to test dual stack socket for TCP & UDP
This ensures the function IpSecManager.applyTransportModeTransform()
works as expected when used with Java sockets.

Bug: 70160694
Test: Ran CTS test (./run_cts.sh)
Change-Id: Ia4b636c0f48a0eeffb8813d271e59aeb86bd44bc
2018-01-02 13:54:04 -08:00
Benedict Wong
92e883e060 Merge "Fix IpSecManager CTS tests on 4.4 kernels" am: 7dd13c1315 am: 19e33b5078
am: 8080294716

Change-Id: I65d3b216f2ce516d85cd7920763a3caa0ee6cde5
2017-12-22 05:03:30 +00:00
Benedict Wong
8080294716 Merge "Fix IpSecManager CTS tests on 4.4 kernels" am: 7dd13c1315
am: 19e33b5078

Change-Id: I26fac4d14dc6b88ecb9bdbfce88d9f72500ee180
2017-12-22 04:58:01 +00:00
Benedict Wong
b04f7cea99 Fix IpSecManager CTS tests on 4.4 kernels
Investigation shows that 4.4 kernels take longer for loopback TCP
packets to be ack'd, and results in extra ack packets to be generated in
cases where both the server and client sockets send data packets at the
same time. This was verified via TCPdump, where an extra ack packet was
generated per run of the bidirectional transmissions in checkTcp().

This change verifies that the data + ack packets have been sent and
counted before initiating the reverse transmission. Further, changes
have been made to improve the reliability of this code via counting
expected packets (rather than sleeps).

Bug: 62994731
Test: CTS tests run (and passing) on walleye, marlin and angler
Change-Id: I7c707ec3b11235a5a9cba10275aee40e2eb37169
2017-12-21 15:02:04 -08:00
Sudheer Shanka
b7a503b578 Skip unsupported tests on low ram devices.
Notification listeners are not allowed on low ram devices.
Skip testDozeModeMetered_enabledButWhitelistedOnNotificationAction
and testDozeModeNonMetered_enabledButWhitelistedOnNotificationAction
on low ram devices since these tests depend on being able to
register notification listeners.

Bug: 70242457
Bug: 70545780
Test: testDozeModeMetered_enabledButWhitelistedOnNotificationAction
and testDozeModeNonMetered_enabledButWhitelistedOnNotificationAction
Change-Id: I8ce6f330760042ca790cd6fb10e62ebe86498a06
2017-12-21 11:23:21 -08:00
Benedict Wong
38888ca19e Merge "[ipsec-qtaguid] Update tests to check data usage" am: eca595be58 am: 50609feb1c
am: 2b43c590b6

Change-Id: I55c7a32bbdcdf582c73edf98805e7d2440dd8e04
2017-12-19 00:37:32 +00:00
Benedict Wong
2b43c590b6 Merge "[ipsec-qtaguid] Update tests to check data usage" am: eca595be58
am: 50609feb1c

Change-Id: I1d465ac9e1200dec6679879f92e1582e5fe53652
2017-12-19 00:24:41 +00:00
Benedict Wong
0bff9ab1c4 [ipsec-qtaguid] Update tests to check data usage
This change ensures that all forms of transport-mode packets are
correctly accounted for, and not double-counted. This includes both
per-UID counters, as well as interface counters.

Bug: 62994731
Test: CTS tests updated, passing
Change-Id: I83be0724ac21d9db7d91ce72733d13fb6736e66e
2017-12-18 19:46:30 +00:00
TreeHugger Robot
de2ef3bd4f Merge "Add cts suite tag to all CTS modules" 2017-12-16 14:11:49 +00:00
jdesprez
607948bfb0 Add cts suite tag to all CTS modules
Test: build
Bug: 65303193
Change-Id: I064459de5d4f8e958f41ac238cad35e5f7e99d3a
2017-12-16 04:19:31 -08:00
Paul Duffin
f183f746dd Add android.test.base/stubs dependency
In preparation for the removal of the non-junit classes in the
android.test.base library from the android.jar this adds a dependency
on android.test.base/stubs to ensure this code will continue to
compile.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* apps/CtsVerifier/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsVerifier's will need them in order to compile once its classes
    are removed from the test_current SDK on which it currently
    depends.

* common/device-side/util/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    compatibility-device-util's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAppAccessData's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/AppWithData/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAppWithData's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDocumentClient's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsEncryptionApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsExternalStorageApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsInstrumentationAppDiffCert's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsMultiUserStorageApp's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsPrivilegedUpdateTests's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsReadExternalStorageApp's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/SplitApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSplitApp's will need them in order to compile once its classes
    are removed from the current SDK on which it currently depends.

    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSplitAppDiffRevision's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSplitAppDiffVersion's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSplitAppDiffCert's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsStorageAppA's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsStorageAppB's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsStorageStatsApp's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsUsePermissionDiffCert's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsUsesLibraryApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWriteExternalStorageApp's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsKeySetTestApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAccountCheckAuthApp's will need them in order to compile once
    its classes are removed from the test_current SDK on which it
    currently depends.

* hostsidetests/devicepolicy/app/AccountManagement/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAccountManagementDevicePolicyApp's will need them in order to
    compile once its classes are removed from the current SDK on which
    it currently depends.

* hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsCorpOwnedManagedProfile's will need them in order to compile
    once its classes are removed from the test_current SDK on which it
    currently depends.

    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsCorpOwnedManagedProfile2's will need them in order to compile
    once its classes are removed from the test_current SDK on which it
    currently depends.

* hostsidetests/devicepolicy/app/CustomizationApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsCustomizationApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/DelegateApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDelegateApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAdminApp23's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAdminApp24's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/DeviceAdminService/package1/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAdminService1's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/DeviceAdminService/package2/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAdminService2's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/DeviceAdminService/package3/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAdminService3's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/DeviceAdminService/package4/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAdminService4's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/DeviceAdminService/packageb/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAdminServiceB's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAndProfileOwnerApp23's will need them in order to compile
    once its classes are removed from the test_current SDK on which it
    currently depends.

* hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAndProfileOwnerApp25's will need them in order to compile
    once its classes are removed from the test_current SDK on which it
    currently depends.

* hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAndProfileOwnerApp's will need them in order to compile
    once its classes are removed from the test_current SDK on which it
    currently depends.

* hostsidetests/devicepolicy/app/DeviceOwner/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceOwnerApp's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/IntentReceiver/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsIntentReceiverApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/IntentSender/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsIntentSenderApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/LauncherTests/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsLauncherAppsTests's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/ManagedProfile/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsManagedProfileApp's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* hostsidetests/devicepolicy/app/PackageInstaller/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsPackageInstallerApp's will need them in order to compile once
    its classes are removed from the test_current SDK on which it
    currently depends.

* hostsidetests/devicepolicy/app/ProfileOwner/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsProfileOwnerApp's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* hostsidetests/incident/apps/boundwidgetapp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAppWidgetApp's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* hostsidetests/net/app/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsHostsideNetworkTestsApp's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/numberblocking/app/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsHostsideNumberBlockingAppTest's will need them in order to
    compile once its classes are removed from the current SDK on which
    it currently depends.

* hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupLauncher1's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupLauncher2's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupLauncher3's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupLauncher4new's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupLauncher4old's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher1's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher2's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher3's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher4new's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher4new_nobackup's will need them in order
    to compile once its classes are removed from the current SDK on
    which it currently depends.

* hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher4new_nomanifest's will need them in order
    to compile once its classes are removed from the current SDK on
    which it currently depends.

* hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher4new_wrongkey's will need them in order
    to compile once its classes are removed from the current SDK on
    which it currently depends.

* hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher4old's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher4old_nomanifest's will need them in order
    to compile once its classes are removed from the current SDK on
    which it currently depends.

* hostsidetests/shortcuts/deviceside/multiuser/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutMultiuserTest's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/shortcuts/deviceside/upgrade/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutUpgradeVersion1's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutUpgradeVersion2's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/ui/control/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceTaskSwitchingControl's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* hostsidetests/usb/SerialTestApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsUsbSerialTestApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* hostsidetests/webkit/app/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWebViewStartupApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/ProcessTest/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    ProcessTests's will need them in order to compile once its classes
    are removed from the current SDK on which it currently depends.

* tests/acceleration/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAccelerationTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/accessibility/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAccessibilityTestCases's will need them in order to compile once
    its classes are removed from the test_current SDK on which it
    currently depends.

* tests/accessibilityservice/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAccessibilityServiceTestCases's will need them in order to
    compile once its classes are removed from the test_current SDK on
    which it currently depends.

* tests/admin/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAdminTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/app/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAppTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tests/backup/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsBackupTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tests/camera/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsCameraTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tests/fragment/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsFragmentTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/sample/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSampleDeviceTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/sensor/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    cts-sensors-tests's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/accounts/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAccountManagerTestCases's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* tests/tests/alarmclock/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAlarmClockTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/assist/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAssistTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/bluetooth/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsBluetoothTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/calendarcommon/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsCalendarcommon2TestCases's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* tests/tests/car/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsCarTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/contactsproviderwipe/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsContactsProviderWipe's will need them in order to compile once
    its classes are removed from the test_current SDK on which it
    currently depends.

* tests/tests/database/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDatabaseTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tests/tests/display/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDisplayTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/dpi/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDpiTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/dpi2/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDpiTestCases2's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/drm/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDrmTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/externalservice/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsExternalServiceTestCases's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* tests/tests/graphics/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsGraphicsTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tests/tests/location/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    cts-location-tests's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsLocationTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tests/tests/mediastress/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsMediaStressTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/midi/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsMidiTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/multiuser/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsMultiUserTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tests/tests/nativehardware/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    cts-nativehardware-tests's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsNetSecPolicyUsesCleartextTrafficFalseTestCases's will need them
    in order to compile once its classes are removed from the current
    SDK on which it currently depends.

* tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsNetSecPolicyUsesCleartextTrafficTrueTestCases's will need them
    in order to compile once its classes are removed from the current
    SDK on which it currently depends.

* tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases's will need
    them in order to compile once its classes are removed from the
    current SDK on which it currently depends.

* tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsNetSecConfigDownloadManagerTestCases's will need them in order
    to compile once its classes are removed from the current SDK on
    which it currently depends.

* tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsNetSecConfigResourcesSrcTestCases's will need them in order to
    compile once its classes are removed from the current SDK on which
    it currently depends.

* tests/tests/opengl/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsOpenGLTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/openglperf/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsOpenGlPerfTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/packageinstaller/adminpackageinstaller/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAdminPackageInstallerTestCases's will need them in order to
    compile once its classes are removed from the test_current SDK on
    which it currently depends.

* tests/tests/permission2/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsPermission2TestCases's will need them in order to compile once
    its classes are removed from the test_current SDK on which it
    currently depends.

* tests/tests/preference/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsPreferenceTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/preference2/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsPreference2TestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/renderscript/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsRenderscriptTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/rsblas/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsRsBlasTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/rscpp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsRsCppTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/sax/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSaxTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/selinux/selinuxTargetSdk/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSelinuxTargetSdkTestCases's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* tests/tests/selinux/selinuxTargetSdk2/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSelinuxTargetSdk2TestCases's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* tests/tests/shortcutmanager/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsShortcutManagerTestCases's will need them in order to compile
    once its classes are removed from the test_current SDK on which it
    currently depends.

* tests/tests/simpleperf/CtsSimpleperfDebugApp/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSimpleperfDebugApp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/telecom/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsTelecomTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tests/tests/telecom2/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsTelecomTestCases2's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/telecom3/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsTelecomTestCases3's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/telephony/preconditions/app/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsTelephonyPreparerApp's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/text/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsTextTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tests/tests/theme/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsThemeDeviceTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/tv/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsTvTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/tests/uiautomation/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsUiAutomationTestCases's will need them in order to compile once
    its classes are removed from the test_current SDK on which it
    currently depends.

* tests/tests/uidisolation/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsUidIsolationTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/voiceinteraction/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsVoiceInteractionTestCases's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* tests/tests/voicesettings/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsVoiceSettingsTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/wrap/nowrap/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWrapNoWrapTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/wrap/wrap_debug/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWrapWrapDebugTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/tests/wrap/wrap_debug_malloc_debug/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWrapWrapDebugMallocDebugTestCases's will need them in order to
    compile once its classes are removed from the current SDK on which
    it currently depends.

* tests/tests/wrap/wrap_nodebug/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWrapWrapNoDebugTestCases's will need them in order to compile
    once its classes are removed from the current SDK on which it
    currently depends.

* tests/tvprovider/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsTvProviderTestCases's will need them in order to compile once
    its classes are removed from the current SDK on which it currently
    depends.

* tests/ui/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsUiDeviceTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/video/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsVideoTestCases's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tests/vr/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsVrTestCases's will need them in order to compile once its
    classes are removed from the test_current SDK on which it currently
    depends.

* tools/cts-device-info/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceInfo's will need them in order to compile once its classes
    are removed from the SDK on which it currently depends.

* tools/cts-holo-generation/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsHoloGeneration's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tools/cts-preconditions/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsPreconditions's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

* tools/cts-reference-app-lib/Android.mk
    Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
    android.cts.refapp's will need them in order to compile once its
    classes are removed from the current SDK on which it currently
    depends.

Bug: 30188076
Test: make dist
Change-Id: I1d263c97b9009bad09cfea07f9c56fc0943ef203
2017-12-15 07:28:45 +00:00
David Benjamin
0a17196f3a Merge "Clear some random compile warnings." am: 8d7d4479a5 am: 2730c60fde
am: a92a6bb33e

Change-Id: I631b68d218982fd20e79c9be9378accfa5b1a6fc
2017-12-14 22:23:28 +00:00
David Benjamin
a92a6bb33e Merge "Clear some random compile warnings." am: 8d7d4479a5
am: 2730c60fde

Change-Id: If25634c6867446c79735a433a2238aebfde72b34
2017-12-14 22:16:00 +00:00
Treehugger Robot
8d7d4479a5 Merge "Clear some random compile warnings." 2017-12-14 21:51:21 +00:00
nharold
2d2cb4eda8 Merge "Update CTS to use renamed API method." am: 123988e6e1 am: 51fc96db37
am: b69ec1d499

Change-Id: Id09e95e39d85393c570840372ee38a89dc2447b9
2017-12-14 21:44:46 +00:00
nharold
b69ec1d499 Merge "Update CTS to use renamed API method." am: 123988e6e1
am: 51fc96db37

Change-Id: I4c64458a793b56b3daf11287d340ead4bd40948d
2017-12-14 21:32:52 +00:00
Jonathan Basseri
b58d3aa5b8 Update CTS to use renamed API method.
IPsec API is renaming reserveSecurityParameterIndex to
allocateSecurityParameterIndex. Update tests to reflect this.

Bug: 69128142
Test: TreeHugger should be enough
Change-Id: I0bfaa3584920096ffde7f9eeee9fccd0ec842821
2017-12-14 21:09:28 +00:00
David Benjamin
6208358a7c Clear some random compile warnings.
I saw a bunch fly by. Here are a few fixes.

ssize_t is %zd. Types from stdint.h use PRI* macros from inttypes.h.
Finally, use C99 initializers rather than the old GNU extension.

Test: make checkbuild
Change-Id: I343dfb99984ab826c7641e311e041e859eb61d93
2017-12-13 22:15:09 +00:00
Nathan Harold
cf96b1d048 Merge "Fix IpSecAlgorithm Lengths in IpSecManagerTest" am: ab2a300272 am: d79c57dde6
am: 9a607658e4

Change-Id: Iacbd5159f42a27cdafaf27cf0d3d6538912ba6ae
2017-12-13 04:03:19 +00:00
Nathan Harold
9a607658e4 Merge "Fix IpSecAlgorithm Lengths in IpSecManagerTest" am: ab2a300272
am: d79c57dde6

Change-Id: I6c09b8b271486530a10d6e4f2beec2aa6b9e9d0c
2017-12-13 03:57:02 +00:00
Nathan Harold
78a4d4300b Fix IpSecAlgorithm Lengths in IpSecManagerTest
Update the key lengths for SHA1 and MD5 authentication
to pass the new tighter range checks.

Bug: 70324823
Test: this

Change-Id: I8f533f043d16b0571bac628d21878e31027fe853
2017-12-08 19:12:56 -08:00
Paul Duffin
bed51fc9b9 Stop statically including legacy-android-test
Statically including legacy-android-test leads to duplicate classes
which causes build time problems (with Proguard) and runtime problems on
older SDK versions. This change:
* Stops statically including legacy-android-test.
* Adds compile time dependencies on andoid.test.base, android.test.mock
  and android.test.runner where necessary.
* Adds <uses-library android:name="android.test.runner"/> to any
  affected package to ensure that the classes that were included by
  legacy-android-test are still available at runtime. That also adds a
  dependency on android.test.base and android.test.mock.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* hostsidetests/abioverride/app/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAbiOverrideTestApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/abioverride/app/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsAbiOverrideTestApp at runtime.

* hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAccessSerialModern
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/appsecurity/test-apps/AccessSerialModern/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsAccessSerialModern at runtime.

* hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAppAccessData
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/appsecurity/test-apps/AppWithData/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAppWithData results
    in duplicate classes which leads to build time and compile time
    issues.

* hostsidetests/appsecurity/test-apps/DocumentProvider/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDocumentProvider
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/appsecurity/test-apps/DocumentProvider/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsDocumentProvider at runtime.

* hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsEphemeralTestsEphemeralApp1's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsEphemeralTestsEphemeralApp1 results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsEphemeralTestsImplicitApp results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsEphemeralTestsNormalApp results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsEphemeralTestsNormalApp's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsEphemeralTestsUserApp results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsEphemeralTestsUserAppTest results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsExternalStorageApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsInstrumentationAppDiffCert results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsMultiUserStorageApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsReadExternalStorageApp results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsReadExternalStorageApp's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* hostsidetests/appsecurity/test-apps/SplitApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSplitApp results in
    duplicate classes which leads to build time and compile time
    issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSplitApp's source depends on its classes and because of these
    changes they are no longer present on the compilation path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSplitAppDiffRevision
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSplitAppDiffRevision's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSplitAppDiffVersion
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSplitAppDiffVersion's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSplitAppDiffCert
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSplitAppDiffCert's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsStorageAppA results
    in duplicate classes which leads to build time and compile time
    issues.

* hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsStorageAppB results
    in duplicate classes which leads to build time and compile time
    issues.

* hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsStorageStatsApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsUsePermissionApp23
    results in duplicate classes which leads to build time and compile
    time issues. It is also unnecessary as CtsUsePermissionApp23
    targets SDK version 23 which provides all the classes at runtime.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsUsePermissionApp23's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* hostsidetests/appsecurity/test-apps/UsePermissionApp23/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsUsePermissionApp23 at runtime.

* hostsidetests/appsecurity/test-apps/UsePermissionApp25/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsUsePermissionApp25
    results in duplicate classes which leads to build time and compile
    time issues. It is also unnecessary as CtsUsePermissionApp25
    targets SDK version 25 which provides all the classes at runtime.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsUsePermissionApp25's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* hostsidetests/appsecurity/test-apps/UsePermissionApp25/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsUsePermissionApp25 at runtime.

* hostsidetests/appsecurity/test-apps/UsePermissionApp26/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsUsePermissionApp26
    results in duplicate classes which leads to build time and compile
    time issues. It is also unnecessary as CtsUsePermissionApp26
    targets SDK version 26 which provides all the classes at runtime.

* hostsidetests/appsecurity/test-apps/UsePermissionApp26/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsUsePermissionApp26 at runtime.

* hostsidetests/appsecurity/test-apps/UsePermissionAppLatest/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsUsePermissionAppLatest results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/appsecurity/test-apps/UsePermissionAppLatest/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsUsePermissionAppLatest at runtime.

* hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsUsePermissionDiffCert results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsWriteExternalStorageApp results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWriteExternalStorageApp's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsKeySetTestApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAccountCheckAuthApp
    results in duplicate classes which leads to build time and compile
    time issues. It is also unnecessary as CtsAccountCheckAuthApp
    targets SDK version 25 which provides all the classes at runtime.

* hostsidetests/devicepolicy/app/AccountCheck/Auth/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsAccountCheckAuthApp at runtime.

* hostsidetests/devicepolicy/app/AccountManagement/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsAccountManagementDevicePolicyApp results in duplicate classes
    which leads to build time and compile time issues.

* hostsidetests/devicepolicy/app/AccountManagement/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsAccountManagementDevicePolicyApp at runtime.

* hostsidetests/devicepolicy/app/Assistant/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsDevicePolicyAssistApp results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/devicepolicy/app/Assistant/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsDevicePolicyAssistApp at runtime.

* hostsidetests/devicepolicy/app/CrossProfileAppsTest/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsCrossProfileAppsTests results in duplicate classes which leads
    to build time and compile time issues. It is also unnecessary as
    CtsCrossProfileAppsTests targets SDK version 25 which provides all
    the classes at runtime.

* hostsidetests/devicepolicy/app/CustomizationApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsCustomizationApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/devicepolicy/app/CustomizationApp/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsCustomizationApp at runtime.

* hostsidetests/devicepolicy/app/DelegateApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDelegateApp results
    in duplicate classes which leads to build time and compile time
    issues.

* hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDeviceAdminApp23
    results in duplicate classes which leads to build time and compile
    time issues. It is also unnecessary as CtsDeviceAdminApp23 targets
    SDK version 23 which provides all the classes at runtime.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAdminApp23's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDeviceAdminApp24
    results in duplicate classes which leads to build time and compile
    time issues. It is also unnecessary as CtsDeviceAdminApp24 targets
    SDK version 24 which provides all the classes at runtime.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAdminApp24's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* hostsidetests/devicepolicy/app/DeviceOwner/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDeviceOwnerApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/devicepolicy/app/IntentReceiver/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsIntentReceiverApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/devicepolicy/app/IntentSender/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsIntentSenderApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/devicepolicy/app/LauncherTests/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsLauncherAppsTests
    results in duplicate classes which leads to build time and compile
    time issues. It is also unnecessary as CtsLauncherAppsTests targets
    SDK version 25 which provides all the classes at runtime.

* hostsidetests/devicepolicy/app/ManagedProfile/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsManagedProfileApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/devicepolicy/app/PackageInstaller/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsPackageInstallerApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/devicepolicy/app/ProfileOwner/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsProfileOwnerApp
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/devicepolicy/app/SingleAdminApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsDevicePolicySingleAdminTestApp results in duplicate classes
    which leads to build time and compile time issues.

* hostsidetests/devicepolicy/app/WifiConfigCreator/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsWifiConfigCreator
    results in duplicate classes which leads to build time and compile
    time issues.

* hostsidetests/devicepolicy/app/WifiConfigCreator/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsWifiConfigCreator at runtime.

* hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsProcStatsHelperApp
    results in duplicate classes which leads to build time and compile
    time issues. It is also unnecessary as CtsProcStatsHelperApp
    targets SDK version 24 which provides all the classes at runtime.

* hostsidetests/dumpsys/apps/ProcStatsHelperApp/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsProcStatsHelperApp at runtime.

* hostsidetests/media/app/MediaSessionTest/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsMediaSessionHostTestApp results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/media/app/MediaSessionTest/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsMediaSessionHostTestApp at runtime.

* hostsidetests/numberblocking/app/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsHostsideNumberBlockingAppTest results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsStaticSharedLibConsumerApp1 results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsStaticSharedLibConsumerApp1 at runtime.

* hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupLauncher1 results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/launcher1/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupLauncher1 at runtime.

* hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupLauncher2 results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/launcher2/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupLauncher2 at runtime.

* hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupLauncher3 results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/launcher3/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupLauncher3 at runtime.

* hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupLauncher4new results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/launcher4new/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupLauncher4new at runtime.

* hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupLauncher4old results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/launcher4old/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupLauncher4old at runtime.

* hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupPublisher1 results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/publisher1/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupPublisher1 at runtime.

* hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupPublisher2 results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/publisher2/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupPublisher2 at runtime.

* hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupPublisher3 results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/publisher3/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupPublisher3 at runtime.

* hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupPublisher4new results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/publisher4new/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupPublisher4new at runtime.

* hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupPublisher4new_nobackup results in duplicate
    classes which leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupPublisher4new_nobackup at runtime.

* hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupPublisher4new_nomanifest results in duplicate
    classes which leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupPublisher4new_nomanifest at runtime.

* hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupPublisher4new_wrongkey results in duplicate
    classes which leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupPublisher4new_wrongkey at runtime.

* hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupPublisher4old results in duplicate classes which
    leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/publisher4old/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupPublisher4old at runtime.

* hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutBackupPublisher4old_nomanifest results in duplicate
    classes which leads to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutBackupPublisher4old_nomanifest at runtime.

* hostsidetests/shortcuts/deviceside/multiuser/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutMultiuserTest results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/multiuser/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutMultiuserTest at runtime.

* hostsidetests/shortcuts/deviceside/upgrade/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutUpgradeVersion1 results in duplicate classes which leads
    to build time and compile time issues.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutUpgradeVersion2 results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/shortcuts/deviceside/upgrade/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutUpgradeVersion1 at runtime.

* hostsidetests/ui/appA/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsDeviceTaskSwitchingAppA results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/ui/appA/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsDeviceTaskSwitchingAppA at runtime.

* hostsidetests/ui/appB/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsDeviceTaskSwitchingAppB results in duplicate classes which leads
    to build time and compile time issues.

* hostsidetests/ui/appB/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsDeviceTaskSwitchingAppB at runtime.

* hostsidetests/usb/SerialTestApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsUsbSerialTestApp
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/JobScheduler/jobperm/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsJobSchedulerJobPerm
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/JobScheduler/jobperm/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsJobSchedulerJobPerm at runtime.

* tests/JobScheduler/shareduid/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsJobSchedulerSharedUid results in duplicate classes which leads
    to build time and compile time issues.

* tests/JobScheduler/shareduid/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsJobSchedulerSharedUid at runtime.

* tests/ProcessTest/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in ProcessTests results in
    duplicate classes which leads to build time and compile time
    issues.

* tests/acceleration/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsAccelerationTestCases results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAccelerationTestCases's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* tests/accessibilityservice/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsAccessibilityServiceTestCases results in duplicate classes which
    leads to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAccessibilityServiceTestCases's source depends on its classes
    and because of these changes they are no longer present on the
    compilation path.

* tests/admin/app/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAdminApp results in
    duplicate classes which leads to build time and compile time
    issues.

* tests/app/app/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsAppTestStubs's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAppTestStubs results
    in duplicate classes which leads to build time and compile time
    issues.

* tests/app/app2/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsAppTestStubsDifferentUid results in duplicate classes which
    leads to build time and compile time issues.

* tests/app/app2/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsAppTestStubsDifferentUid at runtime.

* tests/backup/app/fullbackup/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsFullBackupApp
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/backup/app/fullbackup/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to CtsFullBackupApp
    at runtime.

* tests/backup/app/keyvalue/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsKeyValueBackupApp
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/backup/app/keyvalue/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsKeyValueBackupApp at runtime.

* tests/fragment/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsFragmentTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/framework/base/windowmanager/alertwindowservice/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAlertWindowService
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/framework/base/windowmanager/alertwindowservice/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsAlertWindowService at runtime.

* tests/jank/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsJankDeviceTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsJankDeviceTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/leanbackjank/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsLeanbackJankTestCases results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsLeanbackJankTestCases's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* tests/leanbackjank/app/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsLeanbackJankApp
    results in duplicate classes which leads to build time and compile
    time issues. It is also unnecessary as CtsLeanbackJankApp targets
    SDK version 23 which provides all the classes at runtime.

* tests/leanbackjank/app/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsLeanbackJankApp at runtime.

* tests/netlegacy22.api/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsNetTestCasesLegacyApi22 results in duplicate classes which leads
    to build time and compile time issues.

* tests/netlegacy22.permission/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsNetTestCasesLegacyPermission22 results in duplicate classes
    which leads to build time and compile time issues.

* tests/pdf/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsPdfTestCases results
    in duplicate classes which leads to build time and compile time
    issues.

* tests/sample/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsSampleDeviceTestCases results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsSampleDeviceTestCases's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* tests/tests/accounts/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsAccountManagerTestCases results in duplicate classes which leads
    to build time and compile time issues. It is also unnecessary as
    CtsAccountManagerTestCases targets SDK version 26 which provides
    all the classes at runtime.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAccountManagerTestCases's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* tests/tests/animation/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAnimationTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/app.usage/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsUsageStatsTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' and 'android.test.runner' to
    LOCAL_JAVA_LIBRARIES because CtsUsageStatsTestCases's source
    depends on their classes and because of these changes they are no
    longer present on the compilation path.

* tests/tests/app/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsAndroidAppTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAndroidAppTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/appwidget/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsAppWidgetTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsAppWidgetTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/bluetooth/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsBluetoothTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/calendarcommon/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsCalendarcommon2TestCases results in duplicate classes which
    leads to build time and compile time issues. It is also unnecessary
    as CtsCalendarcommon2TestCases targets SDK version 15 which
    provides all the classes at runtime.

* tests/tests/car/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsCarTestCases results
    in duplicate classes which leads to build time and compile time
    issues.

* tests/tests/carrierapi/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsCarrierApiTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsCarrierApiTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/colormode/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsColorModeTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/content/Android.mk
    Added 'android.test.base' and 'android.test.mock' to
    LOCAL_JAVA_LIBRARIES because CtsContentTestCases's source depends
    on their classes and because of these changes they are no longer
    present on the compilation path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsContentTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/database/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDatabaseTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/display/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDisplayTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/dpi/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDpiTestCases results
    in duplicate classes which leads to build time and compile time
    issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDpiTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* tests/tests/dreams/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDreamsTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsDreamsTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* tests/tests/drm/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsDrmTestCases results
    in duplicate classes which leads to build time and compile time
    issues.

* tests/tests/dynamic_linker/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsDynamicLinkerTestCases results in duplicate classes which leads
    to build time and compile time issues.

* tests/tests/externalservice/service/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsExternalServiceService results in duplicate classes which leads
    to build time and compile time issues.

* tests/tests/externalservice/service/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsExternalServiceService at runtime.

* tests/tests/graphics/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsGraphicsTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/hardware/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsHardwareTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsHardwareTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/incident/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsIncidentTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/keystore/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsKeystoreTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsKeystoreTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* tests/tests/libcorefileio/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsLibcoreFileIOTestCases results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsLibcoreFileIOTestCases's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* tests/tests/location2/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsLocation2TestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsLocation2TestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/media/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsMediaTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsMediaTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* tests/tests/net/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsNetTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsNetTestCases results
    in duplicate classes which leads to build time and compile time
    issues.

* tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsNetSecPolicyUsesCleartextTrafficFalseTestCases results in
    duplicate classes which leads to build time and compile time
    issues.

* tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsNetSecPolicyUsesCleartextTrafficTrueTestCases results in
    duplicate classes which leads to build time and compile time
    issues.

* tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases results in
    duplicate classes which leads to build time and compile time
    issues.

* tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsNetSecConfigDownloadManagerTestCases results in duplicate
    classes which leads to build time and compile time issues.

* tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsNetSecConfigResourcesSrcTestCases results in duplicate classes
    which leads to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsNetSecConfigResourcesSrcTestCases's source depends on its
    classes and because of these changes they are no longer present on
    the compilation path.

* tests/tests/opengl/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsOpenGLTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsOpenGLTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* tests/tests/os/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsOsTestCases results
    in duplicate classes which leads to build time and compile time
    issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsOsTestCases's source depends on its classes and because of these
    changes they are no longer present on the compilation path.

* tests/tests/packageinstaller/adminpackageinstaller/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsAdminPackageInstallerTestCases results in duplicate classes
    which leads to build time and compile time issues.

* tests/tests/permission/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsPermissionTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsPermissionTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/permission2/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsPermission2TestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/preference/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsPreferenceTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsPreferenceTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/preference2/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsPreference2TestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsPreference2TestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/renderscript/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsRenderscriptTestCases results in duplicate classes which leads
    to build time and compile time issues.

* tests/tests/rsblas/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsRsBlasTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/rscpp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsRsCppTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/sax/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSaxTestCases results
    in duplicate classes which leads to build time and compile time
    issues.

* tests/tests/security/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSecurityTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsSecurityTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* tests/tests/selinux/selinuxTargetSdk2/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsSelinuxTargetSdk2TestCases results in duplicate classes which
    leads to build time and compile time issues.

* tests/tests/shortcutmanager/packages/launchermanifest/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutManagerLauncher1 results in duplicate classes which
    leads to build time and compile time issues.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutManagerLauncher2 results in duplicate classes which
    leads to build time and compile time issues.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutManagerLauncher3 results in duplicate classes which
    leads to build time and compile time issues.

* tests/tests/shortcutmanager/packages/launchermanifest/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutManagerLauncher1 at runtime.

* tests/tests/shortcutmanager/packages/launchermanifest_nonshared/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutManagerLauncher4 results in duplicate classes which
    leads to build time and compile time issues.

* tests/tests/shortcutmanager/packages/launchermanifest_nonshared/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutManagerLauncher4 at runtime.

* tests/tests/shortcutmanager/packages/packagemanifest/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutManagerPackage1 results in duplicate classes which leads
    to build time and compile time issues.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutManagerPackage2 results in duplicate classes which leads
    to build time and compile time issues.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutManagerPackage3 results in duplicate classes which leads
    to build time and compile time issues.

* tests/tests/shortcutmanager/packages/packagemanifest/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutManagerPackage1 at runtime.

* tests/tests/shortcutmanager/packages/packagemanifest_nonshared/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutManagerPackage4 results in duplicate classes which leads
    to build time and compile time issues.

* tests/tests/shortcutmanager/packages/packagemanifest_nonshared/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutManagerPackage4 at runtime.

* tests/tests/shortcutmanager/throttling/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsShortcutManagerThrottlingTest results in duplicate classes which
    leads to build time and compile time issues. It is also unnecessary
    as CtsShortcutManagerThrottlingTest targets SDK version 25 which
    provides all the classes at runtime.

* tests/tests/shortcutmanager/throttling/AndroidManifest.xml
    Add uses-library for android.test.runner because otherwise this
    change would change the set of files available to
    CtsShortcutManagerThrottlingTest at runtime.

* tests/tests/simpleperf/CtsSimpleperfDebugApp/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSimpleperfDebugApp
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/slice/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSliceTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/speech/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSpeechTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsSpeechTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* tests/tests/systemintents/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsSystemIntentTestCases results in duplicate classes which leads
    to build time and compile time issues.

* tests/tests/systemui/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsSystemUiTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/telecom/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsTelecomTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/telecom2/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsTelecomTestCases2
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/telephony/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsTelephonyTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsTelephonyTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/telephony2/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsTelephony2TestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsTelephony2TestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/theme/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsThemeDeviceTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsThemeDeviceTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/transition/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsTransitionTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/uiautomation/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsUiAutomationTestCases results in duplicate classes which leads
    to build time and compile time issues.

* tests/tests/uidisolation/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsUidIsolationTestCases results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsUidIsolationTestCases's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* tests/tests/uirendering/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsUiRenderingTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/util/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsUtilTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/view/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsViewTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsViewTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/widget/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsWidgetTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

* tests/tests/wrap/nowrap/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsWrapNoWrapTestCases
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWrapNoWrapTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path.

* tests/tests/wrap/wrap_debug/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsWrapWrapDebugTestCases results in duplicate classes which leads
    to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWrapWrapDebugTestCases's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* tests/tests/wrap/wrap_debug_malloc_debug/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsWrapWrapDebugMallocDebugTestCases results in duplicate classes
    which leads to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWrapWrapDebugMallocDebugTestCases's source depends on its
    classes and because of these changes they are no longer present on
    the compilation path.

* tests/tests/wrap/wrap_nodebug/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in
    CtsWrapWrapNoDebugTestCases results in duplicate classes which
    leads to build time and compile time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWrapWrapNoDebugTestCases's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path.

* tests/vr/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsVrTestCases results
    in duplicate classes which leads to build time and compile time
    issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsVrTestCases's source depends on its classes and because of these
    changes they are no longer present on the compilation path.

* tools/cts-holo-generation/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsHoloGeneration
    results in duplicate classes which leads to build time and compile
    time issues.

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsHoloGeneration's source depends on its classes and because of
    these changes they are no longer present on the compilation path.

* tools/cts-preconditions/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because statically including the classes in CtsPreconditions
    results in duplicate classes which leads to build time and compile
    time issues.

Bug: 30188076
Test: make checkbuild
Change-Id: I56c62344ab09338ed35586d76c0440d6f9515d72
2017-12-08 00:07:01 +00:00
Paul Duffin
35ff106cda Flatten dependency hierarchy of legacy-android-test
Previous changes statically included legacy-android-test in preparation
for removing android.test.* and junit.* classes from the android.jar.
Unfortunately, that lead to duplicate classes between APKs and the
bootclasspath which caused build problems (Proguard) and also runtime
problems (when targeting and running on older releases).

Switching from statically including the classes to using the runtime
libraries cannot be done in one step because legacy-android-test is
statically included in libraries which are used in many APKs and so
removing it from those libraries requires that all APKs be updated at
once. Doing that atomically across dozens of projects is not practical.

This change modifies APKS that statically include the
legacy-android-test library indirectly.

* If the APK manifest uses the android.test.runner library then the APK
  is modified to stop statically including legacy-android-test and
  instead build against android.test.base/mock/runner libraries instead.

* Otherwise, the APK statically includes legacy-android-test.

Also, any libraries that statically include are modified to stop
statically including it and if it has source dependencies on the classes
is changed to build against the android.test.base/mock/runner libraries.

The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.

* apps/CtsVerifier/Android.mk
    Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is
    unnecessary as CtsVerifier's source does not depend on classes from
    legacy-android-test. The classes do not need to be statically
    included because the classes will be provided by the runtime,
    either from the default bootclasspath or from the
    android.test.runner library that CtsVerifier specifies in its
    manifest.

* common/device-side/device-info/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because compatibility-device-info is not a package so does not need
    to statically include the classes

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    compatibility-device-info has a source dependency on its classes

* common/device-side/device-info/tests/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because compatibility-device-info-tests is not a package so does
    not need to statically include the classes

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    compatibility-device-info-tests has a source dependency on its
    classes

* common/device-side/util/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because compatibility-device-util is not a package so does not need
    to statically include the classes

* hostsidetests/abioverride/app/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsAbiOverrideTestApp was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsAccessSerialModern was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk
    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDocumentClient's source depends on its classes and because of
    these changes they are no longer present on the compilation path.
    The classes do not need to be statically included because the
    classes will be provided by the runtime, either from the default
    bootclasspath or from the android.test.runner library that
    CtsDocumentClient specifies in its manifest.

* hostsidetests/appsecurity/test-apps/DocumentProvider/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsDocumentProvider was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/appsecurity/test-apps/PermissionPolicy25/Android.mk
    Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is
    unnecessary as CtsPermissionPolicyTest25's source does not depend
    on classes from legacy-android-test. The classes do not need to be
    statically included because the classes will be provided by the
    runtime, either from the default bootclasspath or from the
    android.test.runner library that CtsPermissionPolicyTest25
    specifies in its manifest.

* hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.mk
    Replaced 'legacy-android-test' with 'android.test.base' in
    LOCAL_JAVA_LIBRARIES because CtsUsePermissionApp22's source depends
    on its classes. The classes do not need to be statically included
    because the classes will be provided by the runtime, either from
    the default bootclasspath or from the android.test.runner library
    that CtsUsePermissionApp22 specifies in its manifest.

* hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsUsePermissionApp23 was statically linked to it through its
    dependency on compatibility-device-util

    Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is
    unnecessary as CtsUsePermissionApp23 already statically includes
    legacy-android-test

* hostsidetests/appsecurity/test-apps/UsePermissionApp25/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsUsePermissionApp25 was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/appsecurity/test-apps/UsePermissionApp26/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsUsePermissionApp26 was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/appsecurity/test-apps/UsePermissionAppLatest/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsUsePermissionAppLatest was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/devicepolicy/app/Assistant/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsDevicePolicyAssistApp was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/devicepolicy/app/CustomizationApp/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsCustomizationApp was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk
    Replaced 'legacy-android-test' with 'android.test.runner.stubs' in
    LOCAL_JAVA_LIBRARIES because CtsDeviceAndProfileOwnerApp23's source
    depends on its classes. The classes do not need to be statically
    included because the classes will be provided by the runtime,
    either from the default bootclasspath or from the
    android.test.runner library that CtsDeviceAndProfileOwnerApp23
    specifies in its manifest.

* hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk
    Replaced 'legacy-android-test' with 'android.test.runner.stubs' in
    LOCAL_JAVA_LIBRARIES because CtsDeviceAndProfileOwnerApp25's source
    depends on its classes. The classes do not need to be statically
    included because the classes will be provided by the runtime,
    either from the default bootclasspath or from the
    android.test.runner library that CtsDeviceAndProfileOwnerApp25
    specifies in its manifest.

* hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/Android.mk
    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsDeviceAndProfileOwnerApp's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path. The classes do not need to be statically included
    because the classes will be provided by the runtime, either from
    the default bootclasspath or from the android.test.runner library
    that CtsDeviceAndProfileOwnerApp specifies in its manifest.

* hostsidetests/devicepolicy/app/WifiConfigCreator/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsWifiConfigCreator was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsProcStatsHelperApp was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/media/app/MediaSessionTest/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsMediaSessionHostTestApp was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/net/app/Android.mk
    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsHostsideNetworkTestsApp's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path. The classes do not need to be statically included
    because the classes will be provided by the runtime, either from
    the default bootclasspath or from the android.test.runner library
    that CtsHostsideNetworkTestsApp specifies in its manifest.

* hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsStaticSharedLibConsumerApp1 was statically linked to it through
    its dependency on compatibility-device-util

* hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutBackupLauncher1 was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutBackupLauncher2 was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutBackupLauncher3 was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutBackupLauncher4new was statically linked to it through
    its dependency on compatibility-device-util

* hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutBackupLauncher4old was statically linked to it through
    its dependency on compatibility-device-util

* hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher1 was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher2 was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher3 was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher4new was statically linked to it through
    its dependency on compatibility-device-util

* hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher4new_nobackup was statically linked to it
    through its dependency on compatibility-device-util

* hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher4new_nomanifest was statically linked to
    it through its dependency on compatibility-device-util

* hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher4new_wrongkey was statically linked to it
    through its dependency on compatibility-device-util

* hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher4old was statically linked to it through
    its dependency on compatibility-device-util

* hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutBackupPublisher4old_nomanifest was statically linked to
    it through its dependency on compatibility-device-util

* hostsidetests/shortcuts/deviceside/multiuser/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutMultiuserTest was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/shortcuts/deviceside/upgrade/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutUpgradeVersion1 was statically linked to it through its
    dependency on compatibility-device-util

    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutUpgradeVersion2 was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/ui/appA/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsDeviceTaskSwitchingAppA was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/ui/appB/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsDeviceTaskSwitchingAppB was statically linked to it through its
    dependency on compatibility-device-util

* hostsidetests/webkit/app/Android.mk
    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsWebViewStartupApp's source depends on its classes and because of
    these changes they are no longer present on the compilation path.
    The classes do not need to be statically included because the
    classes will be provided by the runtime, either from the default
    bootclasspath or from the android.test.runner library that
    CtsWebViewStartupApp specifies in its manifest.

* libs/deviceutillegacy/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because ctsdeviceutillegacy is not a package so does not need to
    statically include the classes

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    ctsdeviceutillegacy has a source dependency on its classes

* tests/JobScheduler/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsJobSchedulerTestCases's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path. The classes do not need to be statically included
    because the classes will be provided by the runtime, either from
    the default bootclasspath or from the android.test.runner library
    that CtsJobSchedulerTestCases specifies in its manifest.

* tests/JobScheduler/jobperm/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsJobSchedulerJobPerm was statically linked to it through its
    dependency on compatibility-device-util

* tests/JobScheduler/shareduid/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsJobSchedulerSharedUid was statically linked to it through its
    dependency on compatibility-device-util

* tests/admin/Android.mk
    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAdminTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.
    The classes do not need to be statically included because the
    classes will be provided by the runtime, either from the default
    bootclasspath or from the android.test.runner library that
    CtsAdminTestCases specifies in its manifest.

* tests/app/app2/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsAppTestStubsDifferentUid was statically linked to it through its
    dependency on compatibility-device-util

* tests/backup/app/fullbackup/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsFullBackupApp was statically linked to it through its dependency
    on compatibility-device-util

* tests/backup/app/keyvalue/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsKeyValueBackupApp was statically linked to it through its
    dependency on compatibility-device-util

* tests/framework/base/windowmanager/alertwindowservice/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsAlertWindowService was statically linked to it through its
    dependency on compatibility-device-util

* tests/leanbackjank/app/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsLeanbackJankApp was statically linked to it through its
    dependency on compatibility-device-util

* tests/tests/alarmclock/Android.mk
    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAlarmClockTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path. The classes do not need to be statically included because the
    classes will be provided by the runtime, either from the default
    bootclasspath or from the android.test.runner library that
    CtsAlarmClockTestCases specifies in its manifest.

* tests/tests/assist/Android.mk
    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsAssistTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.
    The classes do not need to be statically included because the
    classes will be provided by the runtime, either from the default
    bootclasspath or from the android.test.runner library that
    CtsAssistTestCases specifies in its manifest.

* tests/tests/dpi/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because android.cts.dpi is not a package so does not need to
    statically include the classes

    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    android.cts.dpi has a source dependency on its classes

* tests/tests/dpi2/Android.mk
    Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is
    unnecessary as CtsDpiTestCases2's source does not depend on classes
    from legacy-android-test. The classes do not need to be statically
    included because the classes will be provided by the runtime,
    either from the default bootclasspath or from the
    android.test.runner library that CtsDpiTestCases2 specifies in its
    manifest.

* tests/tests/externalservice/service/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsExternalServiceService was statically linked to it through its
    dependency on compatibility-device-util

* tests/tests/mediastress/Android.mk
    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsMediaStressTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path. The classes do not need to be statically included because the
    classes will be provided by the runtime, either from the default
    bootclasspath or from the android.test.runner library that
    CtsMediaStressTestCases specifies in its manifest.

* tests/tests/openglperf/Android.mk
    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsOpenGlPerfTestCases's source depends on its classes and because
    of these changes they are no longer present on the compilation
    path. The classes do not need to be statically included because the
    classes will be provided by the runtime, either from the default
    bootclasspath or from the android.test.runner library that
    CtsOpenGlPerfTestCases specifies in its manifest.

* tests/tests/provider/Android.mk
    Replaced 'legacy-android-test' with 'android.test.base' and
    'android.test.runner' in LOCAL_JAVA_LIBRARIES because
    CtsProviderTestCases's source depends on their classes. The classes
    do not need to be statically included because the classes will be
    provided by the runtime, either from the default bootclasspath or
    from the android.test.runner library that CtsProviderTestCases
    specifies in its manifest.

* tests/tests/selinux/selinuxTargetSdk/Android.mk
    Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is
    unnecessary as CtsSelinuxTargetSdkTestCases's source does not
    depend on classes from legacy-android-test. The classes do not need
    to be statically included because the classes will be provided by
    the runtime, either from the default bootclasspath or from the
    android.test.runner library that CtsSelinuxTargetSdkTestCases
    specifies in its manifest.

* tests/tests/shortcutmanager/packages/launchermanifest/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutManagerLauncher1 was statically linked to it through its
    dependency on compatibility-device-util

    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutManagerLauncher2 was statically linked to it through its
    dependency on compatibility-device-util

    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutManagerLauncher3 was statically linked to it through its
    dependency on compatibility-device-util

* tests/tests/shortcutmanager/packages/launchermanifest_nonshared/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutManagerLauncher4 was statically linked to it through its
    dependency on compatibility-device-util

* tests/tests/shortcutmanager/packages/packagemanifest/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutManagerPackage1 was statically linked to it through its
    dependency on compatibility-device-util

    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutManagerPackage2 was statically linked to it through its
    dependency on compatibility-device-util

    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutManagerPackage3 was statically linked to it through its
    dependency on compatibility-device-util

* tests/tests/shortcutmanager/packages/packagemanifest_nonshared/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutManagerPackage4 was statically linked to it through its
    dependency on compatibility-device-util

* tests/tests/shortcutmanager/throttling/Android.mk
    Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because
    CtsShortcutManagerThrottlingTest was statically linked to it
    through its dependency on compatibility-device-util

* tests/tests/voiceinteraction/Android.mk
    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsVoiceInteractionTestCases's source depends on its classes and
    because of these changes they are no longer present on the
    compilation path. The classes do not need to be statically included
    because the classes will be provided by the runtime, either from
    the default bootclasspath or from the android.test.runner library
    that CtsVoiceInteractionTestCases specifies in its manifest.

* tests/tests/webkit/Android.mk
    Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
    CtsWebkitTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.
    The classes do not need to be statically included because the
    classes will be provided by the runtime, either from the default
    bootclasspath or from the android.test.runner library that
    CtsWebkitTestCases specifies in its manifest.

* tests/ui/Android.mk
    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    CtsUiDeviceTestCases's source depends on its classes and because of
    these changes they are no longer present on the compilation path.
    The classes do not need to be statically included because the
    classes will be provided by the runtime, either from the default
    bootclasspath or from the android.test.runner library that
    CtsUiDeviceTestCases specifies in its manifest.

* tools/cts-reference-app-lib/Android.mk
    Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES
    because android.cts.refapp is not a package so does not need to
    statically include the classes

    Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because
    android.cts.refapp has a source dependency on its classes

Bug: 30188076
Test: make checkbuild
Change-Id: Ief6940eacf333043e2324462d37d1fd35db15165
2017-12-07 07:38:54 +00:00
Amith Yamasani
1241e9aaf2 Test app standby APIs
Also revert a workaround for incorrect state in
AppIdleHistory.

Bug: 69867516
Bug: 63527785
Test: cts-tradefed run cts-dev -m CtsAppUsageHostTestCases

Change-Id: If3edb88f12d949ab78788e5ea27f0aee76cc4235
2017-12-01 13:55:54 -08:00
Sudheer Shanka
9198dd3580 Add a workaround to fix CtsHostsideNetworkTests.
Fixes: 68765448
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
      com.android.cts.net.HostsideRestrictBackgroundNetworkTests

Change-Id: Iea93416916cf2f700f48e69f269a8851c492efd7
2017-11-28 17:09:24 -08:00
Manoj Boopathi Raj
8116e4594a Merge "Test more transforms and more socket types." am: d292f764bd am: 129129a6ad
am: e2309491e9

Change-Id: Ide9ab9b568f762b34d951446794575072802dd9a
2017-11-16 18:12:32 +00:00
Manoj Boopathi Raj
e2309491e9 Merge "Test more transforms and more socket types." am: d292f764bd
am: 129129a6ad

Change-Id: I6ad35065b267b9f7549aca0d5f5b506759d6a9cb
2017-11-16 18:07:11 +00:00
Manoj Boopathi Raj
129129a6ad Merge "Test more transforms and more socket types."
am: d292f764bd

Change-Id: Icdf454b74803f0bdf4f42caaccd34ec6bd72a224
2017-11-16 18:02:38 +00:00
Lorenzo Colitti
bca5ed9431 Test more transforms and more socket types.
Added CTS test to check the transform (for IPv4 & IPv6) with
various authentication & encryptions types

Bug: 34812052
Test: Ran CTS on angler using aosp/run_cts.sh
Change-Id: I51b4d13847ed0f8ad8d5f19132fdb35b1bd2950c
2017-11-15 14:12:31 -08:00
Xin Li
6e0e8f25d8 Merge commit 'ba1e9e7f7893a079138330d2962ff75c35d4cae2' from
oc-mr1-dev-plus-aosp into stage-aosp-master.

Change-Id: I1172a1501c65f67b9c2829b739cadeb9e9ff1983
2017-11-14 11:40:13 -08:00
Adam Vartanian
804a70d3f7 Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 am: fb73667810 am: 83f1303285 am: f259a8e37a am: 3d7e43b226 am: 2516305c8c am: cd4ab882f0
am: 66bf6ff3a2

Change-Id: I9f3d2f2669456d7c1de45cbc32848293b19b7846
2017-11-08 01:29:35 +00:00
Adam Vartanian
66bf6ff3a2 Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 am: fb73667810 am: 83f1303285 am: f259a8e37a am: 3d7e43b226 am: 2516305c8c
am: cd4ab882f0

Change-Id: Ib873b84dc95df60368a259ffd37401bc8bc2a6d3
2017-11-08 01:03:35 +00:00
Adam Vartanian
cd4ab882f0 Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 am: fb73667810 am: 83f1303285 am: f259a8e37a am: 3d7e43b226
am: 2516305c8c

Change-Id: I7e7f5363c4747289c9817e58cb6636839aa2da05
2017-11-08 00:29:47 +00:00
Adam Vartanian
2516305c8c Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 am: fb73667810 am: 83f1303285 am: f259a8e37a
am: 3d7e43b226

Change-Id: I318a6c318db25c5d4dd4be3426b480a9de0b9b11
2017-11-08 00:05:43 +00:00
Adam Vartanian
3d7e43b226 Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 am: fb73667810 am: 83f1303285
am: f259a8e37a

Change-Id: Iaf798faba75cb1f543e012eee98707e20a08e8ce
2017-11-07 23:41:55 +00:00
Adam Vartanian
fb73667810 Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052
am: 2204809646

Change-Id: Ic96d9b4693178421303c45ac628c456b66cdf655
2017-11-07 22:35:33 +00:00
Adam Vartanian
2204809646 Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832
am: 1e1de4f052

Change-Id: I4153cfa021655ba19b4b6dca19b70aaf91b5caa8
2017-11-07 22:08:32 +00:00
Adam Vartanian
1e1de4f052 Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42
am: e88ef1b832

Change-Id: Ie60c0885bc52b26fa900d2908946a56169d2f04c
2017-11-07 21:52:12 +00:00
Adam Vartanian
5d8ba63f42 Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa
am: c210cc1a90

Change-Id: I276a0be85c41f823506fc8397050d406257324e9
2017-11-07 21:26:57 +00:00
Adam Vartanian
73105d42aa Add CTS test for URI fix. am: a01da8536c
am: b1b5379591

Change-Id: Ib1bcf1c84ee878161f812e8a9ba762a746329a3b
2017-11-07 20:49:55 +00:00
Adam Vartanian
b1b5379591 Add CTS test for URI fix.
am: a01da8536c

Change-Id: I21c707648e6cc02b267f663bd02140dd66b6bd80
2017-11-07 20:40:20 +00:00
Adam Vartanian
a01da8536c Add CTS test for URI fix.
Bug: 68341964
Test: cts -m CtsNetTestCases (on NYC branch)
Change-Id: If532123542155ea3be281044a3ea4ca0b6cf2db5
2017-11-07 14:02:08 +00:00
Jonathan Basseri
6898ec144b Merge "Use random available port in CTS tests." am: 59d9f58467 am: 1ffbf5accc
am: 60b9bbdda1

Change-Id: Ie910c069c0a4048ce7d1257a55044194f1cc56cf
2017-10-31 18:28:00 +00:00
Jonathan Basseri
60b9bbdda1 Merge "Use random available port in CTS tests." am: 59d9f58467
am: 1ffbf5accc

Change-Id: Idf5e8a928f6bdfe2e075d61ac0cf5866059ed39a
2017-10-31 18:22:26 +00:00
Jonathan Basseri
382ea38fc0 Use random available port in CTS tests.
Let the OS pick a random unused port so that the test never gets
EADDRINUSE.

Bug: 68657805
Test: Run tests in android.net.cts.IpSecManagerTest
Change-Id: I7f6c68f3c92f5cbed856eda52adcdffb8adc4734
2017-10-31 09:43:26 -07:00
Sudheer Shanka
719216aca9 Fix CtsHostsideNetworkTests.
Newly installed packages are now idle by default.

Fixes: 67585516
Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \
      com.android.cts.net.HostsideRestrictBackgroundNetworkTests

Change-Id: Ief06cec1c21bfdd85d1db6673479df2431affe61
2017-10-30 15:26:21 -07:00