Merge "soong: Align update boot jar variable with system_server jar"
diff --git a/sdk/sdk.go b/sdk/sdk.go
index 321d5ab..431ace9 100644
--- a/sdk/sdk.go
+++ b/sdk/sdk.go
@@ -88,27 +88,6 @@
return s.properties.Snapshot
}
-func (s *sdk) frozenVersions(ctx android.BaseModuleContext) []string {
- if s.snapshot() {
- panic(fmt.Errorf("frozenVersions() called for sdk_snapshot %q", ctx.ModuleName()))
- }
- versions := []string{}
- ctx.WalkDeps(func(child android.Module, parent android.Module) bool {
- depTag := ctx.OtherModuleDependencyTag(child)
- if depTag == sdkMemberDepTag {
- return true
- }
- if versionedDepTag, ok := depTag.(sdkMemberVesionedDepTag); ok {
- v := versionedDepTag.version
- if v != "current" && !android.InList(v, versions) {
- versions = append(versions, versionedDepTag.version)
- }
- }
- return false
- })
- return android.SortedUniqueStrings(versions)
-}
-
func (s *sdk) GenerateAndroidBuildActions(ctx android.ModuleContext) {
if !s.snapshot() {
// We don't need to create a snapshot out of sdk_snapshot.
diff --git a/sdk/sdk_test.go b/sdk/sdk_test.go
index e2e40bb..1bbd286 100644
--- a/sdk/sdk_test.go
+++ b/sdk/sdk_test.go
@@ -139,22 +139,6 @@
t.Fatalf("missing expected error %q (0 errors are returned)", pattern)
}
-// ensure that 'result' contains 'expected'
-func ensureContains(t *testing.T, result string, expected string) {
- t.Helper()
- if !strings.Contains(result, expected) {
- t.Errorf("%q is not found in %q", expected, result)
- }
-}
-
-// ensures that 'result' does not contain 'notExpected'
-func ensureNotContains(t *testing.T, result string, notExpected string) {
- t.Helper()
- if strings.Contains(result, notExpected) {
- t.Errorf("%q is found in %q", notExpected, result)
- }
-}
-
func ensureListContains(t *testing.T, result []string, expected string) {
t.Helper()
if !android.InList(expected, result) {
@@ -162,13 +146,6 @@
}
}
-func ensureListNotContains(t *testing.T, result []string, notExpected string) {
- t.Helper()
- if android.InList(notExpected, result) {
- t.Errorf("%q is found in %v", notExpected, result)
- }
-}
-
func pathsToStrings(paths android.Paths) []string {
ret := []string{}
for _, p := range paths {
diff --git a/sdk/update.go b/sdk/update.go
index e45bd49..000d200 100644
--- a/sdk/update.go
+++ b/sdk/update.go
@@ -274,29 +274,29 @@
bp.Printfln("sdk_snapshot {")
bp.Indent()
bp.Printfln("name: %q,", ctx.ModuleName()+string(android.SdkVersionSeparator)+builder.version)
- if len(javaLibs) > 0 {
+ if len(s.properties.Java_libs) > 0 {
bp.Printfln("java_libs: [")
bp.Indent()
- for _, m := range javaLibs {
- bp.Printfln("%q,", builder.VersionedSdkMemberName(m.Name()))
+ for _, m := range s.properties.Java_libs {
+ bp.Printfln("%q,", builder.VersionedSdkMemberName(m))
}
bp.Dedent()
bp.Printfln("],") // java_libs
}
- if len(stubsSources) > 0 {
+ if len(s.properties.Stubs_sources) > 0 {
bp.Printfln("stubs_sources: [")
bp.Indent()
- for _, m := range stubsSources {
- bp.Printfln("%q,", builder.VersionedSdkMemberName(m.Name()))
+ for _, m := range s.properties.Stubs_sources {
+ bp.Printfln("%q,", builder.VersionedSdkMemberName(m))
}
bp.Dedent()
bp.Printfln("],") // stubs_sources
}
- if len(nativeLibInfos) > 0 {
+ if len(s.properties.Native_shared_libs) > 0 {
bp.Printfln("native_shared_libs: [")
bp.Indent()
- for _, info := range nativeLibInfos {
- bp.Printfln("%q,", builder.VersionedSdkMemberName(info.name))
+ for _, m := range s.properties.Native_shared_libs {
+ bp.Printfln("%q,", builder.VersionedSdkMemberName(m))
}
bp.Dedent()
bp.Printfln("],") // native_shared_libs