diff options
| author | satayev <satayev@google.com> | 2021-06-15 16:49:50 +0100 |
|---|---|---|
| committer | satayev <satayev@google.com> | 2021-06-17 12:59:33 +0100 |
| commit | b98371cc1353145fb846017e577e11c9c8b2d9af (patch) | |
| tree | 224a47fce57bfeee99a5ed3e29c6748c4d947d6d /apex/systemserver_classpath_fragment_test.go | |
| parent | 68c8dd019ce159b738f5a0925f7e3cb875ef0221 (diff) | |
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
Diffstat (limited to 'apex/systemserver_classpath_fragment_test.go')
| -rw-r--r-- | apex/systemserver_classpath_fragment_test.go | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/apex/systemserver_classpath_fragment_test.go b/apex/systemserver_classpath_fragment_test.go index 95b6e230d..537f51d95 100644 --- a/apex/systemserver_classpath_fragment_test.go +++ b/apex/systemserver_classpath_fragment_test.go @@ -76,3 +76,54 @@ func TestSystemserverclasspathFragmentContents(t *testing.T) { `mysystemserverclasspathfragment`, }) } + +func TestSystemserverclasspathFragmentNoGeneratedProto(t *testing.T) { + result := android.GroupFixturePreparers( + prepareForTestWithSystemserverclasspathFragment, + prepareForTestWithMyapex, + ).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`, + }) +} |
