064b70c918
Dexpreopt and boot jars package check all require access to dex implementation jars created for java_library and java_sdk_library. They were available when building from source but not when building from prebuilts, even though they are embedded within the .apex files that are referenced from prebuilt_apex. This changes adds support to prebuilt_apex to export the dex implementation jars and updates java_import to use those exported dex implementation jars. In a source build dexpreopt/boot jars package check access the apex (or platform) specific variant of a java_library, e.g. core-oj, from which it retrieves the dex implementation jar path. After this change in a prebuilt build dexpreopt/boot jars package check behave in the same way except in this case they retrieve the dex implementation jar path from the apex (or platform) specific variant of the java_import, e.g. core-oj. The work to export files from a `.apex` file for use by other modules is performed by a new `deapexer` module type. It is not used directly in an `Android.bp` file but instead is created implicitly by `prebuilt_apex`, In order to do that this contains the following changes: * Adds a new `dexapexer` module type to handle the exporting of files from the `.apex` file. * Adds an exported_java_libs property to prebuilt_apex to specify the set of libraries whose dex implementation jars need exporting. * Creates apex specific variants of the libraries listed in the exported_java_libs property. * Adds the set of exported files to the ApexInfo to make them available to the apex specific variants. * Prevents the prebuilt_apex variants from being merged together as they will not be compatible. * Modifies java_import to use the exported file for variants of a prebuilt_apex. * Adds a ninja rule to unpack (using deapexer) the contents of the prebuilt_apex's apex file, verify that the required files are present and make them available as outputs for other rules to use. * Some minor refactorings to support these changes. * Adds tests to cover prebuilt only, prebuilt with source preferred, and prebuilt preferred with source. Test: m nothing Bug: 171061220 Change-Id: Ic9bed81fb65b92f0d59f64c0bce168a9ed44cfac |
||
---|---|---|
.. | ||
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 | ||
boot_jars.go | ||
builder.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 | ||
gen.go | ||
genrule.go | ||
hiddenapi.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_compat_config.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 | ||
sysprop.go | ||
system_modules.go | ||
testing.go | ||
tradefed.go |