Merge changes If673d482,I98b575b8
* changes:
Remove reference to obsolete BuildSnapshot()
Correct order of parameters to AssertDeepEquals
diff --git a/android/sdk.go b/android/sdk.go
index 6f62f55..873e089 100644
--- a/android/sdk.go
+++ b/android/sdk.go
@@ -331,13 +331,7 @@
// 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)
diff --git a/sdk/sdk_test.go b/sdk/sdk_test.go
index 2f125e2..7ae3a03 100644
--- a/sdk/sdk_test.go
+++ b/sdk/sdk_test.go
@@ -283,7 +283,7 @@
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 @@
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 @@
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 @@
S_Embedded_Common: "",
S_Embedded_Different: "embedded_lower",
},
- })
+ },
+ structs[1])
}