diff options
| author | Rex Hoffman <rexhoffman@google.com> | 2022-11-18 06:00:32 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2022-11-18 06:00:32 +0000 |
| commit | c07abe9ad24a10c738ff608f9f4ceb301f642d6d (patch) | |
| tree | ace233964b63d34f5ed2668057d995696446040e | |
| parent | cae3f7df508a4f4e5888542be2bce791eb6c6657 (diff) | |
| parent | ebaac47e4edcc5a04048c822bcba5bf5805e3fe6 (diff) | |
Enable new_robolectric am: ebaac47e4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/20387913
Change-Id: I2f6b5974c257ede5ad458fe69ac2630b25b94c19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | android/neverallow.go | 1 | ||||
| -rw-r--r-- | java/robolectric.go | 12 |
2 files changed, 12 insertions, 1 deletions
diff --git a/android/neverallow.go b/android/neverallow.go index aa47bcaeb..5f069b877 100644 --- a/android/neverallow.go +++ b/android/neverallow.go @@ -154,6 +154,7 @@ func createJavaDeviceForHostRules() []Rule { "development/build", "external/guava", "external/robolectric-shadows", + "external/robolectric", "frameworks/layoutlib", } diff --git a/java/robolectric.go b/java/robolectric.go index f71952172..80be04612 100644 --- a/java/robolectric.go +++ b/java/robolectric.go @@ -23,6 +23,8 @@ import ( "android/soong/android" "android/soong/java/config" "android/soong/tradefed" + + "github.com/google/blueprint/proptools" ) func init() { @@ -63,6 +65,10 @@ type robolectricProperties struct { // The version number of a robolectric prebuilt to use from prebuilts/misc/common/robolectric // instead of the one built from source in external/robolectric-shadows. Robolectric_prebuilt_version *string + + // Use /external/robolectric rather than /external/robolectric-shadows as the version of robolectri + // to use. /external/robolectric closely tracks github's master, and will fully replace /external/robolectric-shadows + Upstream *bool } type robolectricTest struct { @@ -106,7 +112,11 @@ func (r *robolectricTest) DepsMutator(ctx android.BottomUpMutatorContext) { if v := String(r.robolectricProperties.Robolectric_prebuilt_version); v != "" { ctx.AddVariationDependencies(nil, libTag, fmt.Sprintf(robolectricPrebuiltLibPattern, v)) } else { - ctx.AddVariationDependencies(nil, libTag, robolectricCurrentLib) + if proptools.Bool(r.robolectricProperties.Upstream) { + ctx.AddVariationDependencies(nil, libTag, robolectricCurrentLib+"_upstream") + } else { + ctx.AddVariationDependencies(nil, libTag, robolectricCurrentLib) + } } ctx.AddVariationDependencies(nil, libTag, robolectricDefaultLibs...) |