60264a0b99
Boot jars, updatable boot jars and art apex jars are part of two separate but related configuration objects, the main Config struct (actually the nested productVariables struct) and the dexpreopt specific GlobalConfig. The fields in both are initialized from the same data in the make config files but handled separately. Previously each test that used one of the configuration objects would generally just initialize the one it used. That would make the test sensitive to the specific configuration object that was used. A refactoring that change the code from using one configuration object to the other would cause the test to fail. Also, some tests would inadvertently create invalid configurations by setting ArtApexJars without also setting BootJars. While the ability to create invalid configurations is useful (and there are some tests that exist to verify the behavior in that case) most tests should not be using them. This change simplifies the configuration of the tests and improves their realism by: 1. Providing a new FixtureConfigureBootJars method that takes a set of boot jars and sets ArtApexJars, and BootJars in the dexpreopt.GlobalConfig and BootJars in the product variables too. 2. Providing a new FixtureConfigureUpdatableBootJars method that takes a set of boot jars and sets UpdatableBootJars in both the dexpreopt.GlobalConfig and productVariables. 3. Migrating existing tests to use these new methods. Some tests still use the dexpreopt.FixtureSet...Jars() methods directly, generally to create invalid configurations. Bug: 177892522 Test: m nothing Change-Id: I4d8f0b9762cfcc7ae6383bef08563d7c3fa13955 |
||
---|---|---|
.. | ||
config | ||
aapt2.go | ||
aar.go | ||
Android.bp | ||
android_manifest.go | ||
android_resources.go | ||
androidmk.go | ||
androidmk_test.go | ||
app.go | ||
app_builder.go | ||
app_import.go | ||
app_import_test.go | ||
app_set.go | ||
app_set_test.go | ||
app_test.go | ||
base.go | ||
boot_image.go | ||
boot_image_test.go | ||
boot_jars.go | ||
builder.go | ||
classpath_fragment.go | ||
device_host_converter.go | ||
device_host_converter_test.go | ||
dex.go | ||
dexpreopt.go | ||
dexpreopt_bootjars.go | ||
dexpreopt_bootjars_test.go | ||
dexpreopt_config.go | ||
dexpreopt_test.go | ||
droiddoc.go | ||
droiddoc_test.go | ||
droidstubs.go | ||
droidstubs_test.go | ||
gen.go | ||
genrule.go | ||
hiddenapi.go | ||
hiddenapi_modular.go | ||
hiddenapi_singleton.go | ||
hiddenapi_singleton_test.go | ||
jacoco.go | ||
jacoco_test.go | ||
java.go | ||
java_resources.go | ||
java_test.go | ||
jdeps.go | ||
jdeps_test.go | ||
kotlin.go | ||
kotlin_test.go | ||
legacy_core_platform_api_usage.go | ||
lint.go | ||
lint_defaults.txt | ||
OWNERS | ||
platform_bootclasspath.go | ||
platform_bootclasspath_test.go | ||
platform_compat_config.go | ||
platform_compat_config_test.go | ||
plugin.go | ||
plugin_test.go | ||
prebuilt_apis.go | ||
proto.go | ||
robolectric.go | ||
rro.go | ||
rro_test.go | ||
sdk.go | ||
sdk_library.go | ||
sdk_library_external.go | ||
sdk_test.go | ||
support_libraries.go | ||
system_modules.go | ||
system_modules_test.go | ||
testing.go | ||
tradefed.go |