summaryrefslogtreecommitdiff
path: root/java/systemserver_classpath_fragment.go
AgeCommit message (Collapse)Author
2021-07-06Use both module name and stem name to filter updatable boot jarsPaul Duffin
Sometimes the stem property is set to change both the installed file name and the name use to filter the configured module list, e.g. when adding a test library to replace the standard library, e.g. test_foo instead of foo. Sometimes it is used just to change the installed file name. This change uses both to filter the updatable boot jars and not just the stem. Bug: 180105615 Test: m nothing Merged-In: I6c459fc3597b1e4f062bc9a4e52843305b538c5f Change-Id: I6c459fc3597b1e4f062bc9a4e52843305b538c5f (cherry picked from commit 56c93e899a355311463d41e988c9ba511af14278)
2021-07-01Ensure that systemserverclasspath_fragment does not depend on prebuiltsPaul Duffin
Bug: 190037398 Test: m nothing Change-Id: I85671613c70bbfe8adde1d24d7f59ed7b53a8120
2021-05-27Treat java libraries in classpath fragments as directly in apexColin Cross
Coverage is applied to java libraries that are directly in an apex. Mark java libraries that are in an apex through a bootclasspath_fragment or a systemserverclasspath_fragment as directly in the apex by implementing CopyDirectlyInAnyApexTag on the dependency tags used for their contents. Bug: 183759446 Test: TestApexJavaCoverage Change-Id: I0116f5f415083b5194000988cb257454ef115200 Merged-In: I0116f5f415083b5194000988cb257454ef115200 (cherry picked from commit c33e5216f1eb3f837dee89cc65208eff058e9c5e)
2021-05-25Use stem when filtering boot jars.satayev
For testing purposes, a boot jar may be provided by a test java_library that has a different content name, but sets "stem" property to match the original java_library. Given that Stem() returns either the property value or module name, it is safe to replace all content names by their stems. Bug: 180105615 Test: atest CtsClasspathsTestCases sdkextensions_e2e_tests Change-Id: Ic519ffa0c5b616abddf15b41c934421dfac2e78a
2021-05-25Populate individual systemserverclasspath_fragments' proto configs.satayev
Bug: 180105615 Test: m && launch_cvd; atest CtsClasspathsTestCases Change-Id: Ic0ae897e9baca75dcc022d84656496563645e74e Merged-In: Ic0ae897e9baca75dcc022d84656496563645e74e
2021-05-20Populate individual classpath_fragments' classpaths.proto configs.satayev
To avoid duplicates on *CLASSPATH environ variables at runtime, remove split entries from platform-*classpath, i.e. all updatable jars that have their own classpath fragments should not appear in the platform-*classpath's classpaths.proto config. Bug: 180105615 Test: m && launch_cvd; atest CtsClasspathsTestCases Change-Id: Id2759ab8e106cc183e695bf3509a6ab60ab0ef2a
2021-05-18Add systemserverclasspath_fragments property to apex.satayev
- All contents of the fragment are added as java_lib dependencies. - Generated classpaths.proto is added into etc as required. Bug: 180105615 Test: m nothing Merged-In: I8e8e8b019c4ca2909182f205a47deffa946de6da Change-Id: I8e8e8b019c4ca2909182f205a47deffa946de6da (cherry picked from commit 333a1732b17887260f2290ffacffffeff760eee5)
2021-05-18Add "contents" property to systemserverclasspath_fragment.satayev
Similar to bcp_fragment's contents, this property lists all java library contributions made by this fragment. Bug: 180105615 Test: m nothing Merged-In: Ifb1f54d5db290fffaa31933d15207014bb72d2fb Change-Id: Ifb1f54d5db290fffaa31933d15207014bb72d2fb (cherry picked from commit 9366a053da11ba44c9d70671dfac7c294c5427d0)
2021-05-18Add no-op systemserverclasspath_fragment module.satayev
This would allow to start introducing these modules for apexes that contribute to SYSTEMSERVERCLASSPATH. In follow up, it will be evolved: - platform_systemserverclasspath would have "fragments" property to list all individual systemserverclasspath_fragments; - systemserverclasspath_fragment would have "contents" property to list contibuting java libs; - systemserverclasspath_fragment would generate non-empty classpaths.proto config within individual apexes. Bug: 180105615 Test: m nothing Merged-In: Ibaaa3fae5f1eab9a41ceecc1214a53be6bbc8ba6 Change-Id: Ibaaa3fae5f1eab9a41ceecc1214a53be6bbc8ba6 (cherry picked from commit aa86bac2b01f7565f1ea8ec7c88308ef5ed6e7e2)
2021-05-07Declare ConfiguredJarList in specific fragment implementations.satayev
Each specific classpath_fragment module knows what jars must be part of the corresponding classpaths.proto config. Note that bootclasspath_fragment does not implement classpath_fragment yet, thus all boot jars and all system server jars go into corresponding platform classpaths. Bug: 180105615 Test: m && launch_cvd; atest CtsClasspathsTestCases Change-Id: I6a8c7b0a5d17d62e790a441b8e2c5c1a816e7f30
2021-05-07Split SYSTEMSERVERCLASSPATH entries from platform_bootclasspath.satayev
Boot jars are different to system server jars at build level, due to added complexity of dexpreopt. As a logical separation add a new classpath fragment type and split existing classpaths.proto generation into relevant pieces. Bug: 180105615 Test: m && launch_cvd; atest CtsClasspathsTestCases Change-Id: I88bec09fc920166ffd0092faef980754ddeb6593