Merge "Enable new_robolectric" (8165dd69) · Commits · e / os / android_build_soong

android/neverallow.go

+1 −0

Original line number	Diff line number	Diff line
		@@ -162,6 +162,7 @@ func createJavaDeviceForHostRules() []Rule {
		"development/build",
		"external/guava",
		"external/robolectric-shadows",
		"external/robolectric",
		"frameworks/layoutlib",
		}

+9 −1

Original line number	Diff line number	Diff line
		@@ -65,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 {
		@@ -107,9 +111,13 @@ 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 {
		if proptools.Bool(r.robolectricProperties.Upstream) {
		ctx.AddVariationDependencies(nil, libTag, robolectricCurrentLib+"_upstream")
		} else {
		ctx.AddVariationDependencies(nil, libTag, robolectricCurrentLib)
		}
		}

		ctx.AddVariationDependencies(nil, libTag, robolectricDefaultLibs...)