de534414b3
This reverts commit bf0e47648a.
Reason for revert: coverage build with EMMA_INSTRUMENT_FRAMEWORK=true
is fixed by inspecting the environment variable and not generating
boot image in case it is set.
Dexpreopt artifacts for the libcore part of the boot class path are
now packaged in the ART apex. The system image still contains
dexpreopt artifacts for the full set of boot class path libraries
(both libcore and framework); the libcore part will be removed and
boot image extension will be used in a follow-up CL.
Since this is specific to the ART apex and makes no sense for other
apexes, the implementation adds a boolean flag "is ART apex" rather
than a new apex module property.
Build rules for the new set of dexpreopt artifacts are created using
a new variant of the global boot image config. Previously we had two
variants: "default" (for the system image) and "apex" (for the
JIT-zygote experiment). This patch adds a third "art" variant.
Test: m
Test: m art/build/apex/runtests.sh
Bug: 144091989
Change-Id: I113c0d39222d6d697cb62cd09d5010607872fc2b
113 lines
3.1 KiB
Go
113 lines
3.1 KiB
Go
// Copyright 2019 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 (
|
|
"path/filepath"
|
|
"reflect"
|
|
"sort"
|
|
"testing"
|
|
|
|
"android/soong/android"
|
|
"android/soong/dexpreopt"
|
|
)
|
|
|
|
func TestDexpreoptBootJars(t *testing.T) {
|
|
bp := `
|
|
java_sdk_library {
|
|
name: "foo",
|
|
srcs: ["a.java"],
|
|
api_packages: ["foo"],
|
|
}
|
|
|
|
java_library {
|
|
name: "bar",
|
|
srcs: ["b.java"],
|
|
installable: true,
|
|
}
|
|
|
|
dex_import {
|
|
name: "baz",
|
|
jars: ["a.jar"],
|
|
}
|
|
`
|
|
|
|
config := testConfig(nil)
|
|
|
|
pathCtx := android.PathContextForTesting(config, nil)
|
|
dexpreoptConfig := dexpreopt.GlobalConfigForTests(pathCtx)
|
|
dexpreoptConfig.ArtApexJars = []string{"foo", "bar", "baz"}
|
|
setDexpreoptTestGlobalConfig(config, dexpreoptConfig)
|
|
|
|
ctx := testContext(bp, nil)
|
|
|
|
ctx.RegisterSingletonType("dex_bootjars", android.SingletonFactoryAdaptor(dexpreoptBootJarsFactory))
|
|
|
|
run(t, ctx, config)
|
|
|
|
dexpreoptBootJars := ctx.SingletonForTests("dex_bootjars")
|
|
|
|
bootArt := dexpreoptBootJars.Output("boot.art")
|
|
|
|
expectedInputs := []string{
|
|
"dex_bootjars_input/foo.jar",
|
|
"dex_bootjars_input/bar.jar",
|
|
"dex_bootjars_input/baz.jar",
|
|
}
|
|
|
|
for i := range expectedInputs {
|
|
expectedInputs[i] = filepath.Join(buildDir, "test_device", expectedInputs[i])
|
|
}
|
|
|
|
inputs := bootArt.Implicits.Strings()
|
|
sort.Strings(inputs)
|
|
sort.Strings(expectedInputs)
|
|
|
|
if !reflect.DeepEqual(inputs, expectedInputs) {
|
|
t.Errorf("want inputs %q\n got inputs %q", expectedInputs, inputs)
|
|
}
|
|
|
|
expectedOutputs := []string{
|
|
"dex_bootjars/system/framework/arm64/boot.invocation",
|
|
|
|
"dex_bootjars/system/framework/arm64/boot.art",
|
|
"dex_bootjars/system/framework/arm64/boot-bar.art",
|
|
"dex_bootjars/system/framework/arm64/boot-baz.art",
|
|
|
|
"dex_bootjars/system/framework/arm64/boot.oat",
|
|
"dex_bootjars/system/framework/arm64/boot-bar.oat",
|
|
"dex_bootjars/system/framework/arm64/boot-baz.oat",
|
|
|
|
"dex_bootjars/system/framework/arm64/boot.vdex",
|
|
"dex_bootjars/system/framework/arm64/boot-bar.vdex",
|
|
"dex_bootjars/system/framework/arm64/boot-baz.vdex",
|
|
|
|
"dex_bootjars_unstripped/system/framework/arm64/boot.oat",
|
|
"dex_bootjars_unstripped/system/framework/arm64/boot-bar.oat",
|
|
"dex_bootjars_unstripped/system/framework/arm64/boot-baz.oat",
|
|
}
|
|
|
|
for i := range expectedOutputs {
|
|
expectedOutputs[i] = filepath.Join(buildDir, "test_device", expectedOutputs[i])
|
|
}
|
|
|
|
outputs := append(android.WritablePaths{bootArt.Output}, bootArt.ImplicitOutputs...).Strings()
|
|
sort.Strings(outputs)
|
|
sort.Strings(expectedOutputs)
|
|
|
|
if !reflect.DeepEqual(outputs, expectedOutputs) {
|
|
t.Errorf("want outputs %q\n got outputs %q", expectedOutputs, outputs)
|
|
}
|
|
}
|