Add classpath fragment property to skip proto generation.
This must always be true for updatable apexes, but is not necessary for non-updatable apexes like com.android.i18n. In a follow up this will be used to figure out whether apex boot jars should be bundled into platform_bootclasspath. Bug: 191127295 Test: atest CtsClasspathsTestCases derive_classpath_test Change-Id: Ib7dc5b057cb24955222fb97f3ff9da079f30ed77 Merged-In: Ib7dc5b057cb24955222fb97f3ff9da079f30ed77
This commit is contained in:
@@ -6666,6 +6666,47 @@ func TestUpdatableDefault_should_set_min_sdk_version(t *testing.T) {
|
||||
`)
|
||||
}
|
||||
|
||||
func TestUpdatable_should_not_set_generate_classpaths_proto(t *testing.T) {
|
||||
testApexError(t, `"mysystemserverclasspathfragment" .* it must not set generate_classpaths_proto to false`, `
|
||||
apex {
|
||||
name: "myapex",
|
||||
key: "myapex.key",
|
||||
systemserverclasspath_fragments: [
|
||||
"mysystemserverclasspathfragment",
|
||||
],
|
||||
min_sdk_version: "29",
|
||||
updatable: true,
|
||||
}
|
||||
|
||||
apex_key {
|
||||
name: "myapex.key",
|
||||
public_key: "testkey.avbpubkey",
|
||||
private_key: "testkey.pem",
|
||||
}
|
||||
|
||||
java_library {
|
||||
name: "foo",
|
||||
srcs: ["b.java"],
|
||||
min_sdk_version: "29",
|
||||
installable: true,
|
||||
apex_available: [
|
||||
"myapex",
|
||||
],
|
||||
}
|
||||
|
||||
systemserverclasspath_fragment {
|
||||
name: "mysystemserverclasspathfragment",
|
||||
generate_classpaths_proto: false,
|
||||
contents: [
|
||||
"foo",
|
||||
],
|
||||
apex_available: [
|
||||
"myapex",
|
||||
],
|
||||
}
|
||||
`)
|
||||
}
|
||||
|
||||
func TestNoUpdatableJarsInBootImage(t *testing.T) {
|
||||
// Set the BootJars in dexpreopt.GlobalConfig and productVariables to the same value. This can
|
||||
// result in an invalid configuration as it does not set the ArtApexJars and allows art apex
|
||||
|
Reference in New Issue
Block a user