openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge changes If673d482,I98b575b8 am: 38e2fbdc90 am: 6b178d6f7b 

Change-Id: I19d639148a482fc950bd9f877359164822047128
This commit is contained in:
Paul Duffin 2020-05-07 16:15:10 +00:00 committed by Automerger Merge Worker
parent fe576ad672 6b178d6f7b
commit 6b0635adf1
2 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
android/sdk.go
View File

@ -331,13 +331,7 @@ type SdkMemberType interface {
// Add a prebuilt module that the sdk will populate.
//
// Returning nil from this will cause the sdk module type to use the deprecated BuildSnapshot
// method to build the snapshot. That method is deprecated because it requires the SdkMemberType
// implementation to do all the word.
//
// Otherwise, returning a non-nil value from this will cause the sdk module type to do the
// majority of the work to generate the snapshot. The sdk module code generates the snapshot
// as follows:
// The sdk module code generates the snapshot as follows:
//
// * A properties struct of type SdkMemberProperties is created for each variant and
// populated with information from the variant by calling PopulateFromVariant(SdkAware)

15
sdk/sdk_test.go
View File

@ -283,7 +283,7 @@ func TestCommonValueOptimization(t *testing.T) {
extractor.extractCommonProperties(common, structs)
h := TestHelper{t}
h.AssertDeepEquals("common properties not correct", common,
h.AssertDeepEquals("common properties not correct",
&testPropertiesStruct{
private: "",
Public_Kept: "",
@ -297,9 +297,10 @@ func TestCommonValueOptimization(t *testing.T) {
S_Embedded_Common: "embedded_common",
S_Embedded_Different: "",
},
})
},
common)
h.AssertDeepEquals("updated properties[0] not correct", structs[0],
h.AssertDeepEquals("updated properties[0] not correct",
&testPropertiesStruct{
private: "common",
Public_Kept: "common",
@ -313,9 +314,10 @@ func TestCommonValueOptimization(t *testing.T) {
S_Embedded_Common: "",
S_Embedded_Different: "embedded_upper",
},
})
},
structs[0])
h.AssertDeepEquals("updated properties[1] not correct", structs[1],
h.AssertDeepEquals("updated properties[1] not correct",
&testPropertiesStruct{
private: "common",
Public_Kept: "common",
@ -329,5 +331,6 @@ func TestCommonValueOptimization(t *testing.T) {
S_Embedded_Common: "",
S_Embedded_Different: "embedded_lower",
},
})
},
structs[1])
}