diff options
| author | Paul Duffin <paulduffin@google.com> | 2022-10-04 20:01:04 +0100 |
|---|---|---|
| committer | Paul Duffin <paulduffin@google.com> | 2022-10-06 11:06:53 +0100 |
| commit | 20d90e3e51ae85abb8c4133b19197201cae84ed1 (patch) | |
| tree | 4f0a48349caea831447dac390977e9bcefe16049 /sdk | |
| parent | 8eb4573b232accd19c9cd3b9d1b99572d4fe2c16 (diff) | |
Prevent bootImageVariant.licenseMetadataFile being set twice
Previously, in a build containing source and prebuilt art
bootclasspath_fragments, the bootImageVariant.licenseMetadataFile was
set twice with the source always being set after the prebuilt and
so winning.
This change only sets bootImageVariant.licenseMetadataFile for the
active module so it will use the prebuilt's license file if that is
preferred.
Bug: 245956352
Test: m nothing
Change-Id: I948c7e5123169452f67c85ad98c4bbdb90a5d2de
Diffstat (limited to 'sdk')
| -rw-r--r-- | sdk/bootclasspath_fragment_sdk_test.go | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/sdk/bootclasspath_fragment_sdk_test.go b/sdk/bootclasspath_fragment_sdk_test.go index 6faa0c5b9..1b64130ce 100644 --- a/sdk/bootclasspath_fragment_sdk_test.go +++ b/sdk/bootclasspath_fragment_sdk_test.go @@ -215,8 +215,7 @@ java_import { // Check the behavior of the snapshot when it is preferred. snapshotTestChecker(checkSnapshotPreferredWithSource, func(t *testing.T, result *android.TestResult) { - // TODO - the expectedLicenseMetadataFile passed here is incorrect as it is for the source module not the prebuilt module. - java.CheckMutatedArtBootImageConfig(t, result, "out/soong/.intermediates/mybootclasspathfragment/android_common_apex10000/meta_lic") + java.CheckMutatedArtBootImageConfig(t, result, "out/soong/.intermediates/snapshot/prebuilt_mybootclasspathfragment/android_common_com.android.art/meta_lic") java.CheckMutatedFrameworkBootImageConfig(t, result, "out/soong/.intermediates/frameworks/base/boot/platform-bootclasspath/android_common/meta_lic") }), ) |