Revert "Flag to control if generated SDK prebuilts are preferred."

This reverts commit d0b99cea0a.

Reason for revert: Not needed anymore. We will simple exclude the 
gernated Android.bp files from prebuilt drops instead, it keeps
things simpler.

Change-Id: I5b01b2e01197f9fceb4630c8ade95f0d1d0f33f4
This commit is contained in:
Mathew Inwood
2021-07-07 12:47:51 +00:00
parent d0b99cea0a
commit 7e9ddbe8c8
3 changed files with 5 additions and 79 deletions

View File

@@ -93,10 +93,6 @@ type sdkProperties struct {
// dropped. Adding a rule to members that have //visibility:private will
// cause the //visibility:private to be discarded.
Prebuilt_visibility []string
// Specifying whether the generated prebuilt SDK build rule should have the
// prefer flag set or not.
Prebuilts_prefer *bool // default: false
}
// Contains information about the sdk properties that list sdk members, e.g.
@@ -296,10 +292,6 @@ func (s *sdk) snapshot() bool {
return s.properties.Snapshot
}
func (s *sdk) PreferPrebuilts() bool {
return proptools.BoolDefault(s.properties.Prebuilts_prefer, false)
}
func (s *sdk) GenerateAndroidBuildActions(ctx android.ModuleContext) {
if s.snapshot() {
// We don't need to create a snapshot out of sdk_snapshot.