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

Make order of properties in snapshot module consistent

Browse Source 
Previously the compile_multilib property was added after the member
list properties at the top level but before them in the target.os
level. This change makes it always be added before them.

Bug: 186290299
Test: m nothing
Change-Id: I01fe272933fd11f7f730cc379f60fb2ce70f2114
This commit is contained in:
Paul Duffin
2021-04-24 11:34:46 +01:00
parent cc3132e496
commit 7b0259ff62
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sdk/cc_sdk_test.go
View File

@@ -157,8 +157,8 @@ sdk_snapshot {
name: "mysdk@current", name: "mysdk@current",
visibility: ["//visibility:public"], visibility: ["//visibility:public"],
host_supported: true, host_supported: true,
native_shared_libs: ["mysdk_sdkmember@current"],
compile_multilib: "64", compile_multilib: "64",
native_shared_libs: ["mysdk_sdkmember@current"],
target: { target: {
host: { host: {
enabled: false, enabled: false,
@@ -960,9 +960,9 @@ module_exports_snapshot {
visibility: ["//visibility:public"], visibility: ["//visibility:public"],
device_supported: false, device_supported: false,
host_supported: true, host_supported: true,
compile_multilib: "64",
native_binaries: ["myexports_mynativebinary@current"], native_binaries: ["myexports_mynativebinary@current"],
native_shared_libs: ["myexports_mynativelib@current"], native_shared_libs: ["myexports_mynativelib@current"],
compile_multilib: "64",
target: { target: {
host: { host: {
enabled: false, enabled: false,
@@ -1920,8 +1920,8 @@ module_exports_snapshot {
visibility: ["//visibility:public"], visibility: ["//visibility:public"],
device_supported: false, device_supported: false,
host_supported: true, host_supported: true,
native_static_libs: ["myexports_mynativelib@current"],
compile_multilib: "64", compile_multilib: "64",
native_static_libs: ["myexports_mynativelib@current"],
target: { target: {
host: { host: {
enabled: false, enabled: false,

6
sdk/update.go
View File

@@ -380,9 +380,6 @@ func (s *sdk) addSnapshotModule(ctx android.ModuleContext, builder *snapshotBuil
extractor := newCommonValueExtractor(commonDynamicMemberProperties) extractor := newCommonValueExtractor(commonDynamicMemberProperties)
extractCommonProperties(ctx, extractor, commonDynamicMemberProperties, dynamicMemberPropertiesContainers) extractCommonProperties(ctx, extractor, commonDynamicMemberProperties, dynamicMemberPropertiesContainers)
// Add properties common to all os types.
s.addMemberPropertiesToPropertySet(builder, snapshotModule, commonDynamicMemberProperties)
// Optimize other per-variant properties, besides the dynamic member lists. // Optimize other per-variant properties, besides the dynamic member lists.
type variantProperties struct { type variantProperties struct {
Compile_multilib string `android:"arch_variant"` Compile_multilib string `android:"arch_variant"`
@@ -399,11 +396,14 @@ func (s *sdk) addSnapshotModule(ctx android.ModuleContext, builder *snapshotBuil
commonVariantProperties := variantProperties{} commonVariantProperties := variantProperties{}
extractor = newCommonValueExtractor(commonVariantProperties) extractor = newCommonValueExtractor(commonVariantProperties)
extractCommonProperties(ctx, extractor, &commonVariantProperties, variantPropertiesContainers) extractCommonProperties(ctx, extractor, &commonVariantProperties, variantPropertiesContainers)
if commonVariantProperties.Compile_multilib != "" && commonVariantProperties.Compile_multilib != "both" { if commonVariantProperties.Compile_multilib != "" && commonVariantProperties.Compile_multilib != "both" {
// Compile_multilib defaults to both so only needs to be set when it's // Compile_multilib defaults to both so only needs to be set when it's
// specified and not both. // specified and not both.
snapshotModule.AddProperty("compile_multilib", commonVariantProperties.Compile_multilib) snapshotModule.AddProperty("compile_multilib", commonVariantProperties.Compile_multilib)
} }
// Add properties common to all os types.
s.addMemberPropertiesToPropertySet(builder, snapshotModule, commonDynamicMemberProperties)
targetPropertySet := snapshotModule.AddPropertySet("target") targetPropertySet := snapshotModule.AddPropertySet("target")