From 6a001974c4e17536e1b12d72a189563410c848eb Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Wed, 2 Aug 2017 17:19:24 -0700 Subject: [PATCH 01/64] Add tests to check connectivity during temp-powersave-whitelist changes. Bug: 30568426 Test: bit CtsHostsideNetworkTests:com.android.cts.net.HostsideRestrictBackgroundNetworkTests Change-Id: Ic0ffd29c5e0d5f11bec229ecdf5fd8c55fef1478 --- .../net/hostside/AbstractAppIdleTestCase.java | 13 +++++ ...ractRestrictBackgroundNetworkTestCase.java | 8 +++ .../cts/net/hostside/MixedModesTest.java | 52 +++++++++++++++++++ ...ostsideRestrictBackgroundNetworkTests.java | 20 +++++++ 4 files changed, 93 insertions(+) diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractAppIdleTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractAppIdleTestCase.java index d2c08739b4..133a43bce9 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractAppIdleTestCase.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractAppIdleTestCase.java @@ -127,6 +127,19 @@ abstract class AbstractAppIdleTestCase extends AbstractRestrictBackgroundNetwork assertBackgroundNetworkAccess(false); } + public void testBackgroundNetworkAccess_tempWhitelisted() throws Exception { + if (!isSupported()) return; + + setAppIdle(true); + assertBackgroundNetworkAccess(false); + + addTempPowerSaveModeWhitelist(TEST_APP2_PKG, TEMP_POWERSAVE_WHITELIST_DURATION_MS); + assertBackgroundNetworkAccess(true); + // Wait until the whitelist duration is expired. + SystemClock.sleep(TEMP_POWERSAVE_WHITELIST_DURATION_MS); + assertBackgroundNetworkAccess(false); + } + public void testBackgroundNetworkAccess_disabled() throws Exception { if (!isSupported()) return; diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java index 12b338f8e5..525fc177b2 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java @@ -106,6 +106,8 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation private static final String APP_NOT_FOREGROUND_ERROR = "app_not_fg"; + protected static final long TEMP_POWERSAVE_WHITELIST_DURATION_MS = 5_000; // 5 sec + protected Context mContext; protected Instrumentation mInstrumentation; protected ConnectivityManager mCm; @@ -683,6 +685,12 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation + ". Full list: " + uids); } + protected void addTempPowerSaveModeWhitelist(String packageName, long duration) + throws Exception { + Log.i(TAG, "Adding pkg " + packageName + " to temp-power-save-mode whitelist"); + executeShellCommand("dumpsys deviceidle tempwhitelist -d " + duration + " " + packageName); + } + protected void assertPowerSaveModeWhitelist(String packageName, boolean expected) throws Exception { // TODO: currently the power-save mode is behaving like idle, but once it changes, we'll diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/MixedModesTest.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/MixedModesTest.java index 5248255482..76332bedb5 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/MixedModesTest.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/MixedModesTest.java @@ -15,6 +15,7 @@ */ package com.android.cts.net.hostside; +import android.os.SystemClock; import android.util.Log; /** @@ -271,4 +272,55 @@ public class MixedModesTest extends AbstractRestrictBackgroundNetworkTestCase { setDozeMode(false); } } + + public void testAppIdleAndDoze_tempPowerSaveWhitelists() throws Exception { + if (!isSupported()) { + return; + } + if (!isDozeModeEnabled()) { + Log.i(TAG, "Skipping " + getClass() + "." + getName() + + "() because device does not support Doze Mode"); + return; + } + + setDozeMode(true); + setAppIdle(true); + + try { + assertBackgroundNetworkAccess(false); + + addTempPowerSaveModeWhitelist(TEST_APP2_PKG, TEMP_POWERSAVE_WHITELIST_DURATION_MS); + assertBackgroundNetworkAccess(true); + + // Wait until the whitelist duration is expired. + SystemClock.sleep(TEMP_POWERSAVE_WHITELIST_DURATION_MS); + assertBackgroundNetworkAccess(false); + } finally { + setAppIdle(false); + setDozeMode(false); + } + } + + public void testAppIdleAndBatterySaver_tempPowerSaveWhitelists() throws Exception { + if (!isSupported()) { + return; + } + + setBatterySaverMode(true); + setAppIdle(true); + + try { + assertBackgroundNetworkAccess(false); + + addTempPowerSaveModeWhitelist(TEST_APP2_PKG, TEMP_POWERSAVE_WHITELIST_DURATION_MS); + assertBackgroundNetworkAccess(true); + + // Wait until the whitelist duration is expired. + SystemClock.sleep(TEMP_POWERSAVE_WHITELIST_DURATION_MS); + assertBackgroundNetworkAccess(false); + } finally { + setAppIdle(false); + setBatterySaverMode(false); + } + } } diff --git a/tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java b/tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java index bf3fc0832e..fe9d36ce1d 100644 --- a/tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java +++ b/tests/cts/hostside/src/com/android/cts/net/HostsideRestrictBackgroundNetworkTests.java @@ -146,6 +146,11 @@ public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestC "testBackgroundNetworkAccess_whitelisted"); } + public void testAppIdleMetered_tempWhitelisted() throws Exception { + runDeviceTests(TEST_PKG, TEST_PKG + ".AppIdleMeteredTest", + "testBackgroundNetworkAccess_tempWhitelisted"); + } + public void testAppIdleMetered_enabled() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".AppIdleMeteredTest", "testBackgroundNetworkAccess_enabled"); @@ -166,6 +171,11 @@ public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestC "testBackgroundNetworkAccess_whitelisted"); } + public void testAppIdleNonMetered_tempWhitelisted() throws Exception { + runDeviceTests(TEST_PKG, TEST_PKG + ".AppIdleNonMeteredTest", + "testBackgroundNetworkAccess_tempWhitelisted"); + } + public void testAppIdleNonMetered_enabled() throws Exception { runDeviceTests(TEST_PKG, TEST_PKG + ".AppIdleNonMeteredTest", "testBackgroundNetworkAccess_enabled"); @@ -261,6 +271,16 @@ public class HostsideRestrictBackgroundNetworkTests extends HostsideNetworkTestC "testDozeAndAppIdle_powerSaveWhitelists"); } + public void testAppIdleAndDoze_tempPowerSaveWhitelists() throws Exception { + runDeviceTests(TEST_PKG, TEST_PKG + ".MixedModesTest", + "testAppIdleAndDoze_tempPowerSaveWhitelists"); + } + + public void testAppIdleAndBatterySaver_tempPowerSaveWhitelists() throws Exception { + runDeviceTests(TEST_PKG, TEST_PKG + ".MixedModesTest", + "testAppIdleAndBatterySaver_tempPowerSaveWhitelists"); + } + /******************* * Helper methods. * *******************/ From d752d833ca275e97829a2c99c22093d1d5061a15 Mon Sep 17 00:00:00 2001 From: Tobias Thierer Date: Tue, 25 Jul 2017 16:55:17 +0100 Subject: [PATCH 02/64] Add ConnectivityManagerTest for Network.openConnection() Associated CLs are refactoring code that this API relies on, and it's not currently covered by any tests. This CL adds such a test to ConnectivityManagerTest. Test: Ensured that the following passes, and that it also passes when the early-exit (no WiFi/cellular connection) is removed: make cts && cts-tradefed run cts -m CtsNetTestCases \ -t android.net.cts.ConnectivityManagerTest Bug: 64021405 Change-Id: I84806533368fa592b9b8f4c78900542413af6aac --- .../net/cts/ConnectivityManagerTest.java | 118 +++++++++++++++++- 1 file changed, 113 insertions(+), 5 deletions(-) diff --git a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java index cd6dbb2441..1396a1cde1 100644 --- a/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java +++ b/tests/cts/net/src/android/net/cts/ConnectivityManagerTest.java @@ -16,8 +16,11 @@ package android.net.cts; +import static android.content.pm.PackageManager.FEATURE_TELEPHONY; +import static android.content.pm.PackageManager.FEATURE_WIFI; import static android.net.NetworkCapabilities.NET_CAPABILITY_IMS; import static android.net.NetworkCapabilities.NET_CAPABILITY_INTERNET; +import static android.net.NetworkCapabilities.TRANSPORT_CELLULAR; import static android.net.NetworkCapabilities.TRANSPORT_WIFI; import android.app.PendingIntent; @@ -29,6 +32,7 @@ import android.content.IntentFilter; import android.content.pm.PackageManager; import android.net.ConnectivityManager; import android.net.ConnectivityManager.NetworkCallback; +import android.net.LinkProperties; import android.net.Network; import android.net.NetworkCapabilities; import android.net.NetworkConfig; @@ -49,14 +53,23 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.InputStream; import java.io.IOException; +import java.io.InputStreamReader; import java.io.OutputStream; +import java.net.HttpURLConnection; +import java.net.Inet6Address; +import java.net.InetAddress; import java.net.Socket; import java.net.InetSocketAddress; +import java.net.URL; +import java.net.UnknownHostException; +import java.nio.charset.StandardCharsets; +import java.util.Collection; import java.util.HashMap; import java.util.Scanner; import java.util.concurrent.CountDownLatch; import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.TimeUnit; +import libcore.io.Streams; public class ConnectivityManagerTest extends AndroidTestCase { @@ -106,6 +119,8 @@ public class ConnectivityManagerTest extends AndroidTestCase { private final HashMap mNetworks = new HashMap(); boolean mWifiConnectAttempted; + private TestNetworkCallback mCellNetworkCallback; + @Override protected void setUp() throws Exception { @@ -138,6 +153,10 @@ public class ConnectivityManagerTest extends AndroidTestCase { if (mWifiConnectAttempted) { disconnectFromWifi(null); } + if (cellConnectAttempted()) { + disconnectFromCell(); + } + super.tearDown(); } /** @@ -244,6 +263,95 @@ public class ConnectivityManagerTest extends AndroidTestCase { } } + /** + * Tests that connections can be opened on WiFi and cellphone networks, + * and that they are made from different IP addresses. + */ + public void testOpenConnection() throws Exception { + boolean canRunTest = mPackageManager.hasSystemFeature(FEATURE_WIFI) + && mPackageManager.hasSystemFeature(FEATURE_TELEPHONY); + if (!canRunTest) { + Log.i(TAG,"testOpenConnection cannot execute unless device supports both WiFi " + + "and a cellular connection"); + return; + } + + Network wifiNetwork = connectToWifi(); + Network cellNetwork = connectToCell(); + // This server returns the requestor's IP address as the response body. + URL url = new URL("http://google-ipv6test.appspot.com/ip.js?fmt=text"); + String wifiAddressString = httpGet(wifiNetwork, url); + String cellAddressString = httpGet(cellNetwork, url); + + assertFalse(String.format("Same address '%s' on two different networks (%s, %s)", + wifiAddressString, wifiNetwork, cellNetwork), + wifiAddressString.equals(cellAddressString)); + + // Sanity check that the IP addresses that the requests appeared to come from + // are actually on the respective networks. + assertOnNetwork(wifiAddressString, wifiNetwork); + assertOnNetwork(cellAddressString, cellNetwork); + + assertFalse("Unexpectedly equal: " + wifiNetwork, wifiNetwork.equals(cellNetwork)); + } + + private Network connectToCell() throws InterruptedException { + if (cellConnectAttempted()) { + throw new IllegalStateException("Already connected"); + } + NetworkRequest cellRequest = new NetworkRequest.Builder() + .addTransportType(TRANSPORT_CELLULAR) + .addCapability(NET_CAPABILITY_INTERNET) + .build(); + mCellNetworkCallback = new TestNetworkCallback(); + mCm.requestNetwork(cellRequest, mCellNetworkCallback); + final Network cellNetwork = mCellNetworkCallback.waitForAvailable(); + assertNotNull("Cell network not available within timeout", cellNetwork); + return cellNetwork; + } + + private boolean cellConnectAttempted() { + return mCellNetworkCallback != null; + } + + private void disconnectFromCell() { + if (!cellConnectAttempted()) { + throw new IllegalStateException("Cell connection not attempted"); + } + mCm.unregisterNetworkCallback(mCellNetworkCallback); + mCellNetworkCallback = null; + } + + /** + * Performs a HTTP GET to the specified URL on the specified Network, and returns + * the response body decoded as UTF-8. + */ + private static String httpGet(Network network, URL httpUrl) throws IOException { + HttpURLConnection connection = (HttpURLConnection) network.openConnection(httpUrl); + try { + InputStream inputStream = connection.getInputStream(); + return Streams.readFully(new InputStreamReader(inputStream, StandardCharsets.UTF_8)); + } finally { + connection.disconnect(); + } + } + + private void assertOnNetwork(String adressString, Network network) throws UnknownHostException { + InetAddress address = InetAddress.getByName(adressString); + LinkProperties linkProperties = mCm.getLinkProperties(network); + // To make sure that the request went out on the right network, check that + // the IP address seen by the server is assigned to the expected network. + // We can only do this for IPv6 addresses, because in IPv4 we will likely + // have a private IPv4 address, and that won't match what the server sees. + if (address instanceof Inet6Address) { + assertContains(linkProperties.getAddresses(), address); + } + } + + private static void assertContains(Collection collection, T element) { + assertTrue(element + " not found in " + collection, collection.contains(element)); + } + private void assertStartUsingNetworkFeatureUnsupported(int networkType, String feature) { try { mCm.startUsingNetworkFeature(networkType, feature); @@ -323,7 +431,7 @@ public class ConnectivityManagerTest extends AndroidTestCase { * that it would increase test coverage by much (how many devices have 3G radio but not Wifi?). */ public void testRegisterNetworkCallback() { - if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI)) { + if (!mPackageManager.hasSystemFeature(FEATURE_WIFI)) { Log.i(TAG, "testRegisterNetworkCallback cannot execute unless device supports WiFi"); return; } @@ -363,7 +471,7 @@ public class ConnectivityManagerTest extends AndroidTestCase { * of a {@code NetworkCallback}. */ public void testRegisterNetworkCallback_withPendingIntent() { - if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI)) { + if (!mPackageManager.hasSystemFeature(FEATURE_WIFI)) { Log.i(TAG, "testRegisterNetworkCallback cannot execute unless device supports WiFi"); return; } @@ -457,7 +565,7 @@ public class ConnectivityManagerTest extends AndroidTestCase { * Tests reporting of connectivity changed. */ public void testConnectivityChanged_manifestRequestOnly_shouldNotReceiveIntent() { - if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI)) { + if (!mPackageManager.hasSystemFeature(FEATURE_WIFI)) { Log.i(TAG, "testConnectivityChanged_manifestRequestOnly_shouldNotReceiveIntent cannot execute unless device supports WiFi"); return; } @@ -474,7 +582,7 @@ public class ConnectivityManagerTest extends AndroidTestCase { } public void testConnectivityChanged_whenRegistered_shouldReceiveIntent() { - if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI)) { + if (!mPackageManager.hasSystemFeature(FEATURE_WIFI)) { Log.i(TAG, "testConnectivityChanged_whenRegistered_shouldReceiveIntent cannot execute unless device supports WiFi"); return; } @@ -494,7 +602,7 @@ public class ConnectivityManagerTest extends AndroidTestCase { public void testConnectivityChanged_manifestRequestOnlyPreN_shouldReceiveIntent() throws InterruptedException { - if (!mPackageManager.hasSystemFeature(PackageManager.FEATURE_WIFI)) { + if (!mPackageManager.hasSystemFeature(FEATURE_WIFI)) { Log.i(TAG, "testConnectivityChanged_manifestRequestOnlyPreN_shouldReceiveIntent cannot execute unless device supports WiFi"); return; } From 2a880aee404d4b1be8cfc3789d8f9ce9d4ba0939 Mon Sep 17 00:00:00 2001 From: Chad Brubaker Date: Tue, 24 Oct 2017 09:06:38 -0700 Subject: [PATCH 03/64] Add CTS tests for cleartext traffic default change Cleartext traffic permitted now defaults to False for apps targetting P, this test splits the previous cleartext test into pre-P and P+ targetSDK versions. Tests which depended on cleartext traffic have been opted in to cleartext traffic. Test: This is the test Bug: 63931636 Change-Id: I5c4aa39e4055380a54bfe09f668894240be713f8 --- tests/cts/net/AndroidManifest.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cts/net/AndroidManifest.xml b/tests/cts/net/AndroidManifest.xml index dd310a1cac..37bf323486 100644 --- a/tests/cts/net/AndroidManifest.xml +++ b/tests/cts/net/AndroidManifest.xml @@ -30,7 +30,7 @@ - + From 719216aca92a2c3b7931d4579daeb8c20e252ef6 Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Mon, 30 Oct 2017 15:26:21 -0700 Subject: [PATCH 04/64] Fix CtsHostsideNetworkTests. Newly installed packages are now idle by default. Fixes: 67585516 Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \ com.android.cts.net.HostsideRestrictBackgroundNetworkTests Change-Id: Ief06cec1c21bfdd85d1db6673479df2431affe61 --- .../net/hostside/AbstractRestrictBackgroundNetworkTestCase.java | 1 + 1 file changed, 1 insertion(+) diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java index 822485eae0..677e886a7a 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java @@ -139,6 +139,7 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation enableLocation(); } mSupported = setUpActiveNetworkMeteringState(); + setAppIdle(false); Log.i(TAG, "Apps status on " + getName() + ":\n" + "\ttest app: uid=" + mMyUid + ", state=" + getProcessStateByUid(mMyUid) + "\n" From 9198dd3580620a594f0b3a8ba1fc1a39bcc3b282 Mon Sep 17 00:00:00 2001 From: Sudheer Shanka Date: Tue, 28 Nov 2017 17:09:24 -0800 Subject: [PATCH 05/64] Add a workaround to fix CtsHostsideNetworkTests. Fixes: 68765448 Test: cts-tradefed run singleCommand cts-dev -m CtsHostsideNetworkTests -t \ com.android.cts.net.HostsideRestrictBackgroundNetworkTests Change-Id: Iea93416916cf2f700f48e69f269a8851c492efd7 --- .../net/hostside/AbstractRestrictBackgroundNetworkTestCase.java | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java index 677e886a7a..dff59f73b4 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java @@ -139,6 +139,8 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation enableLocation(); } mSupported = setUpActiveNetworkMeteringState(); + // TODO: Remove this once b/69867516 is fixed. + executeShellCommand("am set-standby-bucket " + TEST_APP2_PKG + " 12"); setAppIdle(false); Log.i(TAG, "Apps status on " + getName() + ":\n" From 1241e9aaf275ae4f2a1877804c576ce1033e73eb Mon Sep 17 00:00:00 2001 From: Amith Yamasani Date: Wed, 29 Nov 2017 11:55:59 -0800 Subject: [PATCH 06/64] Test app standby APIs Also revert a workaround for incorrect state in AppIdleHistory. Bug: 69867516 Bug: 63527785 Test: cts-tradefed run cts-dev -m CtsAppUsageHostTestCases Change-Id: If3edb88f12d949ab78788e5ea27f0aee76cc4235 --- .../net/hostside/AbstractRestrictBackgroundNetworkTestCase.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java index dff59f73b4..677e886a7a 100644 --- a/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java +++ b/tests/cts/hostside/app/src/com/android/cts/net/hostside/AbstractRestrictBackgroundNetworkTestCase.java @@ -139,8 +139,6 @@ abstract class AbstractRestrictBackgroundNetworkTestCase extends Instrumentation enableLocation(); } mSupported = setUpActiveNetworkMeteringState(); - // TODO: Remove this once b/69867516 is fixed. - executeShellCommand("am set-standby-bucket " + TEST_APP2_PKG + " 12"); setAppIdle(false); Log.i(TAG, "Apps status on " + getName() + ":\n" From 35ff106cda5bd33f5ee4dbc0a19b68685fb0fed9 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Tue, 5 Dec 2017 18:36:55 +0000 Subject: [PATCH 07/64] Flatten dependency hierarchy of legacy-android-test Previous changes statically included legacy-android-test in preparation for removing android.test.* and junit.* classes from the android.jar. Unfortunately, that lead to duplicate classes between APKs and the bootclasspath which caused build problems (Proguard) and also runtime problems (when targeting and running on older releases). Switching from statically including the classes to using the runtime libraries cannot be done in one step because legacy-android-test is statically included in libraries which are used in many APKs and so removing it from those libraries requires that all APKs be updated at once. Doing that atomically across dozens of projects is not practical. This change modifies APKS that statically include the legacy-android-test library indirectly. * If the APK manifest uses the android.test.runner library then the APK is modified to stop statically including legacy-android-test and instead build against android.test.base/mock/runner libraries instead. * Otherwise, the APK statically includes legacy-android-test. Also, any libraries that statically include are modified to stop statically including it and if it has source dependencies on the classes is changed to build against the android.test.base/mock/runner libraries. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * apps/CtsVerifier/Android.mk Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is unnecessary as CtsVerifier's source does not depend on classes from legacy-android-test. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsVerifier specifies in its manifest. * common/device-side/device-info/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because compatibility-device-info is not a package so does not need to statically include the classes Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because compatibility-device-info has a source dependency on its classes * common/device-side/device-info/tests/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because compatibility-device-info-tests is not a package so does not need to statically include the classes Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because compatibility-device-info-tests has a source dependency on its classes * common/device-side/util/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because compatibility-device-util is not a package so does not need to statically include the classes * hostsidetests/abioverride/app/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsAbiOverrideTestApp was statically linked to it through its dependency on compatibility-device-util * hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsAccessSerialModern was statically linked to it through its dependency on compatibility-device-util * hostsidetests/appsecurity/test-apps/DocumentClient/Android.mk Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsDocumentClient's source depends on its classes and because of these changes they are no longer present on the compilation path. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsDocumentClient specifies in its manifest. * hostsidetests/appsecurity/test-apps/DocumentProvider/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsDocumentProvider was statically linked to it through its dependency on compatibility-device-util * hostsidetests/appsecurity/test-apps/PermissionPolicy25/Android.mk Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is unnecessary as CtsPermissionPolicyTest25's source does not depend on classes from legacy-android-test. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsPermissionPolicyTest25 specifies in its manifest. * hostsidetests/appsecurity/test-apps/UsePermissionApp22/Android.mk Replaced 'legacy-android-test' with 'android.test.base' in LOCAL_JAVA_LIBRARIES because CtsUsePermissionApp22's source depends on its classes. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsUsePermissionApp22 specifies in its manifest. * hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsUsePermissionApp23 was statically linked to it through its dependency on compatibility-device-util Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is unnecessary as CtsUsePermissionApp23 already statically includes legacy-android-test * hostsidetests/appsecurity/test-apps/UsePermissionApp25/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsUsePermissionApp25 was statically linked to it through its dependency on compatibility-device-util * hostsidetests/appsecurity/test-apps/UsePermissionApp26/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsUsePermissionApp26 was statically linked to it through its dependency on compatibility-device-util * hostsidetests/appsecurity/test-apps/UsePermissionAppLatest/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsUsePermissionAppLatest was statically linked to it through its dependency on compatibility-device-util * hostsidetests/devicepolicy/app/Assistant/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsDevicePolicyAssistApp was statically linked to it through its dependency on compatibility-device-util * hostsidetests/devicepolicy/app/CustomizationApp/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsCustomizationApp was statically linked to it through its dependency on compatibility-device-util * hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api23/Android.mk Replaced 'legacy-android-test' with 'android.test.runner.stubs' in LOCAL_JAVA_LIBRARIES because CtsDeviceAndProfileOwnerApp23's source depends on its classes. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsDeviceAndProfileOwnerApp23 specifies in its manifest. * hostsidetests/devicepolicy/app/DeviceAndProfileOwner/api25/Android.mk Replaced 'legacy-android-test' with 'android.test.runner.stubs' in LOCAL_JAVA_LIBRARIES because CtsDeviceAndProfileOwnerApp25's source depends on its classes. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsDeviceAndProfileOwnerApp25 specifies in its manifest. * hostsidetests/devicepolicy/app/DeviceAndProfileOwner/latest/Android.mk Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsDeviceAndProfileOwnerApp's source depends on its classes and because of these changes they are no longer present on the compilation path. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsDeviceAndProfileOwnerApp specifies in its manifest. * hostsidetests/devicepolicy/app/WifiConfigCreator/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsWifiConfigCreator was statically linked to it through its dependency on compatibility-device-util * hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsProcStatsHelperApp was statically linked to it through its dependency on compatibility-device-util * hostsidetests/media/app/MediaSessionTest/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsMediaSessionHostTestApp was statically linked to it through its dependency on compatibility-device-util * hostsidetests/net/app/Android.mk Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsHostsideNetworkTestsApp's source depends on its classes and because of these changes they are no longer present on the compilation path. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsHostsideNetworkTestsApp specifies in its manifest. * hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsStaticSharedLibConsumerApp1 was statically linked to it through its dependency on compatibility-device-util * hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutBackupLauncher1 was statically linked to it through its dependency on compatibility-device-util * hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutBackupLauncher2 was statically linked to it through its dependency on compatibility-device-util * hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutBackupLauncher3 was statically linked to it through its dependency on compatibility-device-util * hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutBackupLauncher4new was statically linked to it through its dependency on compatibility-device-util * hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutBackupLauncher4old was statically linked to it through its dependency on compatibility-device-util * hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutBackupPublisher1 was statically linked to it through its dependency on compatibility-device-util * hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutBackupPublisher2 was statically linked to it through its dependency on compatibility-device-util * hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutBackupPublisher3 was statically linked to it through its dependency on compatibility-device-util * hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutBackupPublisher4new was statically linked to it through its dependency on compatibility-device-util * hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutBackupPublisher4new_nobackup was statically linked to it through its dependency on compatibility-device-util * hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutBackupPublisher4new_nomanifest was statically linked to it through its dependency on compatibility-device-util * hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutBackupPublisher4new_wrongkey was statically linked to it through its dependency on compatibility-device-util * hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutBackupPublisher4old was statically linked to it through its dependency on compatibility-device-util * hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutBackupPublisher4old_nomanifest was statically linked to it through its dependency on compatibility-device-util * hostsidetests/shortcuts/deviceside/multiuser/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutMultiuserTest was statically linked to it through its dependency on compatibility-device-util * hostsidetests/shortcuts/deviceside/upgrade/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutUpgradeVersion1 was statically linked to it through its dependency on compatibility-device-util Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutUpgradeVersion2 was statically linked to it through its dependency on compatibility-device-util * hostsidetests/ui/appA/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsDeviceTaskSwitchingAppA was statically linked to it through its dependency on compatibility-device-util * hostsidetests/ui/appB/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsDeviceTaskSwitchingAppB was statically linked to it through its dependency on compatibility-device-util * hostsidetests/webkit/app/Android.mk Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsWebViewStartupApp's source depends on its classes and because of these changes they are no longer present on the compilation path. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsWebViewStartupApp specifies in its manifest. * libs/deviceutillegacy/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because ctsdeviceutillegacy is not a package so does not need to statically include the classes Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because ctsdeviceutillegacy has a source dependency on its classes * tests/JobScheduler/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsJobSchedulerTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsJobSchedulerTestCases specifies in its manifest. * tests/JobScheduler/jobperm/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsJobSchedulerJobPerm was statically linked to it through its dependency on compatibility-device-util * tests/JobScheduler/shareduid/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsJobSchedulerSharedUid was statically linked to it through its dependency on compatibility-device-util * tests/admin/Android.mk Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsAdminTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsAdminTestCases specifies in its manifest. * tests/app/app2/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsAppTestStubsDifferentUid was statically linked to it through its dependency on compatibility-device-util * tests/backup/app/fullbackup/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsFullBackupApp was statically linked to it through its dependency on compatibility-device-util * tests/backup/app/keyvalue/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsKeyValueBackupApp was statically linked to it through its dependency on compatibility-device-util * tests/framework/base/windowmanager/alertwindowservice/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsAlertWindowService was statically linked to it through its dependency on compatibility-device-util * tests/leanbackjank/app/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsLeanbackJankApp was statically linked to it through its dependency on compatibility-device-util * tests/tests/alarmclock/Android.mk Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsAlarmClockTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsAlarmClockTestCases specifies in its manifest. * tests/tests/assist/Android.mk Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsAssistTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsAssistTestCases specifies in its manifest. * tests/tests/dpi/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because android.cts.dpi is not a package so does not need to statically include the classes Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because android.cts.dpi has a source dependency on its classes * tests/tests/dpi2/Android.mk Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is unnecessary as CtsDpiTestCases2's source does not depend on classes from legacy-android-test. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsDpiTestCases2 specifies in its manifest. * tests/tests/externalservice/service/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsExternalServiceService was statically linked to it through its dependency on compatibility-device-util * tests/tests/mediastress/Android.mk Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsMediaStressTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsMediaStressTestCases specifies in its manifest. * tests/tests/openglperf/Android.mk Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsOpenGlPerfTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsOpenGlPerfTestCases specifies in its manifest. * tests/tests/provider/Android.mk Replaced 'legacy-android-test' with 'android.test.base' and 'android.test.runner' in LOCAL_JAVA_LIBRARIES because CtsProviderTestCases's source depends on their classes. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsProviderTestCases specifies in its manifest. * tests/tests/selinux/selinuxTargetSdk/Android.mk Removed legacy-android-test from LOCAL_JAVA_LIBRARIES because it is unnecessary as CtsSelinuxTargetSdkTestCases's source does not depend on classes from legacy-android-test. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsSelinuxTargetSdkTestCases specifies in its manifest. * tests/tests/shortcutmanager/packages/launchermanifest/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutManagerLauncher1 was statically linked to it through its dependency on compatibility-device-util Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutManagerLauncher2 was statically linked to it through its dependency on compatibility-device-util Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutManagerLauncher3 was statically linked to it through its dependency on compatibility-device-util * tests/tests/shortcutmanager/packages/launchermanifest_nonshared/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutManagerLauncher4 was statically linked to it through its dependency on compatibility-device-util * tests/tests/shortcutmanager/packages/packagemanifest/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutManagerPackage1 was statically linked to it through its dependency on compatibility-device-util Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutManagerPackage2 was statically linked to it through its dependency on compatibility-device-util Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutManagerPackage3 was statically linked to it through its dependency on compatibility-device-util * tests/tests/shortcutmanager/packages/packagemanifest_nonshared/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutManagerPackage4 was statically linked to it through its dependency on compatibility-device-util * tests/tests/shortcutmanager/throttling/Android.mk Added 'legacy-android-test' to LOCAL_STATIC_JAVA_LIBRARIES because CtsShortcutManagerThrottlingTest was statically linked to it through its dependency on compatibility-device-util * tests/tests/voiceinteraction/Android.mk Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsVoiceInteractionTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsVoiceInteractionTestCases specifies in its manifest. * tests/tests/webkit/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsWebkitTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsWebkitTestCases specifies in its manifest. * tests/ui/Android.mk Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsUiDeviceTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. The classes do not need to be statically included because the classes will be provided by the runtime, either from the default bootclasspath or from the android.test.runner library that CtsUiDeviceTestCases specifies in its manifest. * tools/cts-reference-app-lib/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because android.cts.refapp is not a package so does not need to statically include the classes Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because android.cts.refapp has a source dependency on its classes Bug: 30188076 Test: make checkbuild Change-Id: Ief6940eacf333043e2324462d37d1fd35db15165 --- tests/cts/hostside/app/Android.mk | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tests/cts/hostside/app/Android.mk b/tests/cts/hostside/app/Android.mk index f094f3f4a1..66adea7a3b 100644 --- a/tests/cts/hostside/app/Android.mk +++ b/tests/cts/hostside/app/Android.mk @@ -23,6 +23,8 @@ LOCAL_SDK_VERSION := current LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util ctstestrunner ub-uiautomator \ CtsHostsideNetworkTestsAidl +LOCAL_JAVA_LIBRARIES := android.test.runner.stubs + LOCAL_SRC_FILES := $(call all-java-files-under, src) LOCAL_PACKAGE_NAME := CtsHostsideNetworkTestsApp From bed51fc9b906d5e295d33641f97cb1d1e6fc8513 Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 8 Dec 2017 00:02:41 +0000 Subject: [PATCH 08/64] Stop statically including legacy-android-test Statically including legacy-android-test leads to duplicate classes which causes build time problems (with Proguard) and runtime problems on older SDK versions. This change: * Stops statically including legacy-android-test. * Adds compile time dependencies on andoid.test.base, android.test.mock and android.test.runner where necessary. * Adds to any affected package to ensure that the classes that were included by legacy-android-test are still available at runtime. That also adds a dependency on android.test.base and android.test.mock. The following change descriptions were generated automatically and so may be a little repetitive. They are provided to give the reviewer enough information to check the comments match what has actually been changed and check the reasoning behind the changes. * hostsidetests/abioverride/app/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsAbiOverrideTestApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/abioverride/app/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsAbiOverrideTestApp at runtime. * hostsidetests/appsecurity/test-apps/AccessSerialModern/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsAccessSerialModern results in duplicate classes which leads to build time and compile time issues. * hostsidetests/appsecurity/test-apps/AccessSerialModern/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsAccessSerialModern at runtime. * hostsidetests/appsecurity/test-apps/AppAccessData/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsAppAccessData results in duplicate classes which leads to build time and compile time issues. * hostsidetests/appsecurity/test-apps/AppWithData/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsAppWithData results in duplicate classes which leads to build time and compile time issues. * hostsidetests/appsecurity/test-apps/DocumentProvider/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsDocumentProvider results in duplicate classes which leads to build time and compile time issues. * hostsidetests/appsecurity/test-apps/DocumentProvider/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsDocumentProvider at runtime. * hostsidetests/appsecurity/test-apps/EphemeralTestApp/EphemeralApp1/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsEphemeralTestsEphemeralApp1's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsEphemeralTestsEphemeralApp1 results in duplicate classes which leads to build time and compile time issues. * hostsidetests/appsecurity/test-apps/EphemeralTestApp/ImplicitlyExposedApp/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsEphemeralTestsImplicitApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/appsecurity/test-apps/EphemeralTestApp/NormalApp/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsEphemeralTestsNormalApp results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsEphemeralTestsNormalApp's source depends on its classes and because of these changes they are no longer present on the compilation path. * hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserApp/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsEphemeralTestsUserApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/appsecurity/test-apps/EphemeralTestApp/UserAppTest/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsEphemeralTestsUserAppTest results in duplicate classes which leads to build time and compile time issues. * hostsidetests/appsecurity/test-apps/ExternalStorageApp/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsExternalStorageApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/appsecurity/test-apps/InstrumentationAppDiffCert/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsInstrumentationAppDiffCert results in duplicate classes which leads to build time and compile time issues. * hostsidetests/appsecurity/test-apps/MultiUserStorageApp/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsMultiUserStorageApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/appsecurity/test-apps/ReadExternalStorageApp/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsReadExternalStorageApp results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsReadExternalStorageApp's source depends on its classes and because of these changes they are no longer present on the compilation path. * hostsidetests/appsecurity/test-apps/SplitApp/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsSplitApp results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsSplitApp's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsSplitAppDiffRevision results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsSplitAppDiffRevision's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsSplitAppDiffVersion results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsSplitAppDiffVersion's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsSplitAppDiffCert results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsSplitAppDiffCert's source depends on its classes and because of these changes they are no longer present on the compilation path. * hostsidetests/appsecurity/test-apps/StorageAppA/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsStorageAppA results in duplicate classes which leads to build time and compile time issues. * hostsidetests/appsecurity/test-apps/StorageAppB/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsStorageAppB results in duplicate classes which leads to build time and compile time issues. * hostsidetests/appsecurity/test-apps/StorageStatsApp/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsStorageStatsApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/appsecurity/test-apps/UsePermissionApp23/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsUsePermissionApp23 results in duplicate classes which leads to build time and compile time issues. It is also unnecessary as CtsUsePermissionApp23 targets SDK version 23 which provides all the classes at runtime. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsUsePermissionApp23's source depends on its classes and because of these changes they are no longer present on the compilation path. * hostsidetests/appsecurity/test-apps/UsePermissionApp23/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsUsePermissionApp23 at runtime. * hostsidetests/appsecurity/test-apps/UsePermissionApp25/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsUsePermissionApp25 results in duplicate classes which leads to build time and compile time issues. It is also unnecessary as CtsUsePermissionApp25 targets SDK version 25 which provides all the classes at runtime. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsUsePermissionApp25's source depends on its classes and because of these changes they are no longer present on the compilation path. * hostsidetests/appsecurity/test-apps/UsePermissionApp25/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsUsePermissionApp25 at runtime. * hostsidetests/appsecurity/test-apps/UsePermissionApp26/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsUsePermissionApp26 results in duplicate classes which leads to build time and compile time issues. It is also unnecessary as CtsUsePermissionApp26 targets SDK version 26 which provides all the classes at runtime. * hostsidetests/appsecurity/test-apps/UsePermissionApp26/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsUsePermissionApp26 at runtime. * hostsidetests/appsecurity/test-apps/UsePermissionAppLatest/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsUsePermissionAppLatest results in duplicate classes which leads to build time and compile time issues. * hostsidetests/appsecurity/test-apps/UsePermissionAppLatest/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsUsePermissionAppLatest at runtime. * hostsidetests/appsecurity/test-apps/UsePermissionDiffCert/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsUsePermissionDiffCert results in duplicate classes which leads to build time and compile time issues. * hostsidetests/appsecurity/test-apps/WriteExternalStorageApp/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsWriteExternalStorageApp results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsWriteExternalStorageApp's source depends on its classes and because of these changes they are no longer present on the compilation path. * hostsidetests/appsecurity/test-apps/keysets/testApp/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsKeySetTestApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/devicepolicy/app/AccountCheck/Auth/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsAccountCheckAuthApp results in duplicate classes which leads to build time and compile time issues. It is also unnecessary as CtsAccountCheckAuthApp targets SDK version 25 which provides all the classes at runtime. * hostsidetests/devicepolicy/app/AccountCheck/Auth/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsAccountCheckAuthApp at runtime. * hostsidetests/devicepolicy/app/AccountManagement/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsAccountManagementDevicePolicyApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/devicepolicy/app/AccountManagement/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsAccountManagementDevicePolicyApp at runtime. * hostsidetests/devicepolicy/app/Assistant/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsDevicePolicyAssistApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/devicepolicy/app/Assistant/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsDevicePolicyAssistApp at runtime. * hostsidetests/devicepolicy/app/CrossProfileAppsTest/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsCrossProfileAppsTests results in duplicate classes which leads to build time and compile time issues. It is also unnecessary as CtsCrossProfileAppsTests targets SDK version 25 which provides all the classes at runtime. * hostsidetests/devicepolicy/app/CustomizationApp/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsCustomizationApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/devicepolicy/app/CustomizationApp/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsCustomizationApp at runtime. * hostsidetests/devicepolicy/app/DelegateApp/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsDelegateApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/devicepolicy/app/DeviceAdmin/api23/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsDeviceAdminApp23 results in duplicate classes which leads to build time and compile time issues. It is also unnecessary as CtsDeviceAdminApp23 targets SDK version 23 which provides all the classes at runtime. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsDeviceAdminApp23's source depends on its classes and because of these changes they are no longer present on the compilation path. * hostsidetests/devicepolicy/app/DeviceAdmin/api24/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsDeviceAdminApp24 results in duplicate classes which leads to build time and compile time issues. It is also unnecessary as CtsDeviceAdminApp24 targets SDK version 24 which provides all the classes at runtime. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsDeviceAdminApp24's source depends on its classes and because of these changes they are no longer present on the compilation path. * hostsidetests/devicepolicy/app/DeviceOwner/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsDeviceOwnerApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/devicepolicy/app/IntentReceiver/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsIntentReceiverApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/devicepolicy/app/IntentSender/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsIntentSenderApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/devicepolicy/app/LauncherTests/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsLauncherAppsTests results in duplicate classes which leads to build time and compile time issues. It is also unnecessary as CtsLauncherAppsTests targets SDK version 25 which provides all the classes at runtime. * hostsidetests/devicepolicy/app/ManagedProfile/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsManagedProfileApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/devicepolicy/app/PackageInstaller/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsPackageInstallerApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/devicepolicy/app/ProfileOwner/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsProfileOwnerApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/devicepolicy/app/SingleAdminApp/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsDevicePolicySingleAdminTestApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/devicepolicy/app/WifiConfigCreator/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsWifiConfigCreator results in duplicate classes which leads to build time and compile time issues. * hostsidetests/devicepolicy/app/WifiConfigCreator/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsWifiConfigCreator at runtime. * hostsidetests/dumpsys/apps/ProcStatsHelperApp/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsProcStatsHelperApp results in duplicate classes which leads to build time and compile time issues. It is also unnecessary as CtsProcStatsHelperApp targets SDK version 24 which provides all the classes at runtime. * hostsidetests/dumpsys/apps/ProcStatsHelperApp/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsProcStatsHelperApp at runtime. * hostsidetests/media/app/MediaSessionTest/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsMediaSessionHostTestApp results in duplicate classes which leads to build time and compile time issues. * hostsidetests/media/app/MediaSessionTest/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsMediaSessionHostTestApp at runtime. * hostsidetests/numberblocking/app/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsHostsideNumberBlockingAppTest results in duplicate classes which leads to build time and compile time issues. * hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsStaticSharedLibConsumerApp1 results in duplicate classes which leads to build time and compile time issues. * hostsidetests/os/test-apps/StaticSharedLibConsumerApp1/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsStaticSharedLibConsumerApp1 at runtime. * hostsidetests/shortcuts/deviceside/backup/launcher1/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutBackupLauncher1 results in duplicate classes which leads to build time and compile time issues. * hostsidetests/shortcuts/deviceside/backup/launcher1/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutBackupLauncher1 at runtime. * hostsidetests/shortcuts/deviceside/backup/launcher2/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutBackupLauncher2 results in duplicate classes which leads to build time and compile time issues. * hostsidetests/shortcuts/deviceside/backup/launcher2/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutBackupLauncher2 at runtime. * hostsidetests/shortcuts/deviceside/backup/launcher3/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutBackupLauncher3 results in duplicate classes which leads to build time and compile time issues. * hostsidetests/shortcuts/deviceside/backup/launcher3/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutBackupLauncher3 at runtime. * hostsidetests/shortcuts/deviceside/backup/launcher4new/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutBackupLauncher4new results in duplicate classes which leads to build time and compile time issues. * hostsidetests/shortcuts/deviceside/backup/launcher4new/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutBackupLauncher4new at runtime. * hostsidetests/shortcuts/deviceside/backup/launcher4old/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutBackupLauncher4old results in duplicate classes which leads to build time and compile time issues. * hostsidetests/shortcuts/deviceside/backup/launcher4old/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutBackupLauncher4old at runtime. * hostsidetests/shortcuts/deviceside/backup/publisher1/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutBackupPublisher1 results in duplicate classes which leads to build time and compile time issues. * hostsidetests/shortcuts/deviceside/backup/publisher1/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutBackupPublisher1 at runtime. * hostsidetests/shortcuts/deviceside/backup/publisher2/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutBackupPublisher2 results in duplicate classes which leads to build time and compile time issues. * hostsidetests/shortcuts/deviceside/backup/publisher2/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutBackupPublisher2 at runtime. * hostsidetests/shortcuts/deviceside/backup/publisher3/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutBackupPublisher3 results in duplicate classes which leads to build time and compile time issues. * hostsidetests/shortcuts/deviceside/backup/publisher3/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutBackupPublisher3 at runtime. * hostsidetests/shortcuts/deviceside/backup/publisher4new/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutBackupPublisher4new results in duplicate classes which leads to build time and compile time issues. * hostsidetests/shortcuts/deviceside/backup/publisher4new/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutBackupPublisher4new at runtime. * hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutBackupPublisher4new_nobackup results in duplicate classes which leads to build time and compile time issues. * hostsidetests/shortcuts/deviceside/backup/publisher4new_nobackup/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutBackupPublisher4new_nobackup at runtime. * hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutBackupPublisher4new_nomanifest results in duplicate classes which leads to build time and compile time issues. * hostsidetests/shortcuts/deviceside/backup/publisher4new_nomanifest/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutBackupPublisher4new_nomanifest at runtime. * hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutBackupPublisher4new_wrongkey results in duplicate classes which leads to build time and compile time issues. * hostsidetests/shortcuts/deviceside/backup/publisher4new_wrongkey/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutBackupPublisher4new_wrongkey at runtime. * hostsidetests/shortcuts/deviceside/backup/publisher4old/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutBackupPublisher4old results in duplicate classes which leads to build time and compile time issues. * hostsidetests/shortcuts/deviceside/backup/publisher4old/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutBackupPublisher4old at runtime. * hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutBackupPublisher4old_nomanifest results in duplicate classes which leads to build time and compile time issues. * hostsidetests/shortcuts/deviceside/backup/publisher4old_nomanifest/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutBackupPublisher4old_nomanifest at runtime. * hostsidetests/shortcuts/deviceside/multiuser/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutMultiuserTest results in duplicate classes which leads to build time and compile time issues. * hostsidetests/shortcuts/deviceside/multiuser/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutMultiuserTest at runtime. * hostsidetests/shortcuts/deviceside/upgrade/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutUpgradeVersion1 results in duplicate classes which leads to build time and compile time issues. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutUpgradeVersion2 results in duplicate classes which leads to build time and compile time issues. * hostsidetests/shortcuts/deviceside/upgrade/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutUpgradeVersion1 at runtime. * hostsidetests/ui/appA/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsDeviceTaskSwitchingAppA results in duplicate classes which leads to build time and compile time issues. * hostsidetests/ui/appA/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsDeviceTaskSwitchingAppA at runtime. * hostsidetests/ui/appB/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsDeviceTaskSwitchingAppB results in duplicate classes which leads to build time and compile time issues. * hostsidetests/ui/appB/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsDeviceTaskSwitchingAppB at runtime. * hostsidetests/usb/SerialTestApp/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsUsbSerialTestApp results in duplicate classes which leads to build time and compile time issues. * tests/JobScheduler/jobperm/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsJobSchedulerJobPerm results in duplicate classes which leads to build time and compile time issues. * tests/JobScheduler/jobperm/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsJobSchedulerJobPerm at runtime. * tests/JobScheduler/shareduid/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsJobSchedulerSharedUid results in duplicate classes which leads to build time and compile time issues. * tests/JobScheduler/shareduid/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsJobSchedulerSharedUid at runtime. * tests/ProcessTest/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in ProcessTests results in duplicate classes which leads to build time and compile time issues. * tests/acceleration/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsAccelerationTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsAccelerationTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/accessibilityservice/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsAccessibilityServiceTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsAccessibilityServiceTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/admin/app/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsAdminApp results in duplicate classes which leads to build time and compile time issues. * tests/app/app/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsAppTestStubs's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsAppTestStubs results in duplicate classes which leads to build time and compile time issues. * tests/app/app2/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsAppTestStubsDifferentUid results in duplicate classes which leads to build time and compile time issues. * tests/app/app2/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsAppTestStubsDifferentUid at runtime. * tests/backup/app/fullbackup/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsFullBackupApp results in duplicate classes which leads to build time and compile time issues. * tests/backup/app/fullbackup/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsFullBackupApp at runtime. * tests/backup/app/keyvalue/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsKeyValueBackupApp results in duplicate classes which leads to build time and compile time issues. * tests/backup/app/keyvalue/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsKeyValueBackupApp at runtime. * tests/fragment/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsFragmentTestCases results in duplicate classes which leads to build time and compile time issues. * tests/framework/base/windowmanager/alertwindowservice/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsAlertWindowService results in duplicate classes which leads to build time and compile time issues. * tests/framework/base/windowmanager/alertwindowservice/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsAlertWindowService at runtime. * tests/jank/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsJankDeviceTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsJankDeviceTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/leanbackjank/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsLeanbackJankTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsLeanbackJankTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/leanbackjank/app/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsLeanbackJankApp results in duplicate classes which leads to build time and compile time issues. It is also unnecessary as CtsLeanbackJankApp targets SDK version 23 which provides all the classes at runtime. * tests/leanbackjank/app/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsLeanbackJankApp at runtime. * tests/netlegacy22.api/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsNetTestCasesLegacyApi22 results in duplicate classes which leads to build time and compile time issues. * tests/netlegacy22.permission/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsNetTestCasesLegacyPermission22 results in duplicate classes which leads to build time and compile time issues. * tests/pdf/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsPdfTestCases results in duplicate classes which leads to build time and compile time issues. * tests/sample/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsSampleDeviceTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsSampleDeviceTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/accounts/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsAccountManagerTestCases results in duplicate classes which leads to build time and compile time issues. It is also unnecessary as CtsAccountManagerTestCases targets SDK version 26 which provides all the classes at runtime. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsAccountManagerTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/animation/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsAnimationTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/app.usage/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsUsageStatsTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' and 'android.test.runner' to LOCAL_JAVA_LIBRARIES because CtsUsageStatsTestCases's source depends on their classes and because of these changes they are no longer present on the compilation path. * tests/tests/app/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsAndroidAppTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsAndroidAppTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/appwidget/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsAppWidgetTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsAppWidgetTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/bluetooth/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsBluetoothTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/calendarcommon/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsCalendarcommon2TestCases results in duplicate classes which leads to build time and compile time issues. It is also unnecessary as CtsCalendarcommon2TestCases targets SDK version 15 which provides all the classes at runtime. * tests/tests/car/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsCarTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/carrierapi/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsCarrierApiTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsCarrierApiTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/colormode/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsColorModeTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/content/Android.mk Added 'android.test.base' and 'android.test.mock' to LOCAL_JAVA_LIBRARIES because CtsContentTestCases's source depends on their classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsContentTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/database/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsDatabaseTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/display/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsDisplayTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/dpi/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsDpiTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsDpiTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/dreams/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsDreamsTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsDreamsTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/drm/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsDrmTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/dynamic_linker/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsDynamicLinkerTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/externalservice/service/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsExternalServiceService results in duplicate classes which leads to build time and compile time issues. * tests/tests/externalservice/service/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsExternalServiceService at runtime. * tests/tests/graphics/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsGraphicsTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/hardware/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsHardwareTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsHardwareTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/incident/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsIncidentTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/keystore/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsKeystoreTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsKeystoreTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/libcorefileio/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsLibcoreFileIOTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsLibcoreFileIOTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/location2/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsLocation2TestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsLocation2TestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/media/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsMediaTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsMediaTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/net/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsNetTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsNetTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/netsecpolicy/usescleartexttraffic-false/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsNetSecPolicyUsesCleartextTrafficFalseTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/netsecpolicy/usescleartexttraffic-true/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsNetSecPolicyUsesCleartextTrafficTrueTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/netsecpolicy/usescleartexttraffic-unspecified/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsNetSecPolicyUsesCleartextTrafficUnspecifiedTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/networksecurityconfig/networksecurityconfig-downloadmanager/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsNetSecConfigDownloadManagerTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/networksecurityconfig/networksecurityconfig-resourcesrc/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsNetSecConfigResourcesSrcTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsNetSecConfigResourcesSrcTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/opengl/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsOpenGLTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsOpenGLTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/os/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsOsTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsOsTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/packageinstaller/adminpackageinstaller/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsAdminPackageInstallerTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/permission/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsPermissionTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsPermissionTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/permission2/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsPermission2TestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/preference/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsPreferenceTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsPreferenceTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/preference2/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsPreference2TestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsPreference2TestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/renderscript/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsRenderscriptTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/rsblas/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsRsBlasTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/rscpp/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsRsCppTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/sax/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsSaxTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/security/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsSecurityTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsSecurityTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/selinux/selinuxTargetSdk2/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsSelinuxTargetSdk2TestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/shortcutmanager/packages/launchermanifest/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutManagerLauncher1 results in duplicate classes which leads to build time and compile time issues. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutManagerLauncher2 results in duplicate classes which leads to build time and compile time issues. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutManagerLauncher3 results in duplicate classes which leads to build time and compile time issues. * tests/tests/shortcutmanager/packages/launchermanifest/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutManagerLauncher1 at runtime. * tests/tests/shortcutmanager/packages/launchermanifest_nonshared/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutManagerLauncher4 results in duplicate classes which leads to build time and compile time issues. * tests/tests/shortcutmanager/packages/launchermanifest_nonshared/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutManagerLauncher4 at runtime. * tests/tests/shortcutmanager/packages/packagemanifest/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutManagerPackage1 results in duplicate classes which leads to build time and compile time issues. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutManagerPackage2 results in duplicate classes which leads to build time and compile time issues. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutManagerPackage3 results in duplicate classes which leads to build time and compile time issues. * tests/tests/shortcutmanager/packages/packagemanifest/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutManagerPackage1 at runtime. * tests/tests/shortcutmanager/packages/packagemanifest_nonshared/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutManagerPackage4 results in duplicate classes which leads to build time and compile time issues. * tests/tests/shortcutmanager/packages/packagemanifest_nonshared/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutManagerPackage4 at runtime. * tests/tests/shortcutmanager/throttling/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsShortcutManagerThrottlingTest results in duplicate classes which leads to build time and compile time issues. It is also unnecessary as CtsShortcutManagerThrottlingTest targets SDK version 25 which provides all the classes at runtime. * tests/tests/shortcutmanager/throttling/AndroidManifest.xml Add uses-library for android.test.runner because otherwise this change would change the set of files available to CtsShortcutManagerThrottlingTest at runtime. * tests/tests/simpleperf/CtsSimpleperfDebugApp/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsSimpleperfDebugApp results in duplicate classes which leads to build time and compile time issues. * tests/tests/slice/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsSliceTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/speech/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsSpeechTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsSpeechTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/systemintents/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsSystemIntentTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/systemui/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsSystemUiTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/telecom/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsTelecomTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/telecom2/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsTelecomTestCases2 results in duplicate classes which leads to build time and compile time issues. * tests/tests/telephony/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsTelephonyTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsTelephonyTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/telephony2/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsTelephony2TestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsTelephony2TestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/theme/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsThemeDeviceTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsThemeDeviceTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/transition/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsTransitionTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/uiautomation/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsUiAutomationTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/uidisolation/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsUidIsolationTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsUidIsolationTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/uirendering/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsUiRenderingTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/util/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsUtilTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/view/Android.mk Added 'android.test.base' to LOCAL_JAVA_LIBRARIES because CtsViewTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsViewTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/widget/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsWidgetTestCases results in duplicate classes which leads to build time and compile time issues. * tests/tests/wrap/nowrap/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsWrapNoWrapTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsWrapNoWrapTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/wrap/wrap_debug/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsWrapWrapDebugTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsWrapWrapDebugTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/wrap/wrap_debug_malloc_debug/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsWrapWrapDebugMallocDebugTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsWrapWrapDebugMallocDebugTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/tests/wrap/wrap_nodebug/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsWrapWrapNoDebugTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsWrapWrapNoDebugTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tests/vr/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsVrTestCases results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsVrTestCases's source depends on its classes and because of these changes they are no longer present on the compilation path. * tools/cts-holo-generation/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsHoloGeneration results in duplicate classes which leads to build time and compile time issues. Added 'android.test.runner.stubs' to LOCAL_JAVA_LIBRARIES because CtsHoloGeneration's source depends on its classes and because of these changes they are no longer present on the compilation path. * tools/cts-preconditions/Android.mk Removed legacy-android-test from LOCAL_STATIC_JAVA_LIBRARIES because statically including the classes in CtsPreconditions results in duplicate classes which leads to build time and compile time issues. Bug: 30188076 Test: make checkbuild Change-Id: I56c62344ab09338ed35586d76c0440d6f9515d72 --- tests/cts/net/Android.mk | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/tests/cts/net/Android.mk b/tests/cts/net/Android.mk index 4aeab38dbd..1d4d54b644 100644 --- a/tests/cts/net/Android.mk +++ b/tests/cts/net/Android.mk @@ -24,7 +24,12 @@ LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_APPS) # Include both the 32 and 64 bit versions LOCAL_MULTILIB := both -LOCAL_JAVA_LIBRARIES := voip-common conscrypt org.apache.http.legacy +LOCAL_JAVA_LIBRARIES := \ + voip-common \ + conscrypt \ + org.apache.http.legacy \ + android.test.base \ + LOCAL_JNI_SHARED_LIBRARIES := libcts_jni libnativedns_jni \ libnativemultinetwork_jni libnativehelper_compat_libc++ @@ -40,8 +45,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ ctstestrunner \ ctstestserver \ mockwebserver \ - junit \ - legacy-android-test + junit # uncomment when b/13249961 is fixed #LOCAL_SDK_VERSION := current From f183f746dd9b4a0b42f5ba581cbc6cb8a4d7c17b Mon Sep 17 00:00:00 2001 From: Paul Duffin Date: Fri, 15 Dec 2017 07:27:19 +0000 Subject: [PATCH 09/64] 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 --- tests/cts/hostside/app/Android.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/cts/hostside/app/Android.mk b/tests/cts/hostside/app/Android.mk index 66adea7a3b..c03e70bcb0 100644 --- a/tests/cts/hostside/app/Android.mk +++ b/tests/cts/hostside/app/Android.mk @@ -23,7 +23,7 @@ LOCAL_SDK_VERSION := current 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) From 607948bfb0c9b28b288ad203f894da882ae7c73c Mon Sep 17 00:00:00 2001 From: jdesprez Date: Sat, 16 Dec 2017 04:19:31 -0800 Subject: [PATCH 10/64] Add cts suite tag to all CTS modules Test: build Bug: 65303193 Change-Id: I064459de5d4f8e958f41ac238cad35e5f7e99d3a --- tests/cts/hostside/AndroidTest.xml | 1 + tests/cts/net/AndroidTest.xml | 1 + tests/cts/net/native/qtaguid/AndroidTest.xml | 1 + 3 files changed, 3 insertions(+) diff --git a/tests/cts/hostside/AndroidTest.xml b/tests/cts/hostside/AndroidTest.xml index 4a2e2e38b0..c96fea41b0 100644 --- a/tests/cts/hostside/AndroidTest.xml +++ b/tests/cts/hostside/AndroidTest.xml @@ -14,6 +14,7 @@ limitations under the License. --> +