A global variant was used to store the global mapping between modules and APEXes. Replace it with storing pointers to APEX contents inside each module so that they can query the contents of any APEXes they belong to. Bug: 146393795 Test: all Soong tests Test: single line change to build.ninja host install dependency ordering Test: no Android-${TARGET_PRODUCT}.mk, make_vars-${TARGET_PRODUCT}.mk or late-${TARGET_PRODUCT}.mk Change-Id: Id2d7b73ea27f8c3b41d30820bdd86b65c539bfa4
113 lines
3.3 KiB
Go
113 lines
3.3 KiB
Go
// Copyright 2020 Google Inc. All rights reserved.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package android
|
|
|
|
import (
|
|
"reflect"
|
|
"testing"
|
|
)
|
|
|
|
func Test_mergeApexVariations(t *testing.T) {
|
|
tests := []struct {
|
|
name string
|
|
in []ApexInfo
|
|
wantMerged []ApexInfo
|
|
wantAliases [][2]string
|
|
}{
|
|
{
|
|
name: "single",
|
|
in: []ApexInfo{
|
|
{"foo", "current", false, nil, []string{"foo"}, nil},
|
|
},
|
|
wantMerged: []ApexInfo{
|
|
{"apex10000", "current", false, nil, []string{"foo"}, nil},
|
|
},
|
|
wantAliases: [][2]string{
|
|
{"foo", "apex10000"},
|
|
},
|
|
},
|
|
{
|
|
name: "merge",
|
|
in: []ApexInfo{
|
|
{"foo", "current", false, SdkRefs{{"baz", "1"}}, []string{"foo"}, nil},
|
|
{"bar", "current", false, SdkRefs{{"baz", "1"}}, []string{"bar"}, nil},
|
|
},
|
|
wantMerged: []ApexInfo{
|
|
{"apex10000_baz_1", "current", false, SdkRefs{{"baz", "1"}}, []string{"bar", "foo"}, nil}},
|
|
wantAliases: [][2]string{
|
|
{"bar", "apex10000_baz_1"},
|
|
{"foo", "apex10000_baz_1"},
|
|
},
|
|
},
|
|
{
|
|
name: "don't merge version",
|
|
in: []ApexInfo{
|
|
{"foo", "current", false, nil, []string{"foo"}, nil},
|
|
{"bar", "30", false, nil, []string{"bar"}, nil},
|
|
},
|
|
wantMerged: []ApexInfo{
|
|
{"apex30", "30", false, nil, []string{"bar"}, nil},
|
|
{"apex10000", "current", false, nil, []string{"foo"}, nil},
|
|
},
|
|
wantAliases: [][2]string{
|
|
{"bar", "apex30"},
|
|
{"foo", "apex10000"},
|
|
},
|
|
},
|
|
{
|
|
name: "merge updatable",
|
|
in: []ApexInfo{
|
|
{"foo", "current", false, nil, []string{"foo"}, nil},
|
|
{"bar", "current", true, nil, []string{"bar"}, nil},
|
|
},
|
|
wantMerged: []ApexInfo{
|
|
{"apex10000", "current", true, nil, []string{"bar", "foo"}, nil},
|
|
},
|
|
wantAliases: [][2]string{
|
|
{"bar", "apex10000"},
|
|
{"foo", "apex10000"},
|
|
},
|
|
},
|
|
{
|
|
name: "don't merge sdks",
|
|
in: []ApexInfo{
|
|
{"foo", "current", false, SdkRefs{{"baz", "1"}}, []string{"foo"}, nil},
|
|
{"bar", "current", false, SdkRefs{{"baz", "2"}}, []string{"bar"}, nil},
|
|
},
|
|
wantMerged: []ApexInfo{
|
|
{"apex10000_baz_2", "current", false, SdkRefs{{"baz", "2"}}, []string{"bar"}, nil},
|
|
{"apex10000_baz_1", "current", false, SdkRefs{{"baz", "1"}}, []string{"foo"}, nil},
|
|
},
|
|
wantAliases: [][2]string{
|
|
{"bar", "apex10000_baz_2"},
|
|
{"foo", "apex10000_baz_1"},
|
|
},
|
|
},
|
|
}
|
|
for _, tt := range tests {
|
|
t.Run(tt.name, func(t *testing.T) {
|
|
config := TestConfig(buildDir, nil, "", nil)
|
|
ctx := &configErrorWrapper{config: config}
|
|
gotMerged, gotAliases := mergeApexVariations(ctx, tt.in)
|
|
if !reflect.DeepEqual(gotMerged, tt.wantMerged) {
|
|
t.Errorf("mergeApexVariations() gotMerged = %v, want %v", gotMerged, tt.wantMerged)
|
|
}
|
|
if !reflect.DeepEqual(gotAliases, tt.wantAliases) {
|
|
t.Errorf("mergeApexVariations() gotAliases = %v, want %v", gotAliases, tt.wantAliases)
|
|
}
|
|
})
|
|
}
|
|
}
|