81e468171f
After this change, if "profile_guided: true" is set, profile-guided
compilation will be enabled for the jar and the ".prof" file next to
the jar in the APEX ("javalib/<name>.jar.prof") will be used as the
profile when dexpreopting for the prebuilt APEX.
Bug: 241823638
Test: m nothing
Test: -
1. (on internal master) Patch aosp/2426453.
2. Build the APEX bundle and the module SDK of com.android.wifi
3. (on tm-dev) Patch this CL and aosp/2141972.
4. Copy the APEX bundle and the module SDK built on step 2 to the
source tree
5. Disable hiddenapi check
6. lunch cf_x86_64_phone-userdebug && m MODULE_BUILD_FROM_SOURCE=false com.google.android.wifi
7. cat out/soong/.intermediates/prebuilts/module_sdk/Wifi/current/prebuilt_service-wifi/android_common_com.android.wifi/dexpreopt/oat/x86_64/javalib.invocation
8. See the profile being used.
Change-Id: I55a5a295e9c5d6f0564afb139c5fb7da91ab8cae
452 lines
10 KiB
Go
452 lines
10 KiB
Go
// Copyright (C) 2021 The Android Open Source Project
|
|
//
|
|
// 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 apex
|
|
|
|
import (
|
|
"strings"
|
|
"testing"
|
|
|
|
"android/soong/android"
|
|
"android/soong/dexpreopt"
|
|
"android/soong/java"
|
|
)
|
|
|
|
var prepareForTestWithSystemserverclasspathFragment = android.GroupFixturePreparers(
|
|
java.PrepareForTestWithDexpreopt,
|
|
PrepareForTestWithApexBuildComponents,
|
|
)
|
|
|
|
func TestSystemserverclasspathFragmentContents(t *testing.T) {
|
|
result := android.GroupFixturePreparers(
|
|
prepareForTestWithSystemserverclasspathFragment,
|
|
prepareForTestWithMyapex,
|
|
dexpreopt.FixtureSetApexSystemServerJars("myapex:foo", "myapex:bar", "myapex:baz"),
|
|
).RunTestWithBp(t, `
|
|
apex {
|
|
name: "myapex",
|
|
key: "myapex.key",
|
|
systemserverclasspath_fragments: [
|
|
"mysystemserverclasspathfragment",
|
|
],
|
|
updatable: false,
|
|
}
|
|
|
|
apex_key {
|
|
name: "myapex.key",
|
|
public_key: "testkey.avbpubkey",
|
|
private_key: "testkey.pem",
|
|
}
|
|
|
|
java_library {
|
|
name: "foo",
|
|
srcs: ["b.java"],
|
|
installable: true,
|
|
apex_available: [
|
|
"myapex",
|
|
],
|
|
}
|
|
|
|
java_library {
|
|
name: "bar",
|
|
srcs: ["c.java"],
|
|
installable: true,
|
|
dex_preopt: {
|
|
profile: "bar-art-profile",
|
|
},
|
|
apex_available: [
|
|
"myapex",
|
|
],
|
|
}
|
|
|
|
java_library {
|
|
name: "baz",
|
|
srcs: ["d.java"],
|
|
installable: true,
|
|
dex_preopt: {
|
|
profile_guided: true, // ignored
|
|
},
|
|
apex_available: [
|
|
"myapex",
|
|
],
|
|
}
|
|
|
|
systemserverclasspath_fragment {
|
|
name: "mysystemserverclasspathfragment",
|
|
contents: [
|
|
"foo",
|
|
"bar",
|
|
"baz",
|
|
],
|
|
apex_available: [
|
|
"myapex",
|
|
],
|
|
}
|
|
`)
|
|
|
|
ctx := result.TestContext
|
|
|
|
ensureExactContents(t, ctx, "myapex", "android_common_myapex_image", []string{
|
|
"etc/classpaths/systemserverclasspath.pb",
|
|
"javalib/foo.jar",
|
|
"javalib/bar.jar",
|
|
"javalib/bar.jar.prof",
|
|
"javalib/baz.jar",
|
|
})
|
|
|
|
java.CheckModuleDependencies(t, ctx, "myapex", "android_common_myapex_image", []string{
|
|
`myapex.key`,
|
|
`mysystemserverclasspathfragment`,
|
|
})
|
|
|
|
assertProfileGuided(t, ctx, "foo", "android_common_apex10000", false)
|
|
assertProfileGuided(t, ctx, "bar", "android_common_apex10000", true)
|
|
assertProfileGuided(t, ctx, "baz", "android_common_apex10000", false)
|
|
}
|
|
|
|
func TestSystemserverclasspathFragmentNoGeneratedProto(t *testing.T) {
|
|
result := android.GroupFixturePreparers(
|
|
prepareForTestWithSystemserverclasspathFragment,
|
|
prepareForTestWithMyapex,
|
|
dexpreopt.FixtureSetApexSystemServerJars("myapex:foo"),
|
|
).RunTestWithBp(t, `
|
|
apex {
|
|
name: "myapex",
|
|
key: "myapex.key",
|
|
systemserverclasspath_fragments: [
|
|
"mysystemserverclasspathfragment",
|
|
],
|
|
updatable: false,
|
|
}
|
|
|
|
apex_key {
|
|
name: "myapex.key",
|
|
public_key: "testkey.avbpubkey",
|
|
private_key: "testkey.pem",
|
|
}
|
|
|
|
java_library {
|
|
name: "foo",
|
|
srcs: ["b.java"],
|
|
installable: true,
|
|
apex_available: [
|
|
"myapex",
|
|
],
|
|
}
|
|
|
|
systemserverclasspath_fragment {
|
|
name: "mysystemserverclasspathfragment",
|
|
generate_classpaths_proto: false,
|
|
contents: [
|
|
"foo",
|
|
],
|
|
apex_available: [
|
|
"myapex",
|
|
],
|
|
}
|
|
`)
|
|
|
|
ensureExactContents(t, result.TestContext, "myapex", "android_common_myapex_image", []string{
|
|
"javalib/foo.jar",
|
|
})
|
|
|
|
java.CheckModuleDependencies(t, result.TestContext, "myapex", "android_common_myapex_image", []string{
|
|
`myapex.key`,
|
|
`mysystemserverclasspathfragment`,
|
|
})
|
|
}
|
|
|
|
func TestSystemServerClasspathFragmentWithContentNotInMake(t *testing.T) {
|
|
android.GroupFixturePreparers(
|
|
prepareForTestWithSystemserverclasspathFragment,
|
|
prepareForTestWithMyapex,
|
|
dexpreopt.FixtureSetApexSystemServerJars("myapex:foo"),
|
|
).
|
|
ExtendWithErrorHandler(android.FixtureExpectsAtLeastOneErrorMatchingPattern(
|
|
`in contents must also be declared in PRODUCT_APEX_SYSTEM_SERVER_JARS`)).
|
|
RunTestWithBp(t, `
|
|
apex {
|
|
name: "myapex",
|
|
key: "myapex.key",
|
|
systemserverclasspath_fragments: [
|
|
"mysystemserverclasspathfragment",
|
|
],
|
|
updatable: false,
|
|
}
|
|
|
|
apex_key {
|
|
name: "myapex.key",
|
|
public_key: "testkey.avbpubkey",
|
|
private_key: "testkey.pem",
|
|
}
|
|
|
|
java_library {
|
|
name: "foo",
|
|
srcs: ["b.java"],
|
|
installable: true,
|
|
apex_available: ["myapex"],
|
|
}
|
|
|
|
java_library {
|
|
name: "bar",
|
|
srcs: ["b.java"],
|
|
installable: true,
|
|
apex_available: ["myapex"],
|
|
}
|
|
|
|
systemserverclasspath_fragment {
|
|
name: "mysystemserverclasspathfragment",
|
|
contents: [
|
|
"foo",
|
|
"bar",
|
|
],
|
|
apex_available: [
|
|
"myapex",
|
|
],
|
|
}
|
|
`)
|
|
}
|
|
|
|
func TestPrebuiltSystemserverclasspathFragmentContents(t *testing.T) {
|
|
result := android.GroupFixturePreparers(
|
|
prepareForTestWithSystemserverclasspathFragment,
|
|
prepareForTestWithMyapex,
|
|
dexpreopt.FixtureSetApexSystemServerJars("myapex:foo", "myapex:bar"),
|
|
).RunTestWithBp(t, `
|
|
prebuilt_apex {
|
|
name: "myapex",
|
|
arch: {
|
|
arm64: {
|
|
src: "myapex-arm64.apex",
|
|
},
|
|
arm: {
|
|
src: "myapex-arm.apex",
|
|
},
|
|
},
|
|
exported_systemserverclasspath_fragments: ["mysystemserverclasspathfragment"],
|
|
}
|
|
|
|
java_import {
|
|
name: "foo",
|
|
jars: ["foo.jar"],
|
|
apex_available: [
|
|
"myapex",
|
|
],
|
|
}
|
|
|
|
java_import {
|
|
name: "bar",
|
|
jars: ["bar.jar"],
|
|
dex_preopt: {
|
|
profile_guided: true,
|
|
},
|
|
apex_available: [
|
|
"myapex",
|
|
],
|
|
}
|
|
|
|
prebuilt_systemserverclasspath_fragment {
|
|
name: "mysystemserverclasspathfragment",
|
|
prefer: true,
|
|
contents: [
|
|
"foo",
|
|
"bar",
|
|
],
|
|
apex_available: [
|
|
"myapex",
|
|
],
|
|
}
|
|
`)
|
|
|
|
ctx := result.TestContext
|
|
|
|
java.CheckModuleDependencies(t, ctx, "myapex", "android_common_myapex", []string{
|
|
`myapex.apex.selector`,
|
|
`prebuilt_mysystemserverclasspathfragment`,
|
|
})
|
|
|
|
java.CheckModuleDependencies(t, ctx, "mysystemserverclasspathfragment", "android_common_myapex", []string{
|
|
`myapex.deapexer`,
|
|
`prebuilt_bar`,
|
|
`prebuilt_foo`,
|
|
})
|
|
|
|
ensureExactDeapexedContents(t, ctx, "myapex", "android_common", []string{
|
|
"javalib/foo.jar",
|
|
"javalib/bar.jar",
|
|
"javalib/bar.jar.prof",
|
|
})
|
|
|
|
assertProfileGuided(t, ctx, "foo", "android_common_myapex", false)
|
|
assertProfileGuided(t, ctx, "bar", "android_common_myapex", true)
|
|
}
|
|
|
|
func TestSystemserverclasspathFragmentStandaloneContents(t *testing.T) {
|
|
result := android.GroupFixturePreparers(
|
|
prepareForTestWithSystemserverclasspathFragment,
|
|
prepareForTestWithMyapex,
|
|
dexpreopt.FixtureSetApexStandaloneSystemServerJars("myapex:foo", "myapex:bar", "myapex:baz"),
|
|
).RunTestWithBp(t, `
|
|
apex {
|
|
name: "myapex",
|
|
key: "myapex.key",
|
|
systemserverclasspath_fragments: [
|
|
"mysystemserverclasspathfragment",
|
|
],
|
|
updatable: false,
|
|
}
|
|
|
|
apex_key {
|
|
name: "myapex.key",
|
|
public_key: "testkey.avbpubkey",
|
|
private_key: "testkey.pem",
|
|
}
|
|
|
|
java_library {
|
|
name: "foo",
|
|
srcs: ["b.java"],
|
|
installable: true,
|
|
apex_available: [
|
|
"myapex",
|
|
],
|
|
}
|
|
|
|
java_library {
|
|
name: "bar",
|
|
srcs: ["c.java"],
|
|
dex_preopt: {
|
|
profile: "bar-art-profile",
|
|
},
|
|
installable: true,
|
|
apex_available: [
|
|
"myapex",
|
|
],
|
|
}
|
|
|
|
java_library {
|
|
name: "baz",
|
|
srcs: ["d.java"],
|
|
dex_preopt: {
|
|
profile_guided: true, // ignored
|
|
},
|
|
installable: true,
|
|
apex_available: [
|
|
"myapex",
|
|
],
|
|
}
|
|
|
|
systemserverclasspath_fragment {
|
|
name: "mysystemserverclasspathfragment",
|
|
standalone_contents: [
|
|
"foo",
|
|
"bar",
|
|
"baz",
|
|
],
|
|
apex_available: [
|
|
"myapex",
|
|
],
|
|
}
|
|
`)
|
|
|
|
ctx := result.TestContext
|
|
|
|
ensureExactContents(t, ctx, "myapex", "android_common_myapex_image", []string{
|
|
"etc/classpaths/systemserverclasspath.pb",
|
|
"javalib/foo.jar",
|
|
"javalib/bar.jar",
|
|
"javalib/bar.jar.prof",
|
|
"javalib/baz.jar",
|
|
})
|
|
|
|
assertProfileGuided(t, ctx, "foo", "android_common_apex10000", false)
|
|
assertProfileGuided(t, ctx, "bar", "android_common_apex10000", true)
|
|
assertProfileGuided(t, ctx, "baz", "android_common_apex10000", false)
|
|
}
|
|
|
|
func TestPrebuiltStandaloneSystemserverclasspathFragmentContents(t *testing.T) {
|
|
result := android.GroupFixturePreparers(
|
|
prepareForTestWithSystemserverclasspathFragment,
|
|
prepareForTestWithMyapex,
|
|
dexpreopt.FixtureSetApexStandaloneSystemServerJars("myapex:foo", "myapex:bar"),
|
|
).RunTestWithBp(t, `
|
|
prebuilt_apex {
|
|
name: "myapex",
|
|
arch: {
|
|
arm64: {
|
|
src: "myapex-arm64.apex",
|
|
},
|
|
arm: {
|
|
src: "myapex-arm.apex",
|
|
},
|
|
},
|
|
exported_systemserverclasspath_fragments: ["mysystemserverclasspathfragment"],
|
|
}
|
|
|
|
java_import {
|
|
name: "foo",
|
|
jars: ["foo.jar"],
|
|
apex_available: [
|
|
"myapex",
|
|
],
|
|
}
|
|
|
|
java_import {
|
|
name: "bar",
|
|
jars: ["bar.jar"],
|
|
dex_preopt: {
|
|
profile_guided: true,
|
|
},
|
|
apex_available: [
|
|
"myapex",
|
|
],
|
|
}
|
|
|
|
prebuilt_systemserverclasspath_fragment {
|
|
name: "mysystemserverclasspathfragment",
|
|
prefer: true,
|
|
standalone_contents: [
|
|
"foo",
|
|
"bar",
|
|
],
|
|
apex_available: [
|
|
"myapex",
|
|
],
|
|
}
|
|
`)
|
|
|
|
ctx := result.TestContext
|
|
|
|
java.CheckModuleDependencies(t, ctx, "mysystemserverclasspathfragment", "android_common_myapex", []string{
|
|
`myapex.deapexer`,
|
|
`prebuilt_bar`,
|
|
`prebuilt_foo`,
|
|
})
|
|
|
|
ensureExactDeapexedContents(t, ctx, "myapex", "android_common", []string{
|
|
"javalib/foo.jar",
|
|
"javalib/bar.jar",
|
|
"javalib/bar.jar.prof",
|
|
})
|
|
|
|
assertProfileGuided(t, ctx, "foo", "android_common_myapex", false)
|
|
assertProfileGuided(t, ctx, "bar", "android_common_myapex", true)
|
|
}
|
|
|
|
func assertProfileGuided(t *testing.T, ctx *android.TestContext, moduleName string, variant string, expected bool) {
|
|
dexpreopt := ctx.ModuleForTests(moduleName, variant).Rule("dexpreopt")
|
|
actual := strings.Contains(dexpreopt.RuleParams.Command, "--profile-file=")
|
|
if expected != actual {
|
|
t.Fatalf("Expected profile-guided to be %v, got %v", expected, actual)
|
|
}
|
|
}
|