StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "bootclasspath_fragment: Always output contents property in snapshot" am: aef7fcfa7e

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1686127

Change-Id: Ia0074f40dc513aef2bb0079b6faf5eb476c663fc
This commit is contained in:
Paul Duffin
2021-04-26 22:50:06 +00:00
committed by Automerger Merge Worker
parent 7d43ff1fd8 aef7fcfa7e
commit 817d462f97
2 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/bootclasspath_fragment.go
View File

@@ -428,12 +428,7 @@ func (b *bootclasspathFragmentSdkMemberProperties) PopulateFromVariant(ctx andro
module := variant.(*BootclasspathFragmentModule) module := variant.(*BootclasspathFragmentModule)
b.Image_name = module.properties.Image_name b.Image_name = module.properties.Image_name
if b.Image_name == nil {
// Only one of image_name or contents can be specified. However, if image_name is set then the
// contents property is updated to match the configuration used to create the corresponding
// boot image. Therefore, contents property is only copied if the image name is not specified.
b.Contents = module.properties.Contents b.Contents = module.properties.Contents
}
// Get the flag file information from the module. // Get the flag file information from the module.
mctx := ctx.SdkModuleContext() mctx := ctx.SdkModuleContext()

2
sdk/bootclasspath_fragment_sdk_test.go
View File

@@ -113,6 +113,7 @@ prebuilt_bootclasspath_fragment {
visibility: ["//visibility:public"], visibility: ["//visibility:public"],
apex_available: ["com.android.art"], apex_available: ["com.android.art"],
image_name: "art", image_name: "art",
contents: ["mybootlib"],
} }
java_import { java_import {
@@ -132,6 +133,7 @@ prebuilt_bootclasspath_fragment {
visibility: ["//visibility:public"], visibility: ["//visibility:public"],
apex_available: ["com.android.art"], apex_available: ["com.android.art"],
image_name: "art", image_name: "art",
contents: ["mysdk_mybootlib@current"],
} }
java_import { java_import {