platform_testing: Set LOCAL_SDK_VERSION where possible.
This change sets LOCAL_SDK_VERSION for all packages where
this is possible without breaking the build, and
LOCAL_PRIVATE_PLATFORM_APIS := true otherwise.
Setting one of these two will be made required soon, and this
is a change in preparation for that. Not setting LOCAL_SDK_VERSION
makes the app implicitly depend on the bootclasspath, which is
often not required. This change effectively makes depending on
private apis opt-in rather than opt-out.
Test: make relevant packages
Bug: 73535841
Change-Id: I64d4cc11fa869346763cd960e7d336ae2975669d
Merged-In: I28f983577ded466ee9714c8155674ceaca373fcb
diff --git a/libraries/aupt-lib/Android.mk b/libraries/aupt-lib/Android.mk
index ae6c2f2..d8d2056 100644
--- a/libraries/aupt-lib/Android.mk
+++ b/libraries/aupt-lib/Android.mk
@@ -32,6 +32,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_PACKAGE_NAME := AuptRunner
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator \
junit \
legacy-android-test \
diff --git a/libraries/metrics-helper/tests/Android.mk b/libraries/metrics-helper/tests/Android.mk
index 00567d6..1f725e0 100644
--- a/libraries/metrics-helper/tests/Android.mk
+++ b/libraries/metrics-helper/tests/Android.mk
@@ -18,6 +18,7 @@
LOCAL_MODULE_TAGS := tests
LOCAL_PACKAGE_NAME := MetricsHelperTests
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_SRC_FILES := $(call all-java-files-under, src)
diff --git a/libraries/power-helper/Android.mk b/libraries/power-helper/Android.mk
index 65ae0ba..601b86b 100644
--- a/libraries/power-helper/Android.mk
+++ b/libraries/power-helper/Android.mk
@@ -21,10 +21,11 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_MODULE := PowerTestHelper-src
+LOCAL_SDK_VERSION := current
LOCAL_MODULE_TAGS := optional
-LOCAL_JAVA_LIBRARIES := android.test.runner ub-uiautomator
-LOCAL_STATIC_JAVA_LIBRARIES := junit legacy-android-test
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs ub-uiautomator android.test.base.stubs
+LOCAL_STATIC_JAVA_LIBRARIES := junit
include $(BUILD_STATIC_JAVA_LIBRARY)
diff --git a/tests/example/instrumentation/Android.mk b/tests/example/instrumentation/Android.mk
index 77ad706..5dae96e 100644
--- a/tests/example/instrumentation/Android.mk
+++ b/tests/example/instrumentation/Android.mk
@@ -19,6 +19,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_MODULE_TAGS := tests
LOCAL_PACKAGE_NAME := HelloWorldTests
+LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
LOCAL_CERTIFICATE := platform
diff --git a/tests/functional/appsmoke/Android.mk b/tests/functional/appsmoke/Android.mk
index 0fb3c72..ef1c38f 100644
--- a/tests/functional/appsmoke/Android.mk
+++ b/tests/functional/appsmoke/Android.mk
@@ -19,6 +19,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_MODULE_TAGS := tests
LOCAL_PACKAGE_NAME := AppSmoke
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_STATIC_JAVA_LIBRARIES := ub-uiautomator launcher-helper-lib android-support-test
LOCAL_CERTIFICATE := platform
diff --git a/tests/functional/calculator/Android.mk b/tests/functional/calculator/Android.mk
index 3dd4073..ea68308 100644
--- a/tests/functional/calculator/Android.mk
+++ b/tests/functional/calculator/Android.mk
@@ -28,5 +28,6 @@
LOCAL_JAVA_LIBRARIES := legacy-android-test
#LOCAL_SDK_VERSION := current
+LOCAL_PRIVATE_PLATFORM_APIS := true
include $(BUILD_PACKAGE)
diff --git a/tests/functional/devicehealthtests/Android.mk b/tests/functional/devicehealthtests/Android.mk
index e35b301..3f2c498 100644
--- a/tests/functional/devicehealthtests/Android.mk
+++ b/tests/functional/devicehealthtests/Android.mk
@@ -21,6 +21,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := DeviceHealthTests
+LOCAL_SDK_VERSION := current
LOCAL_CERTIFICATE := platform
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test platform-test-annotations
diff --git a/tests/functional/notificationtests/Android.mk b/tests/functional/notificationtests/Android.mk
index a48bf81..96a7bc5 100644
--- a/tests/functional/notificationtests/Android.mk
+++ b/tests/functional/notificationtests/Android.mk
@@ -28,6 +28,7 @@
LOCAL_JAVA_LIBRARIES := legacy-android-test
#LOCAL_SDK_VERSION := current
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_COMPATIBILITY_SUITE := device-tests
diff --git a/tests/functional/systemmetrics/Android.mk b/tests/functional/systemmetrics/Android.mk
index d1a51ff..c562446 100644
--- a/tests/functional/systemmetrics/Android.mk
+++ b/tests/functional/systemmetrics/Android.mk
@@ -27,6 +27,7 @@
LOCAL_JAVA_LIBRARIES := legacy-android-test
#LOCAL_SDK_VERSION := current
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_COMPATIBILITY_SUITE := device-tests
diff --git a/tests/functional/testapks/applinktestapp/Android.mk b/tests/functional/testapks/applinktestapp/Android.mk
index cc3831e..61b0129 100644
--- a/tests/functional/testapks/applinktestapp/Android.mk
+++ b/tests/functional/testapks/applinktestapp/Android.mk
@@ -22,6 +22,7 @@
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := AppLinkTestApp
+LOCAL_SDK_VERSION := current
LOCAL_CERTIFICATE := platform
LOCAL_COMPATIBILITY_SUITE := device-tests
diff --git a/tests/functional/testapks/permissiontestappmv1/Android.mk b/tests/functional/testapks/permissiontestappmv1/Android.mk
index f9586be..9aae8ff 100644
--- a/tests/functional/testapks/permissiontestappmv1/Android.mk
+++ b/tests/functional/testapks/permissiontestappmv1/Android.mk
@@ -10,6 +10,7 @@
LOCAL_RESOURCE_DIR := \
$(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := PermissionTestAppMV1
+LOCAL_SDK_VERSION := current
LOCAL_CERTIFICATE := platform
LOCAL_COMPATIBILITY_SUITE := device-tests
diff --git a/tests/jank/UbSystemUiJankTests/Android.mk b/tests/jank/UbSystemUiJankTests/Android.mk
index de87765..122bb2f 100644
--- a/tests/jank/UbSystemUiJankTests/Android.mk
+++ b/tests/jank/UbSystemUiJankTests/Android.mk
@@ -16,6 +16,7 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := UbSystemUiJankTests
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_MODULE_TAGS := tests
diff --git a/tests/jank/dialer/Android.mk b/tests/jank/dialer/Android.mk
index d25ee79..3237d15 100644
--- a/tests/jank/dialer/Android.mk
+++ b/tests/jank/dialer/Android.mk
@@ -16,13 +16,15 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := DialerJankTests
+LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_MODULE_TAGS := tests
LOCAL_STATIC_JAVA_LIBRARIES := \
ub-uiautomator \
- ub-janktesthelper \
- legacy-android-test
+ ub-janktesthelper
+
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
LOCAL_COMPATIBILITY_SUITE := device-tests
diff --git a/tests/jank/webview/Android.mk b/tests/jank/webview/Android.mk
index ccae53b..89956ed 100644
--- a/tests/jank/webview/Android.mk
+++ b/tests/jank/webview/Android.mk
@@ -16,13 +16,15 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := UbWebViewJankTests
+LOCAL_SDK_VERSION := current
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_MODULE_TAGS := tests
LOCAL_STATIC_JAVA_LIBRARIES := \
ub-uiautomator \
- ub-janktesthelper \
- legacy-android-test
+ ub-janktesthelper
+
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
LOCAK_SDK_VERSION := current
diff --git a/tests/perf/BootHelperApp/Android.mk b/tests/perf/BootHelperApp/Android.mk
index 221df3d..6bb5487 100644
--- a/tests/perf/BootHelperApp/Android.mk
+++ b/tests/perf/BootHelperApp/Android.mk
@@ -21,7 +21,8 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := BootHelperApp
-LOCAL_JAVA_LIBRARIES := android.test.runner
+LOCAL_SDK_VERSION := current
+LOCAL_JAVA_LIBRARIES := android.test.runner.stubs
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test ub-uiautomator
LOCAL_COMPATIBILITY_SUITE := device-tests
diff --git a/tests/perf/PerfTransitionTest/Android.mk b/tests/perf/PerfTransitionTest/Android.mk
index 8cac0dd..042a4e0 100644
--- a/tests/perf/PerfTransitionTest/Android.mk
+++ b/tests/perf/PerfTransitionTest/Android.mk
@@ -21,6 +21,7 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := AppTransitionTests
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform
LOCAL_STATIC_JAVA_LIBRARIES := \
android-support-test \
diff --git a/tests/perf/PerformanceAppTest/Android.mk b/tests/perf/PerformanceAppTest/Android.mk
index 54882f9..ce7ba87 100644
--- a/tests/perf/PerformanceAppTest/Android.mk
+++ b/tests/perf/PerformanceAppTest/Android.mk
@@ -21,8 +21,9 @@
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_PACKAGE_NAME := PerformanceAppTest
+LOCAL_SDK_VERSION := current
LOCAL_CERTIFICATE := platform
-LOCAL_JAVA_LIBRARIES := legacy-android-test
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
LOCAL_STATIC_JAVA_LIBRARIES := android-support-test
LOCAL_COMPATIBILITY_SUITE := device-tests
diff --git a/tests/perf/PerformanceLaunch/Android.mk b/tests/perf/PerformanceLaunch/Android.mk
index f3604ed..e71f7b5 100644
--- a/tests/perf/PerformanceLaunch/Android.mk
+++ b/tests/perf/PerformanceLaunch/Android.mk
@@ -16,6 +16,7 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := PerformanceLaunch
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_CERTIFICATE := platform
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_MODULE_TAGS := tests
diff --git a/tests/perf/PowerPerfTest/Android.mk b/tests/perf/PowerPerfTest/Android.mk
index b3af570..b1cf34e 100644
--- a/tests/perf/PowerPerfTest/Android.mk
+++ b/tests/perf/PowerPerfTest/Android.mk
@@ -16,9 +16,10 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := PowerPerfTest
+LOCAL_SDK_VERSION := current
LOCAL_MODULE_TAGS := tests
LOCAL_STATIC_JAVA_LIBRARIES := PowerTestHelper-src ub-uiautomator junit
-LOCAL_JAVA_LIBRARIES := legacy-android-test
+LOCAL_JAVA_LIBRARIES := android.test.base.stubs
LOCAL_CERTIFICATE := platform
LOCAL_SRC_FILES := $(call all-subdir-java-files)
diff --git a/utils/permissions/Android.mk b/utils/permissions/Android.mk
index 0d86dd5..d6cd389 100644
--- a/utils/permissions/Android.mk
+++ b/utils/permissions/Android.mk
@@ -29,6 +29,7 @@
include $(CLEAR_VARS)
LOCAL_PACKAGE_NAME := PermissionUtils
+LOCAL_PRIVATE_PLATFORM_APIS := true
LOCAL_MODULE_TAGS := tests
LOCAL_SRC_FILES := $(call all-java-files-under, src)
LOCAL_CERTIFICATE := platform
