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
106 lines
2.5 KiB
Text
106 lines
2.5 KiB
Text
bootstrap_go_package {
|
|
name: "soong-android",
|
|
pkgPath: "android/soong/android",
|
|
deps: [
|
|
"blueprint",
|
|
"blueprint-bootstrap",
|
|
"sbox_proto",
|
|
"soong",
|
|
"soong-android-soongconfig",
|
|
"soong-bazel",
|
|
"soong-env",
|
|
"soong-shared",
|
|
"soong-ui-metrics_proto",
|
|
],
|
|
srcs: [
|
|
"androidmk.go",
|
|
"apex.go",
|
|
"api_levels.go",
|
|
"arch.go",
|
|
"arch_list.go",
|
|
"bazel_handler.go",
|
|
"config.go",
|
|
"csuite_config.go",
|
|
"deapexer.go",
|
|
"defaults.go",
|
|
"defs.go",
|
|
"depset_generic.go",
|
|
"depset_paths.go",
|
|
"deptag.go",
|
|
"expand.go",
|
|
"filegroup.go",
|
|
"hooks.go",
|
|
"image.go",
|
|
"license.go",
|
|
"license_kind.go",
|
|
"licenses.go",
|
|
"makefile_goal.go",
|
|
"makevars.go",
|
|
"metrics.go",
|
|
"module.go",
|
|
"mutator.go",
|
|
"namespace.go",
|
|
"neverallow.go",
|
|
"ninja_deps.go",
|
|
"notices.go",
|
|
"onceper.go",
|
|
"override_module.go",
|
|
"package.go",
|
|
"package_ctx.go",
|
|
"packaging.go",
|
|
"path_properties.go",
|
|
"paths.go",
|
|
"phony.go",
|
|
"prebuilt.go",
|
|
"prebuilt_build_tool.go",
|
|
"proto.go",
|
|
"queryview.go",
|
|
"register.go",
|
|
"rule_builder.go",
|
|
"sandbox.go",
|
|
"sdk.go",
|
|
"singleton.go",
|
|
"singleton_module.go",
|
|
"soong_config_modules.go",
|
|
"test_suites.go",
|
|
"testing.go",
|
|
"util.go",
|
|
"variable.go",
|
|
"visibility.go",
|
|
"writedocs.go",
|
|
|
|
// Lock down environment access last
|
|
"env.go",
|
|
],
|
|
testSrcs: [
|
|
"android_test.go",
|
|
"androidmk_test.go",
|
|
"apex_test.go",
|
|
"arch_test.go",
|
|
"config_test.go",
|
|
"csuite_config_test.go",
|
|
"depset_test.go",
|
|
"deptag_test.go",
|
|
"expand_test.go",
|
|
"license_kind_test.go",
|
|
"license_test.go",
|
|
"licenses_test.go",
|
|
"module_test.go",
|
|
"mutator_test.go",
|
|
"namespace_test.go",
|
|
"neverallow_test.go",
|
|
"ninja_deps_test.go",
|
|
"onceper_test.go",
|
|
"package_test.go",
|
|
"packaging_test.go",
|
|
"path_properties_test.go",
|
|
"paths_test.go",
|
|
"prebuilt_test.go",
|
|
"rule_builder_test.go",
|
|
"singleton_module_test.go",
|
|
"soong_config_modules_test.go",
|
|
"util_test.go",
|
|
"variable_test.go",
|
|
"visibility_test.go",
|
|
],
|
|
}
|