cb13b5d1bd
In the past, dexpreopt for boot jars was very inflexible, and it was incredibly hard to make a change that is as simple as adding a jar to a boot image. Boot image generation was handled by "platform_bootclasspath" and "bootclasspath_fragment" separately. This caused not only code duplication but also the inflexiblity as such a design did not fit today's use cases, where a boot image may take jars from multiple mainline modules and the platform, and a mainline module can contribute to multiple boot images. The design casued a huge maintenance burden as any change to the boot image cost multi-week efforts. In recent years, efforts have been made to improve this a bit by a bit. This change is another step towards making dexpreopt reasonable. After this change, all boot images are generated by "dex_bootjars", which is in build/soong and is therefore available on both the full source tree and the thin manifest (master-art). The change decouples profile generation/extraction from boot image generation. Profiles for mainline modules are still handled by "bootclasspath_fragment" because they need to be packed into APEXes when building mainline modules and extracted from APEXes whem building the system image from prebuilt modules. Boot images are not handled by "bootclasspath_fragment" anymore. Bug: 290583827 Test: m (all existing tests are still passing) Test: Manually checked that the boot images are exactly the same as before. Change-Id: Ib5a5f401bee334ffcab5c26618e0c8888b84575a
57 lines
1.6 KiB
Go
57 lines
1.6 KiB
Go
// Copyright 2022 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 java
|
|
|
|
import (
|
|
"runtime"
|
|
"sort"
|
|
"testing"
|
|
|
|
"android/soong/android"
|
|
)
|
|
|
|
func TestBootImageConfig(t *testing.T) {
|
|
if runtime.GOOS != "linux" {
|
|
t.Skipf("Skipping as boot image config test is only supported on linux not %s", runtime.GOOS)
|
|
}
|
|
|
|
result := android.GroupFixturePreparers(
|
|
PrepareForBootImageConfigTest,
|
|
PrepareApexBootJarConfigs,
|
|
).RunTest(t)
|
|
|
|
CheckArtBootImageConfig(t, result)
|
|
CheckFrameworkBootImageConfig(t, result)
|
|
CheckMainlineBootImageConfig(t, result)
|
|
}
|
|
|
|
func TestImageNames(t *testing.T) {
|
|
result := android.GroupFixturePreparers(
|
|
PrepareForBootImageConfigTest,
|
|
).RunTest(t)
|
|
|
|
names := getImageNames()
|
|
sort.Strings(names)
|
|
|
|
ctx := &android.TestPathContext{TestResult: result}
|
|
configs := genBootImageConfigs(ctx)
|
|
namesFromConfigs := make([]string, 0, len(configs))
|
|
for name, _ := range configs {
|
|
namesFromConfigs = append(namesFromConfigs, name)
|
|
}
|
|
sort.Strings(namesFromConfigs)
|
|
|
|
android.AssertArrayString(t, "getImageNames vs genBootImageConfigs", names, namesFromConfigs)
|
|
}
|