Remove PLATFORM_VERSION_FUTURE_CODENAMES
It has been wrong to split ALL_VERSIONS into exclusive two sets of
before/after TARGET_PLATFORM_VERSION.
And PLATFORM_VERSION_ALL_CODENAMES supports all *active* list of
non-finalized codenames.
Bug: 152960049
Test: m
Exempt-From-Owner-Approval: cp from master
Merged-In: I78ca88758998e440bea72ba2d56d90eea3ec99ae
Change-Id: I78ca88758998e440bea72ba2d56d90eea3ec99ae
(cherry picked from commit 424175d72a
)
This commit is contained in:
@@ -652,22 +652,6 @@ func (c *config) PlatformVersionActiveCodenames() []string {
|
||||
return c.productVariables.Platform_version_active_codenames
|
||||
}
|
||||
|
||||
// Codenames that are available in the branch but not included in the current
|
||||
// lunch target.
|
||||
func (c *config) PlatformVersionFutureCodenames() []string {
|
||||
return c.productVariables.Platform_version_future_codenames
|
||||
}
|
||||
|
||||
// All possible codenames in the current branch. NB: Not named AllCodenames
|
||||
// because "all" has historically meant "active" in make, and still does in
|
||||
// build.prop.
|
||||
func (c *config) PlatformVersionCombinedCodenames() []string {
|
||||
combined := []string{}
|
||||
combined = append(combined, c.PlatformVersionActiveCodenames()...)
|
||||
combined = append(combined, c.PlatformVersionFutureCodenames()...)
|
||||
return combined
|
||||
}
|
||||
|
||||
func (c *config) ProductAAPTConfig() []string {
|
||||
return c.productVariables.AAPTConfig
|
||||
}
|
||||
|
Reference in New Issue
Block a user