LineageOS/android_packages_modules_Connectivity
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
1,823 Commits 2 Branches 0 Tags
0ec05b3ca7fb4bd16a5442cf314b2ec0eb91c530
Commit Graph

1823 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
TreeHugger Robot
0ec05b3ca7 Merge "Stop statically including legacy-android-test" 2017-12-08 15:42:29 +00: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
Colin Cross
9d63d6b995 Merge remote-tracking branch 'goog/oc-mr1-dev-plus-aosp' into master 
Manual clean merge of oc-mr1-dev-plus-aosp to master to speed up
the automerger.

Bug: 70325521
Test: treehugger
Change-Id: I9a4d043d7445208ee8b7a9fb2c9cb8b74c273d65
 2017-12-07 11:05:41 -08:00
Xin Li
ab7bb84e34 Merge "DO NOT MERGE: Merge Oreo MR1 into master" am: 94b8755057 -s ours 
am: 817836d922

Change-Id: Id74502ef71ada04555e60232a32cf535d30f11af
 2017-12-07 08:56: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
Xin Li
94b8755057 Merge "DO NOT MERGE: Merge Oreo MR1 into master" 2017-12-06 23:18:30 +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
aaed1d09b3 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD 
am: 49b97c8053

Change-Id: I51fd0ba6886aa440388c53976633b4de10905b35
 2017-11-15 02:19:36 +00:00
Xin Li
49b97c8053 Merge remote-tracking branch 'goog/stage-aosp-master' into HEAD 
Change-Id: I08d90f09595783ecc235a95c3ab1b02f1bf1c21b
 2017-11-14 16:42:59 -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
83f1303285 Add CTS test for URI fix. am: a01da8536c am: b1b5379591 am: 73105d42aa am: c210cc1a90 am: 5d8ba63f42 am: e88ef1b832 am: 1e1de4f052 am: 2204809646 
am: fb73667810

Change-Id: Ib6d1cc2531123894f917b13d388845164e6eec32
 2017-11-07 22:56:57 +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
Chad Brubaker
044054f5af Merge "Add CTS tests for cleartext traffic default change" 2017-10-24 19:28:27 +00:00
Etan Cohen
4160e25384 Merge "Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0 am: 8e699c86fc am: 294f9ae45b am: 66aec9074f" into oc-mr1-dev-plus-aosp 
am: 410168a364

Change-Id: I3fd82fef086b959ebd95707bff48758e5e4a7f90
 2017-10-24 18:30:01 +00:00
Etan Cohen
5b0b9f0690 Merge "Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0" am: eedaf74628 am: fb02e14772 
am: 1b7972c3ad

Change-Id: I42f297ae31332ef5e430f928758a2d94d3b2c5e8
 2017-10-24 18:23:23 +00:00
Android Build Merger (Role)
410168a364 Merge "Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0 am: 8e699c86fc am: 294f9ae45b am: 66aec9074f" into oc-mr1-dev-plus-aosp 2017-10-24 18:18:22 +00:00
Etan Cohen
722df6a982 Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0 am: 8e699c86fc am: 294f9ae45b 
am: 66aec9074f

Change-Id: I475225124fd5e0143bd379c6c2a463b2ac73796e
 2017-10-24 18:15:44 +00:00
Etan Cohen
1b7972c3ad Merge "Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0" am: eedaf74628 
am: fb02e14772

Change-Id: I7c58480a13841513cfeec082daafc2bc4764fc83
 2017-10-24 18:15:39 +00:00
Etan Cohen
fb02e14772 Merge "Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0" 
am: eedaf74628

Change-Id: Id1dd3f957f911db94c291484a0f313a7239634e8
 2017-10-24 18:09:00 +00:00
Etan Cohen
66aec9074f Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0 am: 8e699c86fc 
am: 294f9ae45b

Change-Id: Id6806b4936ec7e3ae9bcc2ae3b62ff37b370e69b
 2017-10-24 18:08:45 +00:00
Etan Cohen
294f9ae45b Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0 
am: 8e699c86fc

Change-Id: I7860a70a1cb206f4af24441886efa2cb9512b3b5
 2017-10-24 18:02:30 +00:00
Android Merger
eedaf74628 Merge "Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev am: d5c00ceee0" 2017-10-24 17:58:16 +00:00
Etan Cohen
1b5d253694 Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev 
am: d5c00ceee0

Change-Id: I0d937d53fd3c151b67d8dd263d2c5d5f7f89dd50
 2017-10-24 17:57:49 +00:00
Etan Cohen
8e699c86fc Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev 
am: d5c00ceee0

Change-Id: I9b42b412355a641f2bb8a06f031fced7575bab44
 2017-10-24 17:57:29 +00:00
Treehugger Robot
d5c00ceee0 Merge "[CTS][PASSPOINT] Update the check for passpoint network for preloaded passpoint network" into oreo-cts-dev 2017-10-24 17:50:46 +00:00
Benedict Wong
0c9badeec9 Merge "Add UDP encap socket test to CTS tests" am: 9b85584096 am: 59c10d21d4 
am: 6b2dcb1981

Change-Id: I46a496a4732e6a558d5ab068d8fadb990b041ec2
 2017-10-24 16:58:17 +00:00
Benedict Wong
6b2dcb1981 Merge "Add UDP encap socket test to CTS tests" am: 9b85584096 
am: 59c10d21d4

Change-Id: I4bb69fe63bdcba3c92f27f0542c282b505f64dcf
 2017-10-24 16:43:44 +00:00
Benedict Wong
59c10d21d4 Merge "Add UDP encap socket test to CTS tests" 
am: 9b85584096

Change-Id: Ic819770bb02cfc08018068ad43b05dc39aa0e170
 2017-10-24 16:38:42 +00:00
Benedict Wong
9b85584096 Merge "Add UDP encap socket test to CTS tests" 2017-10-24 16:31:12 +00:00
Chad Brubaker
2a880aee40 Add CTS tests for cleartext traffic default change 
Cleartext traffic permitted now defaults to False for apps targetting P,
this test splits the previous cleartext test into pre-P and P+ targetSDK
versions.

Tests which depended on cleartext traffic have been opted in to
cleartext traffic.

Test: This is the test
Bug: 63931636
Change-Id: I5c4aa39e4055380a54bfe09f668894240be713f8
 2017-10-24 09:06:38 -07:00