aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Build Coastguard Worker <android-build-coastguard-worker@google.com>2023-03-05 08:39:59 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2023-03-05 08:39:59 +0000
commitfc68edd501dd17cdd35bac631d7126c0ea807802 (patch)
tree9c1ad9762423b812562a482174f5a930702e4732
parentfd216493cb42ef9f417c91439c0c828642413718 (diff)
parent1f2fc07a524d1c46b0c25583ff18bb1c88cf194e (diff)
downloadrobolectric-busytown-mac-infra-release.tar.gz
Merge "Snap for 9680074 from 979664f7b809b20332b4838d2afc64902e0f2f5c to busytown-mac-infra-release" into busytown-mac-infra-releasebusytown-mac-infra-release
-rw-r--r--Android.bp42
-rw-r--r--robolectric/Android.bp1
2 files changed, 42 insertions, 1 deletions
diff --git a/Android.bp b/Android.bp
index 84d7af206..f8caf73e6 100644
--- a/Android.bp
+++ b/Android.bp
@@ -170,7 +170,47 @@ java_host_for_device {
name: "Robolectric_all-target_upstream",
libs: ["Robolectric_all_upstream"],
visibility: [
- "//platform_testing/robolab/roboStandaloneProj/tests",
+ ":__subpackages__",
+ //java references
+ "//frameworks/opt/net/wifi/libs/WifiTrackerLib/tests:__pkg__",
+ "//prebuilts/sdk/current/androidx:__pkg__",
+ "//prebuilts/sdk/current/aaos-libs:__pkg__",
+ "//packages/apps/TV/tests/common:__pkg__",
+ //robolectric tests
+ "//vendor:__subpackages__",
+ "//platform_testing/robolab/roboStandaloneProj/tests:__pkg__",
+ "//external/mobile-data-download/javatests:__pkg__",
+ "//frameworks/base/services/robotests:__pkg__",
+ "//frameworks/base/services/robotests/backup:__pkg__",
+ "//frameworks/base/packages/SettingsLib/tests/robotests:__pkg__",
+ "//frameworks/base/packages/SystemUI:__pkg__",
+ "//frameworks/opt/car/setupwizard/library/main/tests/robotests:__pkg__",
+ "//frameworks/opt/localepicker/tests:__pkg__",
+ "//frameworks/opt/wear/signaldetector/robotests:__pkg__",
+ "//frameworks/opt/wear/robotests:__pkg__",
+ "//packages/modules/Connectivity/nearby/tests/multidevices/clients/test_support/snippet_helper/tests:__pkg__",
+ "//packages/modules/Connectivity/nearby/tests/robotests:__pkg__",
+ "//packages/modules/DeviceLock/DeviceLockController/tests/robolectric:__pkg__",
+ "//packages/services/Car/tests/CarLibTests:__pkg__",
+ "//packages/services/Mms/tests/robotests:__pkg__",
+ "//packages/apps/QuickAccessWallet/tests/robolectric:__pkg__",
+ "//packages/apps/ManagedProvisioning/tests/robotests:__pkg__",
+ "//packages/apps/Car/libs/car-media-common/tests/robotests",
+ "//packages/apps/Car/libs/car-ui-lib",
+ "//packages/apps/Car/Notification/tests/robotests:__pkg__",
+ "//packages/apps/Car/Cluster/DirectRenderingCluster/tests/robotests:__pkg__",
+ "//packages/apps/Car/Settings/tests/robotests:__pkg__",
+ "//packages/apps/EmergencyInfo/tests/robolectric:__pkg__",
+ "//packages/apps/StorageManager/robotests:__pkg__",
+ "//packages/apps/Settings/tests/robotests:__pkg__",
+ "//packages/apps/ThemePicker/tests/robotests:__pkg__",
+ "//packages/apps/WallpaperPicker2/tests/robotests:__pkg__",
+ "//packages/apps/TvSettings/Settings/tests/robotests:__pkg__",
+ "//packages/apps/KeyChain/robotests:__pkg__",
+ "//packages/apps/CertInstaller/robotests:__pkg__",
+ //tm-dev additions
+ "//frameworks/base/packages/BackupEncryption/test/robolectric-integration:__pkg__",
+ "//frameworks/base/packages/BackupEncryption/test/robolectric:__pkg__",
],
}
diff --git a/robolectric/Android.bp b/robolectric/Android.bp
index 61359ab64..139062ca6 100644
--- a/robolectric/Android.bp
+++ b/robolectric/Android.bp
@@ -40,6 +40,7 @@ java_library_host {
],
srcs: ["src/main/java/**/*.java"],
plugins: ["auto_service_plugin"],
+ java_resource_dirs: ["src/main/resources"],
java_resources: [":robolectric-version-upstream.properties"],
}