Add android.test.base/stubs dependency
In preparation for the removal of the non-junit classes in the
android.test.base library from the android.jar this adds a dependency
on android.test.base/stubs to ensure this code will continue to
compile.
The following change descriptions were generated automatically and so
may be a little repetitive. They are provided to give the reviewer
enough information to check the comments match what has actually been
changed and check the reasoning behind the changes.
* apps/CtsVerifier/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsVerifier's will need them in order to compile once its classes
are removed from the test_current SDK on which it currently
depends.
* common/device-side/util/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
compatibility-device-util's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsAppAccessData's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* hostsidetests/appsecurity/test-apps/AppWithData/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsAppWithData's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDocumentClient's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsEncryptionApp's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsExternalStorageApp's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsInstrumentationAppDiffCert's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsMultiUserStorageApp's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsPrivilegedUpdateTests's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsReadExternalStorageApp's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* hostsidetests/appsecurity/test-apps/SplitApp/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsSplitApp's will need them in order to compile once its classes
are removed from the current SDK on which it currently depends.
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsSplitAppDiffRevision's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsSplitAppDiffVersion's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsSplitAppDiffCert's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsStorageAppA's will need them in order to compile once its
classes are removed from the test_current SDK on which it currently
depends.
* hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsStorageAppB's will need them in order to compile once its
classes are removed from the test_current SDK on which it currently
depends.
* hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsStorageStatsApp's will need them in order to compile once its
classes are removed from the test_current SDK on which it currently
depends.
* hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsUsePermissionDiffCert's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsUsesLibraryApp's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsWriteExternalStorageApp's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsKeySetTestApp's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsAccountCheckAuthApp's will need them in order to compile once
its classes are removed from the test_current SDK on which it
currently depends.
* hostsidetests/devicepolicy/app/AccountManagement/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsAccountManagementDevicePolicyApp's will need them in order to
compile once its classes are removed from the current SDK on which
it currently depends.
* hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsCorpOwnedManagedProfile's will need them in order to compile
once its classes are removed from the test_current SDK on which it
currently depends.
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsCorpOwnedManagedProfile2's will need them in order to compile
once its classes are removed from the test_current SDK on which it
currently depends.
* hostsidetests/devicepolicy/app/CustomizationApp/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsCustomizationApp's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* hostsidetests/devicepolicy/app/DelegateApp/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDelegateApp's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDeviceAdminApp23's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDeviceAdminApp24's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* hostsidetests/devicepolicy/app/DeviceAdminService/package1/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDeviceAdminService1's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* hostsidetests/devicepolicy/app/DeviceAdminService/package2/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDeviceAdminService2's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* hostsidetests/devicepolicy/app/DeviceAdminService/package3/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDeviceAdminService3's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* hostsidetests/devicepolicy/app/DeviceAdminService/package4/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDeviceAdminService4's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* hostsidetests/devicepolicy/app/DeviceAdminService/packageb/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDeviceAdminServiceB's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDeviceAndProfileOwnerApp23's will need them in order to compile
once its classes are removed from the test_current SDK on which it
currently depends.
* hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDeviceAndProfileOwnerApp25's will need them in order to compile
once its classes are removed from the test_current SDK on which it
currently depends.
* hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDeviceAndProfileOwnerApp's will need them in order to compile
once its classes are removed from the test_current SDK on which it
currently depends.
* hostsidetests/devicepolicy/app/DeviceOwner/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDeviceOwnerApp's will need them in order to compile once its
classes are removed from the test_current SDK on which it currently
depends.
* hostsidetests/devicepolicy/app/IntentReceiver/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsIntentReceiverApp's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* hostsidetests/devicepolicy/app/IntentSender/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsIntentSenderApp's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* hostsidetests/devicepolicy/app/LauncherTests/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsLauncherAppsTests's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* hostsidetests/devicepolicy/app/ManagedProfile/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsManagedProfileApp's will need them in order to compile once its
classes are removed from the test_current SDK on which it currently
depends.
* hostsidetests/devicepolicy/app/PackageInstaller/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsPackageInstallerApp's will need them in order to compile once
its classes are removed from the test_current SDK on which it
currently depends.
* hostsidetests/devicepolicy/app/ProfileOwner/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsProfileOwnerApp's will need them in order to compile once its
classes are removed from the test_current SDK on which it currently
depends.
* hostsidetests/incident/apps/boundwidgetapp/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsAppWidgetApp's will need them in order to compile once its
classes are removed from the test_current SDK on which it currently
depends.
* hostsidetests/net/app/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsHostsideNetworkTestsApp's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* hostsidetests/numberblocking/app/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsHostsideNumberBlockingAppTest's will need them in order to
compile once its classes are removed from the current SDK on which
it currently depends.
* hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsShortcutBackupLauncher1's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsShortcutBackupLauncher2's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsShortcutBackupLauncher3's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsShortcutBackupLauncher4new's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsShortcutBackupLauncher4old's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsShortcutBackupPublisher1's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsShortcutBackupPublisher2's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsShortcutBackupPublisher3's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsShortcutBackupPublisher4new's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsShortcutBackupPublisher4new_nobackup's will need them in order
to compile once its classes are removed from the current SDK on
which it currently depends.
* hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsShortcutBackupPublisher4new_nomanifest's will need them in order
to compile once its classes are removed from the current SDK on
which it currently depends.
* hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsShortcutBackupPublisher4new_wrongkey's will need them in order
to compile once its classes are removed from the current SDK on
which it currently depends.
* hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsShortcutBackupPublisher4old's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsShortcutBackupPublisher4old_nomanifest's will need them in order
to compile once its classes are removed from the current SDK on
which it currently depends.
* hostsidetests/shortcuts/deviceside/multiuser/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsShortcutMultiuserTest's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* hostsidetests/shortcuts/deviceside/upgrade/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsShortcutUpgradeVersion1's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsShortcutUpgradeVersion2's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* hostsidetests/ui/control/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDeviceTaskSwitchingControl's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* hostsidetests/usb/SerialTestApp/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsUsbSerialTestApp's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* hostsidetests/webkit/app/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsWebViewStartupApp's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/ProcessTest/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
ProcessTests's will need them in order to compile once its classes
are removed from the current SDK on which it currently depends.
* tests/acceleration/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsAccelerationTestCases's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* tests/accessibility/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsAccessibilityTestCases's will need them in order to compile once
its classes are removed from the test_current SDK on which it
currently depends.
* tests/accessibilityservice/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsAccessibilityServiceTestCases's will need them in order to
compile once its classes are removed from the test_current SDK on
which it currently depends.
* tests/admin/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsAdminTestCases's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/app/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsAppTestCases's will need them in order to compile once its
classes are removed from the test_current SDK on which it currently
depends.
* tests/backup/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsBackupTestCases's will need them in order to compile once its
classes are removed from the test_current SDK on which it currently
depends.
* tests/camera/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsCameraTestCases's will need them in order to compile once its
classes are removed from the test_current SDK on which it currently
depends.
* tests/fragment/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsFragmentTestCases's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/sample/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsSampleDeviceTestCases's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* tests/sensor/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
cts-sensors-tests's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/tests/accounts/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsAccountManagerTestCases's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* tests/tests/alarmclock/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsAlarmClockTestCases's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* tests/tests/assist/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsAssistTestCases's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/tests/bluetooth/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsBluetoothTestCases's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/tests/calendarcommon/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsCalendarcommon2TestCases's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* tests/tests/car/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsCarTestCases's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/tests/contactsproviderwipe/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsContactsProviderWipe's will need them in order to compile once
its classes are removed from the test_current SDK on which it
currently depends.
* tests/tests/database/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDatabaseTestCases's will need them in order to compile once its
classes are removed from the test_current SDK on which it currently
depends.
* tests/tests/display/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDisplayTestCases's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/tests/dpi/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDpiTestCases's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/tests/dpi2/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDpiTestCases2's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/tests/drm/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsDrmTestCases's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/tests/externalservice/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsExternalServiceTestCases's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* tests/tests/graphics/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsGraphicsTestCases's will need them in order to compile once its
classes are removed from the test_current SDK on which it currently
depends.
* tests/tests/location/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
cts-location-tests's will need them in order to compile once its
classes are removed from the test_current SDK on which it currently
depends.
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsLocationTestCases's will need them in order to compile once its
classes are removed from the test_current SDK on which it currently
depends.
* tests/tests/mediastress/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsMediaStressTestCases's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* tests/tests/midi/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsMidiTestCases's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/tests/multiuser/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsMultiUserTestCases's will need them in order to compile once its
classes are removed from the test_current SDK on which it currently
depends.
* tests/tests/nativehardware/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
cts-nativehardware-tests's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsNetSecPolicyUsesCleartextTrafficFalseTestCases's will need them
in order to compile once its classes are removed from the current
SDK on which it currently depends.
* tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsNetSecPolicyUsesCleartextTrafficTrueTestCases's will need them
in order to compile once its classes are removed from the current
SDK on which it currently depends.
* tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases's will need
them in order to compile once its classes are removed from the
current SDK on which it currently depends.
* tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsNetSecConfigDownloadManagerTestCases's will need them in order
to compile once its classes are removed from the current SDK on
which it currently depends.
* tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsNetSecConfigResourcesSrcTestCases's will need them in order to
compile once its classes are removed from the current SDK on which
it currently depends.
* tests/tests/opengl/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsOpenGLTestCases's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/tests/openglperf/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsOpenGlPerfTestCases's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* tests/tests/packageinstaller/adminpackageinstaller/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsAdminPackageInstallerTestCases's will need them in order to
compile once its classes are removed from the test_current SDK on
which it currently depends.
* tests/tests/permission2/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsPermission2TestCases's will need them in order to compile once
its classes are removed from the test_current SDK on which it
currently depends.
* tests/tests/preference/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsPreferenceTestCases's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* tests/tests/preference2/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsPreference2TestCases's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* tests/tests/renderscript/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsRenderscriptTestCases's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* tests/tests/rsblas/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsRsBlasTestCases's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/tests/rscpp/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsRsCppTestCases's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/tests/sax/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsSaxTestCases's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/tests/selinux/selinuxTargetSdk/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsSelinuxTargetSdkTestCases's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* tests/tests/selinux/selinuxTargetSdk2/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsSelinuxTargetSdk2TestCases's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* tests/tests/shortcutmanager/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsShortcutManagerTestCases's will need them in order to compile
once its classes are removed from the test_current SDK on which it
currently depends.
* tests/tests/simpleperf/CtsSimpleperfDebugApp/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsSimpleperfDebugApp's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/tests/telecom/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsTelecomTestCases's will need them in order to compile once its
classes are removed from the test_current SDK on which it currently
depends.
* tests/tests/telecom2/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsTelecomTestCases2's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/tests/telecom3/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsTelecomTestCases3's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/tests/telephony/preconditions/app/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsTelephonyPreparerApp's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* tests/tests/text/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsTextTestCases's will need them in order to compile once its
classes are removed from the test_current SDK on which it currently
depends.
* tests/tests/theme/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsThemeDeviceTestCases's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* tests/tests/tv/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsTvTestCases's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/tests/uiautomation/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsUiAutomationTestCases's will need them in order to compile once
its classes are removed from the test_current SDK on which it
currently depends.
* tests/tests/uidisolation/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsUidIsolationTestCases's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* tests/tests/voiceinteraction/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsVoiceInteractionTestCases's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* tests/tests/voicesettings/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsVoiceSettingsTestCases's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* tests/tests/wrap/nowrap/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsWrapNoWrapTestCases's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* tests/tests/wrap/wrap_debug/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsWrapWrapDebugTestCases's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* tests/tests/wrap/wrap_debug_malloc_debug/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsWrapWrapDebugMallocDebugTestCases's will need them in order to
compile once its classes are removed from the current SDK on which
it currently depends.
* tests/tests/wrap/wrap_nodebug/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsWrapWrapNoDebugTestCases's will need them in order to compile
once its classes are removed from the current SDK on which it
currently depends.
* tests/tvprovider/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsTvProviderTestCases's will need them in order to compile once
its classes are removed from the current SDK on which it currently
depends.
* tests/ui/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsUiDeviceTestCases's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/video/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsVideoTestCases's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tests/vr/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsVrTestCases's will need them in order to compile once its
classes are removed from the test_current SDK on which it currently
depends.
* tools/cts-device-info/Android.mk
Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because
CtsDeviceInfo's will need them in order to compile once its classes
are removed from the SDK on which it currently depends.
* tools/cts-holo-generation/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsHoloGeneration's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tools/cts-preconditions/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
CtsPreconditions's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
* tools/cts-reference-app-lib/Android.mk
Added 'android.test.base.stubs' to LOCAL_JAVA_LIBRARIES because
android.cts.refapp's will need them in order to compile once its
classes are removed from the current SDK on which it currently
depends.
Bug: 30188076
Test: make dist
Change-Id: I1d263c97b9009bad09cfea07f9c56fc0943ef203
diff --git a/apps/CtsVerifier/Android.mk b/apps/CtsVerifier/Android.mk
index 9bf2154..0fd03b1 100644
--- a/apps/CtsVerifier/Android.mk
+++ b/apps/CtsVerifier/Android.mk
@@ -42,6 +42,7 @@
LOCAL_JAVA_LIBRARIES += telephony-common
LOCAL_JAVA_LIBRARIES += android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES += android.test.base.stubs
LOCAL_PACKAGE_NAME := CtsVerifier
diff --git a/common/device-side/util/Android.mk b/common/device-side/util/Android.mk
index 36316b5..fbf0ee4 100644
--- a/common/device-side/util/Android.mk
+++ b/common/device-side/util/Android.mk
@@ -25,7 +25,7 @@
ub-uiautomator \
mockito-target-minus-junit4
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base.stubs
LOCAL_MODULE_TAGS := optional
diff --git a/hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk b/hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk
index e1fb84a..615492c 100644
--- a/hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk
@@ -23,6 +23,8 @@
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_PACKAGE_NAME := CtsAppAccessData
# tag this module as a cts test artifact
diff --git a/hostsidetests/appsecurity/test-apps/AppWithData/Android.mk b/hostsidetests/appsecurity/test-apps/AppWithData/Android.mk
index 212dab1..c719665 100644
--- a/hostsidetests/appsecurity/test-apps/AppWithData/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/AppWithData/Android.mk
@@ -23,6 +23,8 @@
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_PACKAGE_NAME := CtsAppWithData
# tag this module as a cts test artifact
diff --git a/hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk b/hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk
index bac3086..ad50a57 100644
--- a/hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk
@@ -22,7 +22,7 @@
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util ctstestrunner ub-uiautomator
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk b/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk
index a4a9436..9734112 100644
--- a/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/EncryptionApp/Android.mk
@@ -22,6 +22,8 @@
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util ctstestrunner ub-uiautomator
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CtsEncryptionApp
diff --git a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk
index 19bded4..2fcbc20 100644
--- a/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk
@@ -20,6 +20,8 @@
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CtsExternalStorageApp
diff --git a/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk
index e6ca813..b99597b 100644
--- a/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk
@@ -23,6 +23,8 @@
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_PACKAGE_NAME := CtsInstrumentationAppDiffCert
# tag this module as a cts test artifact
diff --git a/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk b/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk
index 1ef18c7..e08ac6f 100644
--- a/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk
@@ -20,6 +20,8 @@
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
../ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java
diff --git a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk
index e86fae9..5a584c1 100644
--- a/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/PrivilegedUpdateApp/Android.mk
@@ -24,6 +24,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util ctstestrunner
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
# Tag this module as a cts test artifact
LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
LOCAL_PROGUARD_ENABLED := disabled
diff --git a/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk b/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk
index 8bcc282..51699dd 100644
--- a/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk
@@ -20,7 +20,7 @@
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
../ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java
diff --git a/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk b/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk
index 0be6e50..7c642b1 100644
--- a/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/SplitApp/Android.mk
@@ -22,7 +22,7 @@
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -52,7 +52,7 @@
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -81,7 +81,7 @@
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -109,7 +109,7 @@
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk b/hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk
index d756a0de..ebbc892 100644
--- a/hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk
@@ -20,6 +20,8 @@
LOCAL_SDK_VERSION := test_current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SRC_FILES := $(call all-java-files-under, ../StorageApp/src/)
LOCAL_PACKAGE_NAME := CtsStorageAppA
diff --git a/hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk b/hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk
index 278d68f..3a5462e 100644
--- a/hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk
@@ -20,6 +20,8 @@
LOCAL_SDK_VERSION := test_current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SRC_FILES := $(call all-java-files-under, ../StorageApp/src/)
LOCAL_PACKAGE_NAME := CtsStorageAppB
diff --git a/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk b/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk
index bc84b74..16d78d7 100644
--- a/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk
@@ -20,6 +20,8 @@
LOCAL_SDK_VERSION := test_current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-java-files-under, ../StorageApp/src)
diff --git a/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk
index e47c5da..4605cfb 100644
--- a/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk
@@ -24,6 +24,8 @@
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_PACKAGE_NAME := CtsUsePermissionDiffCert
# tag this module as a cts test artifact
diff --git a/hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk b/hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk
index 2d67d62..df12f82 100644
--- a/hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/UsesLibraryApp/Android.mk
@@ -22,6 +22,8 @@
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test compatibility-device-util ctstestrunner ub-uiautomator
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
../ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java
diff --git a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk
index de77eb8..b1e84cb 100644
--- a/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk
@@ -22,7 +22,7 @@
android-support-test \
compatibility-device-util
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
../ExternalStorageApp/src/com/android/cts/externalstorageapp/CommonExternalStorageTest.java
diff --git a/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk b/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk
index 324ba4f..619f1ce 100644
--- a/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk
+++ b/hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk
@@ -23,6 +23,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
LOCAL_PACKAGE_NAME := CtsKeySetTestApp
LOCAL_DEX_PREOPT := false
diff --git a/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk b/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk
index 14ddc00..2943695 100644
--- a/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk
+++ b/hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk
@@ -33,6 +33,8 @@
ub-uiautomator \
android-support-test
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := test_current
include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/devicepolicy/app/AccountManagement/Android.mk b/hostsidetests/devicepolicy/app/AccountManagement/Android.mk
index 391f573..4b59d84 100644
--- a/hostsidetests/devicepolicy/app/AccountManagement/Android.mk
+++ b/hostsidetests/devicepolicy/app/AccountManagement/Android.mk
@@ -33,6 +33,8 @@
ub-uiautomator \
android-support-test
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.mk b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.mk
index c8872b4..8af6492 100644
--- a/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.mk
+++ b/hostsidetests/devicepolicy/app/CorpOwnedManagedProfile/Android.mk
@@ -32,7 +32,7 @@
LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src
-LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
+LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit android.test.base.stubs
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
@@ -57,7 +57,7 @@
LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src
-LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
+LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit android.test.base.stubs
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
diff --git a/hostsidetests/devicepolicy/app/CustomizationApp/Android.mk b/hostsidetests/devicepolicy/app/CustomizationApp/Android.mk
index b88d4a2..2350e24 100644
--- a/hostsidetests/devicepolicy/app/CustomizationApp/Android.mk
+++ b/hostsidetests/devicepolicy/app/CustomizationApp/Android.mk
@@ -30,6 +30,7 @@
android-support-test \
compatibility-device-util \
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
LOCAL_SDK_VERSION := current
diff --git a/hostsidetests/devicepolicy/app/DelegateApp/Android.mk b/hostsidetests/devicepolicy/app/DelegateApp/Android.mk
index 07b92e5..e7e986d 100644
--- a/hostsidetests/devicepolicy/app/DelegateApp/Android.mk
+++ b/hostsidetests/devicepolicy/app/DelegateApp/Android.mk
@@ -24,7 +24,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
+LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit android.test.base.stubs
LOCAL_STATIC_JAVA_LIBRARIES = \
android-support-v4 \
diff --git a/hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk
index 2ca1899..5cf7f05 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk
+++ b/hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk
@@ -30,7 +30,7 @@
ctstestrunner \
compatibility-device-util
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SDK_VERSION := current
diff --git a/hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk
index c7fa08d..bdbbf89 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk
+++ b/hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk
@@ -30,7 +30,7 @@
ctstestrunner \
compatibility-device-util
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SDK_VERSION := current
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package1/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/package1/Android.mk
index 72d2bb0..55cf2b3 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdminService/package1/Android.mk
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package1/Android.mk
@@ -28,6 +28,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
# tag this module as a cts test artifact
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package2/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/package2/Android.mk
index e2f9b8d..8725fb7 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdminService/package2/Android.mk
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package2/Android.mk
@@ -28,6 +28,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
# tag this module as a cts test artifact
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package3/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/package3/Android.mk
index b88d537..fdc7e7a 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdminService/package3/Android.mk
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package3/Android.mk
@@ -28,6 +28,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
# tag this module as a cts test artifact
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/package4/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/package4/Android.mk
index 7f72ddf..02bf1e5 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdminService/package4/Android.mk
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/package4/Android.mk
@@ -28,6 +28,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
# tag this module as a cts test artifact
diff --git a/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/Android.mk b/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/Android.mk
index 8c66638..cf21905 100644
--- a/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/Android.mk
+++ b/hostsidetests/devicepolicy/app/DeviceAdminService/packageb/Android.mk
@@ -28,6 +28,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
# tag this module as a cts test artifact
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk
index 3bdd5e0..71aeff6 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk
@@ -24,7 +24,11 @@
LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
-LOCAL_JAVA_LIBRARIES = conscrypt android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := \
+ conscrypt \
+ android.test.runner.stubs \
+ android.test.base.stubs \
+
LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4 compatibility-device-util ctstestrunner ub-uiautomator
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk
index 16e26b7..6e6227c 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk
@@ -24,7 +24,11 @@
LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
-LOCAL_JAVA_LIBRARIES = conscrypt android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := \
+ conscrypt \
+ android.test.runner.stubs \
+ android.test.base.stubs \
+
LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4 compatibility-device-util ctstestrunner ub-uiautomator
diff --git a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/Android.mk b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/Android.mk
index a7ed338..070c282 100644
--- a/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/Android.mk
+++ b/hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/Android.mk
@@ -24,7 +24,11 @@
LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
-LOCAL_JAVA_LIBRARIES = conscrypt android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := \
+ conscrypt \
+ android.test.runner.stubs \
+ android.test.base.stubs \
+
LOCAL_STATIC_JAVA_LIBRARIES = android-support-v4 compatibility-device-util ctstestrunner ub-uiautomator
diff --git a/hostsidetests/devicepolicy/app/DeviceOwner/Android.mk b/hostsidetests/devicepolicy/app/DeviceOwner/Android.mk
index 393d38a..c060822 100644
--- a/hostsidetests/devicepolicy/app/DeviceOwner/Android.mk
+++ b/hostsidetests/devicepolicy/app/DeviceOwner/Android.mk
@@ -27,7 +27,12 @@
LOCAL_AIDL_INCLUDES := $(LOCAL_PATH)/src
-LOCAL_JAVA_LIBRARIES := android.test.runner conscrypt cts-junit
+LOCAL_JAVA_LIBRARIES := \
+ android.test.runner \
+ conscrypt \
+ cts-junit \
+ android.test.base.stubs \
+
LOCAL_STATIC_JAVA_LIBRARIES := \
ctstestrunner \
diff --git a/hostsidetests/devicepolicy/app/IntentReceiver/Android.mk b/hostsidetests/devicepolicy/app/IntentReceiver/Android.mk
index 530738c..e475215 100644
--- a/hostsidetests/devicepolicy/app/IntentReceiver/Android.mk
+++ b/hostsidetests/devicepolicy/app/IntentReceiver/Android.mk
@@ -24,7 +24,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base.stubs
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-v4 \
diff --git a/hostsidetests/devicepolicy/app/IntentSender/Android.mk b/hostsidetests/devicepolicy/app/IntentSender/Android.mk
index 5cfa129..bb1f6cc 100644
--- a/hostsidetests/devicepolicy/app/IntentSender/Android.mk
+++ b/hostsidetests/devicepolicy/app/IntentSender/Android.mk
@@ -24,7 +24,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base.stubs
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-v4 \
diff --git a/hostsidetests/devicepolicy/app/LauncherTests/Android.mk b/hostsidetests/devicepolicy/app/LauncherTests/Android.mk
index 97a53c9..084314b 100644
--- a/hostsidetests/devicepolicy/app/LauncherTests/Android.mk
+++ b/hostsidetests/devicepolicy/app/LauncherTests/Android.mk
@@ -24,7 +24,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := cts-junit
+LOCAL_JAVA_LIBRARIES := cts-junit android.test.base.stubs
LOCAL_STATIC_JAVA_LIBRARIES = \
android-support-v4 \
diff --git a/hostsidetests/devicepolicy/app/ManagedProfile/Android.mk b/hostsidetests/devicepolicy/app/ManagedProfile/Android.mk
index f2c64c0..3e81296 100644
--- a/hostsidetests/devicepolicy/app/ManagedProfile/Android.mk
+++ b/hostsidetests/devicepolicy/app/ManagedProfile/Android.mk
@@ -24,7 +24,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
+LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit android.test.base.stubs
LOCAL_STATIC_JAVA_LIBRARIES = \
android-support-v4 \
diff --git a/hostsidetests/devicepolicy/app/PackageInstaller/Android.mk b/hostsidetests/devicepolicy/app/PackageInstaller/Android.mk
index c9d1f1e..a52ed2a 100644
--- a/hostsidetests/devicepolicy/app/PackageInstaller/Android.mk
+++ b/hostsidetests/devicepolicy/app/PackageInstaller/Android.mk
@@ -24,7 +24,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base.stubs
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-v4 \
diff --git a/hostsidetests/devicepolicy/app/ProfileOwner/Android.mk b/hostsidetests/devicepolicy/app/ProfileOwner/Android.mk
index 1df0d07..e19b119 100644
--- a/hostsidetests/devicepolicy/app/ProfileOwner/Android.mk
+++ b/hostsidetests/devicepolicy/app/ProfileOwner/Android.mk
@@ -24,7 +24,12 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := android.test.runner conscrypt cts-junit
+LOCAL_JAVA_LIBRARIES := \
+ android.test.runner \
+ conscrypt \
+ cts-junit \
+ android.test.base.stubs \
+
LOCAL_STATIC_JAVA_LIBRARIES := \
ctstestrunner \
diff --git a/hostsidetests/incident/apps/boundwidgetapp/Android.mk b/hostsidetests/incident/apps/boundwidgetapp/Android.mk
index 152414f..5430d47 100644
--- a/hostsidetests/incident/apps/boundwidgetapp/Android.mk
+++ b/hostsidetests/incident/apps/boundwidgetapp/Android.mk
@@ -24,7 +24,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
-LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit
+LOCAL_JAVA_LIBRARIES := android.test.runner cts-junit android.test.base.stubs
LOCAL_STATIC_JAVA_LIBRARIES := \
ctstestrunner \
diff --git a/hostsidetests/net/app/Android.mk b/hostsidetests/net/app/Android.mk
index 66adea7..c03e70b 100644
--- a/hostsidetests/net/app/Android.mk
+++ b/hostsidetests/net/app/Android.mk
@@ -23,7 +23,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner ub-uiautomator \
CtsHostsideNetworkTestsAidl
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/hostsidetests/numberblocking/app/Android.mk b/hostsidetests/numberblocking/app/Android.mk
index 0d5df67..fc0f4a0 100644
--- a/hostsidetests/numberblocking/app/Android.mk
+++ b/hostsidetests/numberblocking/app/Android.mk
@@ -29,6 +29,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner android-support-test
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
# tag this module as a cts test artifact
LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk b/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk
index d6077a4..d7517cd 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk
@@ -37,6 +37,8 @@
ub-uiautomator \
ShortcutManagerTestUtils
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk b/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk
index 8f124a0..8a6440d 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk
@@ -37,6 +37,8 @@
ub-uiautomator \
ShortcutManagerTestUtils
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk b/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk
index 9883e5c..be8edb3 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk
@@ -37,6 +37,8 @@
ub-uiautomator \
ShortcutManagerTestUtils
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.mk b/hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.mk
index 856ff1f..97287fb 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.mk
@@ -37,6 +37,8 @@
ub-uiautomator \
ShortcutManagerTestUtils
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.mk b/hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.mk
index 0147dd6..6389d22 100644
--- a/hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.mk
@@ -37,6 +37,8 @@
ub-uiautomator \
ShortcutManagerTestUtils
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk b/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk
index 72da903..ac91c82 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk
@@ -37,6 +37,8 @@
ub-uiautomator \
ShortcutManagerTestUtils
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk b/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk
index 286dded..2bb7f06 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk
@@ -37,6 +37,8 @@
ub-uiautomator \
ShortcutManagerTestUtils
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk b/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk
index f1421d1..9a5f530 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk
@@ -37,6 +37,8 @@
ub-uiautomator \
ShortcutManagerTestUtils
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.mk b/hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.mk
index ace1afe..71a545c 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.mk
@@ -39,6 +39,8 @@
ub-uiautomator \
ShortcutManagerTestUtils
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.mk b/hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.mk
index 75a025b..1e35a01 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.mk
@@ -39,6 +39,8 @@
ub-uiautomator \
ShortcutManagerTestUtils
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.mk b/hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.mk
index 4a712f7..321377e 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.mk
@@ -39,6 +39,8 @@
ub-uiautomator \
ShortcutManagerTestUtils
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.mk b/hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.mk
index 9d4739e..76410e8 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.mk
@@ -39,6 +39,8 @@
ub-uiautomator \
ShortcutManagerTestUtils
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_CERTIFICATE := cts/hostsidetests/appsecurity/certs/cts-testkey1
LOCAL_SDK_VERSION := current
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.mk b/hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.mk
index b7187f0..7341d66 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.mk
@@ -37,6 +37,8 @@
ub-uiautomator \
ShortcutManagerTestUtils
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.mk b/hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.mk
index 537c811..35e2152 100644
--- a/hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.mk
@@ -39,6 +39,8 @@
ub-uiautomator \
ShortcutManagerTestUtils
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/shortcuts/deviceside/multiuser/Android.mk b/hostsidetests/shortcuts/deviceside/multiuser/Android.mk
index 619bdfe..dc1d018 100644
--- a/hostsidetests/shortcuts/deviceside/multiuser/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/multiuser/Android.mk
@@ -39,6 +39,8 @@
ub-uiautomator \
ShortcutManagerTestUtils
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/shortcuts/deviceside/upgrade/Android.mk b/hostsidetests/shortcuts/deviceside/upgrade/Android.mk
index ae0bf75..d7e13b6 100644
--- a/hostsidetests/shortcuts/deviceside/upgrade/Android.mk
+++ b/hostsidetests/shortcuts/deviceside/upgrade/Android.mk
@@ -43,6 +43,8 @@
ub-uiautomator \
ShortcutManagerTestUtils
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
@@ -74,6 +76,8 @@
ub-uiautomator \
ShortcutManagerTestUtils
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := current
include $(BUILD_CTS_PACKAGE)
diff --git a/hostsidetests/ui/control/Android.mk b/hostsidetests/ui/control/Android.mk
index 942bb25..3b4f8da 100644
--- a/hostsidetests/ui/control/Android.mk
+++ b/hostsidetests/ui/control/Android.mk
@@ -22,7 +22,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/hostsidetests/usb/SerialTestApp/Android.mk b/hostsidetests/usb/SerialTestApp/Android.mk
index 16a6cdb..bbd55f6 100644
--- a/hostsidetests/usb/SerialTestApp/Android.mk
+++ b/hostsidetests/usb/SerialTestApp/Android.mk
@@ -22,6 +22,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CtsUsbSerialTestApp
diff --git a/hostsidetests/webkit/app/Android.mk b/hostsidetests/webkit/app/Android.mk
index ad17725..fd2ee9a 100644
--- a/hostsidetests/webkit/app/Android.mk
+++ b/hostsidetests/webkit/app/Android.mk
@@ -27,7 +27,7 @@
ctstestserver \
ctstestrunner
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
# When built, explicitly put it in the data partition.
#LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
diff --git a/tests/ProcessTest/Android.mk b/tests/ProcessTest/Android.mk
index 775ec3f..6b15240 100644
--- a/tests/ProcessTest/Android.mk
+++ b/tests/ProcessTest/Android.mk
@@ -26,6 +26,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := junit
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_PACKAGE_NAME := ProcessTests
LOCAL_DEX_PREOPT := false
diff --git a/tests/acceleration/Android.mk b/tests/acceleration/Android.mk
index 3cbe797..cef4379 100644
--- a/tests/acceleration/Android.mk
+++ b/tests/acceleration/Android.mk
@@ -27,7 +27,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
ctstestrunner compatibility-device-util
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/accessibility/Android.mk b/tests/accessibility/Android.mk
index 4cd7e92..cf41720 100644
--- a/tests/accessibility/Android.mk
+++ b/tests/accessibility/Android.mk
@@ -26,6 +26,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
# Tag this module as a cts test artifact
LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
diff --git a/tests/accessibilityservice/Android.mk b/tests/accessibilityservice/Android.mk
index fdbd9dc..79e47ec 100644
--- a/tests/accessibilityservice/Android.mk
+++ b/tests/accessibilityservice/Android.mk
@@ -22,7 +22,7 @@
ctstestrunner \
mockito-target-minus-junit4
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
@@ -35,4 +35,4 @@
include $(BUILD_CTS_PACKAGE)
-include $(call all-makefiles-under,$(LOCAL_PATH))
\ No newline at end of file
+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/tests/admin/Android.mk b/tests/admin/Android.mk
index 73de82d..bd5346d 100644
--- a/tests/admin/Android.mk
+++ b/tests/admin/Android.mk
@@ -23,7 +23,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
ctstestrunner mockito-target-minus-junit4
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/app/Android.mk b/tests/app/Android.mk
index bb30dff..66d5de0 100644
--- a/tests/app/Android.mk
+++ b/tests/app/Android.mk
@@ -21,7 +21,13 @@
# and when built explicitly put it in the data partition
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common voip-common org.apache.http.legacy
+LOCAL_JAVA_LIBRARIES := \
+ android.test.runner \
+ telephony-common \
+ voip-common \
+ org.apache.http.legacy \
+ android.test.base.stubs \
+
LOCAL_STATIC_JAVA_LIBRARIES := \
compatibility-device-util \
diff --git a/tests/backup/Android.mk b/tests/backup/Android.mk
index bb1f8fc..8e9df3b 100644
--- a/tests/backup/Android.mk
+++ b/tests/backup/Android.mk
@@ -21,7 +21,13 @@
# and when built explicitly put it in the data partition
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_JAVA_LIBRARIES := android.test.runner telephony-common voip-common org.apache.http.legacy
+LOCAL_JAVA_LIBRARIES := \
+ android.test.runner \
+ telephony-common \
+ voip-common \
+ org.apache.http.legacy \
+ android.test.base.stubs \
+
LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner ctstestserver mockito-target-minus-junit4
diff --git a/tests/camera/Android.mk b/tests/camera/Android.mk
index c8ba9cd..4160f84 100644
--- a/tests/camera/Android.mk
+++ b/tests/camera/Android.mk
@@ -64,7 +64,7 @@
LOCAL_SDK_VERSION := test_current
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base.stubs
cts_runtime_hint := 120
diff --git a/tests/fragment/Android.mk b/tests/fragment/Android.mk
index 89cfa89..0a54354 100644
--- a/tests/fragment/Android.mk
+++ b/tests/fragment/Android.mk
@@ -34,6 +34,7 @@
android-common \
compatibility-device-util \
ctstestrunner
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
#LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/sample/Android.mk b/tests/sample/Android.mk
index c5bfb63..5602e7e 100755
--- a/tests/sample/Android.mk
+++ b/tests/sample/Android.mk
@@ -29,7 +29,7 @@
compatibility-device-util \
android-support-test
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/sensor/Android.mk b/tests/sensor/Android.mk
index dcf9015..e636af8 100644
--- a/tests/sensor/Android.mk
+++ b/tests/sensor/Android.mk
@@ -27,7 +27,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util
-LOCAL_JAVA_LIBRARIES := platform-test-annotations
+LOCAL_JAVA_LIBRARIES := platform-test-annotations android.test.base.stubs
LOCAL_SDK_VERSION := current
@@ -89,7 +89,7 @@
LOCAL_SDK_VERSION := current
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_NDK_STL_VARIANT := c++_shared
diff --git a/tests/tests/accounts/Android.mk b/tests/tests/accounts/Android.mk
index fee7a74..18ab37f 100644
--- a/tests/tests/accounts/Android.mk
+++ b/tests/tests/accounts/Android.mk
@@ -24,7 +24,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
CtsAccountTestsCommon ctstestrunner
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/alarmclock/Android.mk b/tests/tests/alarmclock/Android.mk
index ddce6a4..5d5c4e4 100644
--- a/tests/tests/alarmclock/Android.mk
+++ b/tests/tests/alarmclock/Android.mk
@@ -23,7 +23,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := CtsAlarmClockCommon ctstestrunner compatibility-device-util
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/assist/Android.mk b/tests/tests/assist/Android.mk
index ea437c2..f9bc56d 100644
--- a/tests/tests/assist/Android.mk
+++ b/tests/tests/assist/Android.mk
@@ -26,7 +26,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := CtsAssistCommon ctstestrunner compatibility-device-util
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/bluetooth/Android.mk b/tests/tests/bluetooth/Android.mk
index d27e7a1..4c0b04d 100644
--- a/tests/tests/bluetooth/Android.mk
+++ b/tests/tests/bluetooth/Android.mk
@@ -26,6 +26,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
LOCAL_JAVA_LIBRARIES += android.test.runner
+LOCAL_JAVA_LIBRARIES += android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/calendarcommon/Android.mk b/tests/tests/calendarcommon/Android.mk
index 29cabbd..bfd9f26 100644
--- a/tests/tests/calendarcommon/Android.mk
+++ b/tests/tests/calendarcommon/Android.mk
@@ -27,6 +27,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_SDK_VERSION := current
diff --git a/tests/tests/car/Android.mk b/tests/tests/car/Android.mk
index 846da34..07cbd83 100644
--- a/tests/tests/car/Android.mk
+++ b/tests/tests/car/Android.mk
@@ -26,7 +26,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner android-support-test
-LOCAL_JAVA_LIBRARIES := android.car
+LOCAL_JAVA_LIBRARIES := android.car android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/contactsproviderwipe/Android.mk b/tests/tests/contactsproviderwipe/Android.mk
index d843256..ad06530 100644
--- a/tests/tests/contactsproviderwipe/Android.mk
+++ b/tests/tests/contactsproviderwipe/Android.mk
@@ -28,7 +28,7 @@
ctstestrunner \
ub-uiautomator
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/database/Android.mk b/tests/tests/database/Android.mk
index f52b458..d8c5987 100644
--- a/tests/tests/database/Android.mk
+++ b/tests/tests/database/Android.mk
@@ -28,7 +28,7 @@
ub-uiautomator \
junit
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/display/Android.mk b/tests/tests/display/Android.mk
index 442eddd..a62d0ee 100644
--- a/tests/tests/display/Android.mk
+++ b/tests/tests/display/Android.mk
@@ -29,6 +29,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
# Tag this module as a cts test artifact
LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
diff --git a/tests/tests/dpi/Android.mk b/tests/tests/dpi/Android.mk
index a6a65ef..46deccb 100644
--- a/tests/tests/dpi/Android.mk
+++ b/tests/tests/dpi/Android.mk
@@ -19,7 +19,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner junit
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/dpi2/Android.mk b/tests/tests/dpi2/Android.mk
index 6ecfce3..f366781 100644
--- a/tests/tests/dpi2/Android.mk
+++ b/tests/tests/dpi2/Android.mk
@@ -20,6 +20,8 @@
# We use the DefaultManifestAttributesTest from the android.cts.dpi package.
LOCAL_STATIC_JAVA_LIBRARIES := android.cts.dpi ctstestrunner junit
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CtsDpiTestCases2
diff --git a/tests/tests/drm/Android.mk b/tests/tests/drm/Android.mk
index 798dd8d..b1f2aac 100644
--- a/tests/tests/drm/Android.mk
+++ b/tests/tests/drm/Android.mk
@@ -26,6 +26,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
# Tag this module as a cts test artifact
diff --git a/tests/tests/externalservice/Android.mk b/tests/tests/externalservice/Android.mk
index 62afaad..c64c0ca 100644
--- a/tests/tests/externalservice/Android.mk
+++ b/tests/tests/externalservice/Android.mk
@@ -27,6 +27,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := CtsExternalServiceCommon compatibility-device-util ctstestrunner
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
# Tag this module as a cts test artifact
diff --git a/tests/tests/graphics/Android.mk b/tests/tests/graphics/Android.mk
index b3710fe..2d05556 100644
--- a/tests/tests/graphics/Android.mk
+++ b/tests/tests/graphics/Android.mk
@@ -20,7 +20,7 @@
LOCAL_MULTILIB := both
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base.stubs
LOCAL_STATIC_JAVA_LIBRARIES += \
android-support-test \
diff --git a/tests/tests/location/Android.mk b/tests/tests/location/Android.mk
index b6cb20d..6e90050 100644
--- a/tests/tests/location/Android.mk
+++ b/tests/tests/location/Android.mk
@@ -26,7 +26,7 @@
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_JAVA_LIBRARIES := telephony-common
+LOCAL_JAVA_LIBRARIES := telephony-common android.test.base.stubs
LOCAL_STATIC_JAVA_LIBRARIES := \
compatibility-device-util ctstestrunner apache-commons-math
@@ -52,7 +52,7 @@
# Tag this module as a cts test artifact
LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
-LOCAL_JAVA_LIBRARIES := telephony-common
+LOCAL_JAVA_LIBRARIES := telephony-common android.test.base.stubs
LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner apache-commons-math
diff --git a/tests/tests/mediastress/Android.mk b/tests/tests/mediastress/Android.mk
index 9316e85..633708f 100644
--- a/tests/tests/mediastress/Android.mk
+++ b/tests/tests/mediastress/Android.mk
@@ -28,7 +28,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_HOST_SHARED_LIBRARIES := compatibility-device-media-preconditions
diff --git a/tests/tests/midi/Android.mk b/tests/tests/midi/Android.mk
index cefe3cc..212c8ac 100755
--- a/tests/tests/midi/Android.mk
+++ b/tests/tests/midi/Android.mk
@@ -27,6 +27,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
# Must match the package name in CtsTestCaseList.mk
diff --git a/tests/tests/multiuser/Android.mk b/tests/tests/multiuser/Android.mk
index 992b5fe..7c9ca7e 100644
--- a/tests/tests/multiuser/Android.mk
+++ b/tests/tests/multiuser/Android.mk
@@ -29,6 +29,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := test_current
include $(BUILD_CTS_PACKAGE)
diff --git a/tests/tests/nativehardware/Android.mk b/tests/tests/nativehardware/Android.mk
index 38688be..21f2d9a 100644
--- a/tests/tests/nativehardware/Android.mk
+++ b/tests/tests/nativehardware/Android.mk
@@ -27,7 +27,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util
-LOCAL_JAVA_LIBRARIES := platform-test-annotations
+LOCAL_JAVA_LIBRARIES := platform-test-annotations android.test.base.stubs
LOCAL_SDK_VERSION := current
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk b/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk
index 2fc843e..55fa4d1 100644
--- a/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk
@@ -24,7 +24,7 @@
ctstestrunner \
ctstestserver
-LOCAL_JAVA_LIBRARIES := org.apache.http.legacy
+LOCAL_JAVA_LIBRARIES := org.apache.http.legacy android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src common)
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk b/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk
index ef9e1a7..033d7ea 100644
--- a/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk
@@ -24,7 +24,7 @@
ctstestrunner \
ctstestserver
-LOCAL_JAVA_LIBRARIES := org.apache.http.legacy
+LOCAL_JAVA_LIBRARIES := org.apache.http.legacy android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src common)
diff --git a/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk b/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk
index 0b0a126..c10a19a 100644
--- a/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk
+++ b/tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk
@@ -24,7 +24,7 @@
ctstestrunner \
ctstestserver
-LOCAL_JAVA_LIBRARIES := org.apache.http.legacy
+LOCAL_JAVA_LIBRARIES := org.apache.http.legacy android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src common)
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.mk b/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.mk
index ce4c74d..4a40d2a 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.mk
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.mk
@@ -24,7 +24,7 @@
ctstestrunner \
android-support-test
-LOCAL_JAVA_LIBRARIES := org.apache.http.legacy
+LOCAL_JAVA_LIBRARIES := org.apache.http.legacy android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_SRC_FILES += $(call all-java-files-under, ../src)
diff --git a/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.mk b/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.mk
index b0be2ae..48bbfaf 100644
--- a/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.mk
+++ b/tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.mk
@@ -24,7 +24,11 @@
ctstestrunner \
android-support-test
-LOCAL_JAVA_LIBRARIES := org.apache.http.legacy android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := \
+ org.apache.http.legacy \
+ android.test.runner.stubs \
+ android.test.base.stubs \
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_SRC_FILES += $(call all-java-files-under, ../src)
diff --git a/tests/tests/opengl/Android.mk b/tests/tests/opengl/Android.mk
index 3b89443..f9a36eb 100644
--- a/tests/tests/opengl/Android.mk
+++ b/tests/tests/opengl/Android.mk
@@ -31,7 +31,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/openglperf/Android.mk b/tests/tests/openglperf/Android.mk
index a3ab906..78a25fc 100644
--- a/tests/tests/openglperf/Android.mk
+++ b/tests/tests/openglperf/Android.mk
@@ -26,7 +26,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_JNI_SHARED_LIBRARIES := libctsopenglperf_jni libnativehelper_compat_libc++
diff --git a/tests/tests/packageinstaller/adminpackageinstaller/Android.mk b/tests/tests/packageinstaller/adminpackageinstaller/Android.mk
index db2e563..fd0c1da 100755
--- a/tests/tests/packageinstaller/adminpackageinstaller/Android.mk
+++ b/tests/tests/packageinstaller/adminpackageinstaller/Android.mk
@@ -31,6 +31,8 @@
android-support-test \
android-support-v4
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SDK_VERSION := test_current
# Tag this module as a cts test artifact
diff --git a/tests/tests/permission2/Android.mk b/tests/tests/permission2/Android.mk
index 5726255..d1190a3 100755
--- a/tests/tests/permission2/Android.mk
+++ b/tests/tests/permission2/Android.mk
@@ -24,7 +24,7 @@
# Tag this module as a cts test artifact
LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
-LOCAL_JAVA_LIBRARIES := telephony-common
+LOCAL_JAVA_LIBRARIES := telephony-common android.test.base.stubs
LOCAL_STATIC_JAVA_LIBRARIES := \
compatibility-device-util \
diff --git a/tests/tests/preference/Android.mk b/tests/tests/preference/Android.mk
index 0d58f6d..dd0ebf7 100644
--- a/tests/tests/preference/Android.mk
+++ b/tests/tests/preference/Android.mk
@@ -25,7 +25,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/preference2/Android.mk b/tests/tests/preference2/Android.mk
index 5ba5212..8f1c3a2 100644
--- a/tests/tests/preference2/Android.mk
+++ b/tests/tests/preference2/Android.mk
@@ -31,7 +31,7 @@
mockito-target-minus-junit4 \
ub-uiautomator
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/renderscript/Android.mk b/tests/tests/renderscript/Android.mk
index aa990d6..5da2036 100644
--- a/tests/tests/renderscript/Android.mk
+++ b/tests/tests/renderscript/Android.mk
@@ -31,6 +31,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
ctstestrunner \
xmp_toolkit
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
LOCAL_JNI_SHARED_LIBRARIES := libcoremathtestcpp_jni
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
diff --git a/tests/tests/rsblas/Android.mk b/tests/tests/rsblas/Android.mk
index 8808752..637f08e 100644
--- a/tests/tests/rsblas/Android.mk
+++ b/tests/tests/rsblas/Android.mk
@@ -28,6 +28,7 @@
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
LOCAL_JNI_SHARED_LIBRARIES := libbnnmdata_jni
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
diff --git a/tests/tests/rscpp/Android.mk b/tests/tests/rscpp/Android.mk
index 22dc6fd..f5c20ca 100644
--- a/tests/tests/rscpp/Android.mk
+++ b/tests/tests/rscpp/Android.mk
@@ -29,6 +29,7 @@
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
LOCAL_JNI_SHARED_LIBRARIES := librscpptest_jni
LOCAL_SRC_FILES := $(call all-java-files-under, src) $(call all-renderscript-files-under, src)
diff --git a/tests/tests/sax/Android.mk b/tests/tests/sax/Android.mk
index b83cc35..d854016 100644
--- a/tests/tests/sax/Android.mk
+++ b/tests/tests/sax/Android.mk
@@ -23,6 +23,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CtsSaxTestCases
diff --git a/tests/tests/selinux/selinuxTargetSdk/Android.mk b/tests/tests/selinux/selinuxTargetSdk/Android.mk
index 052514a..13f1ac9 100755
--- a/tests/tests/selinux/selinuxTargetSdk/Android.mk
+++ b/tests/tests/selinux/selinuxTargetSdk/Android.mk
@@ -21,6 +21,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
compatibility-device-util \
ctstestrunner
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CtsSelinuxTargetSdkTestCases
LOCAL_SDK_VERSION := current
diff --git a/tests/tests/selinux/selinuxTargetSdk2/Android.mk b/tests/tests/selinux/selinuxTargetSdk2/Android.mk
index 25d0acf..45d570e 100755
--- a/tests/tests/selinux/selinuxTargetSdk2/Android.mk
+++ b/tests/tests/selinux/selinuxTargetSdk2/Android.mk
@@ -21,6 +21,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
compatibility-device-util \
ctstestrunner
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CtsSelinuxTargetSdk2TestCases
LOCAL_SDK_VERSION := current
diff --git a/tests/tests/shortcutmanager/Android.mk b/tests/tests/shortcutmanager/Android.mk
index 29333aa..d9328b2 100755
--- a/tests/tests/shortcutmanager/Android.mk
+++ b/tests/tests/shortcutmanager/Android.mk
@@ -29,7 +29,7 @@
ub-uiautomator \
ShortcutManagerTestUtils
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src) \
$(call all-java-files-under, common/src)
diff --git a/tests/tests/simpleperf/CtsSimpleperfDebugApp/Android.mk b/tests/tests/simpleperf/CtsSimpleperfDebugApp/Android.mk
index 5c224f5..4f097a4 100644
--- a/tests/tests/simpleperf/CtsSimpleperfDebugApp/Android.mk
+++ b/tests/tests/simpleperf/CtsSimpleperfDebugApp/Android.mk
@@ -22,6 +22,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SRC_FILES := $(call all-java-files-under, .)
LOCAL_MANIFEST_FILE := AndroidManifest.xml
diff --git a/tests/tests/telecom/Android.mk b/tests/tests/telecom/Android.mk
index 9a43d63..8f46fd7 100644
--- a/tests/tests/telecom/Android.mk
+++ b/tests/tests/telecom/Android.mk
@@ -29,6 +29,8 @@
ctstestrunner \
android-support-test
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_SDK_VERSION := test_current
diff --git a/tests/tests/telecom2/Android.mk b/tests/tests/telecom2/Android.mk
index f93f2b0..5b22a92 100644
--- a/tests/tests/telecom2/Android.mk
+++ b/tests/tests/telecom2/Android.mk
@@ -28,6 +28,8 @@
compatibility-device-util \
ctstestrunner
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
src_dirs := src \
../telecom/src/android/telecom/cts/SelfManagedConnection.java \
../telecom/src/android/telecom/cts/CtsSelfManagedConnectionService.java \
diff --git a/tests/tests/telecom3/Android.mk b/tests/tests/telecom3/Android.mk
index 86cb859..3138e6c 100644
--- a/tests/tests/telecom3/Android.mk
+++ b/tests/tests/telecom3/Android.mk
@@ -26,6 +26,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
src_dirs := src \
../telecom/src/android/telecom/cts/SelfManagedConnection.java \
../telecom/src/android/telecom/cts/CtsSelfManagedConnectionService.java \
diff --git a/tests/tests/telephony/preconditions/app/Android.mk b/tests/tests/telephony/preconditions/app/Android.mk
index a5fa396..fb64cd2 100644
--- a/tests/tests/telephony/preconditions/app/Android.mk
+++ b/tests/tests/telephony/preconditions/app/Android.mk
@@ -31,6 +31,8 @@
compatibility-device-util \
compatibility-device-preconditions
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
# tag this module as a cts test artifact
LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
diff --git a/tests/tests/text/Android.mk b/tests/tests/text/Android.mk
index 15a7bcc..7800ee9 100644
--- a/tests/tests/text/Android.mk
+++ b/tests/tests/text/Android.mk
@@ -21,7 +21,7 @@
# and when built explicitly put it in the data partition
LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS)
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base.stubs
LOCAL_STATIC_JAVA_LIBRARIES += \
compatibility-device-util \
diff --git a/tests/tests/theme/Android.mk b/tests/tests/theme/Android.mk
index 155f3e3..ff8536b 100644
--- a/tests/tests/theme/Android.mk
+++ b/tests/tests/theme/Android.mk
@@ -26,7 +26,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/tv/Android.mk b/tests/tests/tv/Android.mk
index 30429d3..24cf139 100644
--- a/tests/tests/tv/Android.mk
+++ b/tests/tests/tv/Android.mk
@@ -27,7 +27,7 @@
LOCAL_PACKAGE_NAME := CtsTvTestCases
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_JAVA_LIBRARIES := android.test.runner android.test.base.stubs
LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
diff --git a/tests/tests/uiautomation/Android.mk b/tests/tests/uiautomation/Android.mk
index a886e5c..347c55f 100644
--- a/tests/tests/uiautomation/Android.mk
+++ b/tests/tests/uiautomation/Android.mk
@@ -25,6 +25,8 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ub-uiautomator
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := CtsUiAutomationTestCases
diff --git a/tests/tests/uidisolation/Android.mk b/tests/tests/uidisolation/Android.mk
index 2fa27ad..a820c95 100644
--- a/tests/tests/uidisolation/Android.mk
+++ b/tests/tests/uidisolation/Android.mk
@@ -26,7 +26,11 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner ctstestserver
-LOCAL_JAVA_LIBRARIES := org.apache.http.legacy android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := \
+ org.apache.http.legacy \
+ android.test.runner.stubs \
+ android.test.base.stubs \
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/voiceinteraction/Android.mk b/tests/tests/voiceinteraction/Android.mk
index 8641e76..e0708ff 100644
--- a/tests/tests/voiceinteraction/Android.mk
+++ b/tests/tests/voiceinteraction/Android.mk
@@ -23,7 +23,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := CtsVoiceInteractionCommon ctstestrunner compatibility-device-util
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/voicesettings/Android.mk b/tests/tests/voicesettings/Android.mk
index 630789c..9409073 100644
--- a/tests/tests/voicesettings/Android.mk
+++ b/tests/tests/voicesettings/Android.mk
@@ -23,7 +23,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner compatibility-device-util
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/tests/wrap/nowrap/Android.mk b/tests/tests/wrap/nowrap/Android.mk
index 7309ee6..8fd1015 100644
--- a/tests/tests/wrap/nowrap/Android.mk
+++ b/tests/tests/wrap/nowrap/Android.mk
@@ -24,7 +24,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
compatibility-device-util \
android-support-test
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
LOCAL_SDK_VERSION := current
diff --git a/tests/tests/wrap/wrap_debug/Android.mk b/tests/tests/wrap/wrap_debug/Android.mk
index 82dc819..c67e191 100644
--- a/tests/tests/wrap/wrap_debug/Android.mk
+++ b/tests/tests/wrap/wrap_debug/Android.mk
@@ -24,7 +24,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
compatibility-device-util \
android-support-test
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
LOCAL_SDK_VERSION := current
diff --git a/tests/tests/wrap/wrap_debug_malloc_debug/Android.mk b/tests/tests/wrap/wrap_debug_malloc_debug/Android.mk
index 5d73645..b768dcf 100644
--- a/tests/tests/wrap/wrap_debug_malloc_debug/Android.mk
+++ b/tests/tests/wrap/wrap_debug_malloc_debug/Android.mk
@@ -24,7 +24,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
compatibility-device-util \
android-support-test
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
LOCAL_SDK_VERSION := current
diff --git a/tests/tests/wrap/wrap_nodebug/Android.mk b/tests/tests/wrap/wrap_nodebug/Android.mk
index 8f04630..3317f3c 100644
--- a/tests/tests/wrap/wrap_nodebug/Android.mk
+++ b/tests/tests/wrap/wrap_nodebug/Android.mk
@@ -24,7 +24,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := \
compatibility-device-util \
android-support-test
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, ../src)
LOCAL_COMPATIBILITY_SUITE := cts vts general-tests
LOCAL_SDK_VERSION := current
diff --git a/tests/tvprovider/Android.mk b/tests/tvprovider/Android.mk
index bec3293..5595519 100644
--- a/tests/tvprovider/Android.mk
+++ b/tests/tvprovider/Android.mk
@@ -20,7 +20,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/ui/Android.mk b/tests/ui/Android.mk
index b2a169e..abdc148 100644
--- a/tests/ui/Android.mk
+++ b/tests/ui/Android.mk
@@ -22,7 +22,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tests/video/Android.mk b/tests/video/Android.mk
index 2471605..b077e63 100644
--- a/tests/video/Android.mk
+++ b/tests/video/Android.mk
@@ -25,7 +25,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctsmediautil compatibility-device-util ctstestrunner
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_JNI_SHARED_LIBRARIES := libctsmediacodec_jni libnativehelper_compat_libc++
diff --git a/tests/vr/Android.mk b/tests/vr/Android.mk
index 11f984f..56a7310 100644
--- a/tests/vr/Android.mk
+++ b/tests/vr/Android.mk
@@ -29,7 +29,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := ctstestrunner
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_JNI_SHARED_LIBRARIES := libctsvrextensions_jni libnativehelper_compat_libc++
diff --git a/tools/cts-device-info/Android.mk b/tools/cts-device-info/Android.mk
index 2f11db9..328b0a3 100644
--- a/tools/cts-device-info/Android.mk
+++ b/tools/cts-device-info/Android.mk
@@ -18,6 +18,8 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
+LOCAL_JAVA_LIBRARIES := android.test.base
+
LOCAL_JNI_SHARED_LIBRARIES := libctsdeviceinfo
LOCAL_MULTILIB := both
diff --git a/tools/cts-holo-generation/Android.mk b/tools/cts-holo-generation/Android.mk
index 661284c..195f5a5 100644
--- a/tools/cts-holo-generation/Android.mk
+++ b/tools/cts-holo-generation/Android.mk
@@ -25,7 +25,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/tools/cts-preconditions/Android.mk b/tools/cts-preconditions/Android.mk
index e266481..5f00c36 100644
--- a/tools/cts-preconditions/Android.mk
+++ b/tools/cts-preconditions/Android.mk
@@ -29,6 +29,8 @@
android-support-test \
compatibility-device-preconditions
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
+
LOCAL_SRC_FILES := $(call all-java-files-under, src)
# Tag this module as a cts test artifact
diff --git a/tools/cts-reference-app-lib/Android.mk b/tools/cts-reference-app-lib/Android.mk
index 6beef3a..f006bb0 100644
--- a/tools/cts-reference-app-lib/Android.mk
+++ b/tools/cts-reference-app-lib/Android.mk
@@ -26,7 +26,7 @@
LOCAL_STATIC_JAVA_LIBRARIES := junit
-LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs android.test.base.stubs
LOCAL_SDK_VERSION := current