diff options
| author | 2021-12-20 19:52:37 +0000 | |
|---|---|---|
| committer | 2021-12-20 19:52:37 +0000 | |
| commit | 880e11112d0647245e9cfbaad89b7e9795ab6890 (patch) | |
| tree | 53a8843420b9ec78d7946930089bdbe3e0b75e1d /java/systemserver_classpath_fragment.go | |
| parent | f1228f570a40b0f856b36779821ca0a86662a511 (diff) | |
| parent | 28bc9a8a7eab2e7b6666df1079677a14e4899b78 (diff) | |
Merge changes I8f4eaed1,I358a62d3
* changes:
Dexpreopt standalone system server jars from prebuilts.
Dexpreopt standalone system server jars.
Diffstat (limited to 'java/systemserver_classpath_fragment.go')
| -rw-r--r-- | java/systemserver_classpath_fragment.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/java/systemserver_classpath_fragment.go b/java/systemserver_classpath_fragment.go index 2ec33a422..fa61ea68c 100644 --- a/java/systemserver_classpath_fragment.go +++ b/java/systemserver_classpath_fragment.go @@ -60,7 +60,7 @@ func (p *platformSystemServerClasspathModule) GenerateAndroidBuildActions(ctx an classpathJars := configuredJarListToClasspathJars(ctx, configuredJars, p.classpathType) standaloneConfiguredJars := p.standaloneConfiguredJars(ctx) standaloneClasspathJars := configuredJarListToClasspathJars(ctx, standaloneConfiguredJars, STANDALONE_SYSTEMSERVER_JARS) - configuredJars = configuredJars.AppendList(standaloneConfiguredJars) + configuredJars = configuredJars.AppendList(&standaloneConfiguredJars) classpathJars = append(classpathJars, standaloneClasspathJars...) p.classpathFragmentBase().generateClasspathProtoBuildActions(ctx, configuredJars, classpathJars) } @@ -122,7 +122,7 @@ func (s *SystemServerClasspathModule) GenerateAndroidBuildActions(ctx android.Mo classpathJars := configuredJarListToClasspathJars(ctx, configuredJars, s.classpathType) standaloneConfiguredJars := s.standaloneConfiguredJars(ctx) standaloneClasspathJars := configuredJarListToClasspathJars(ctx, standaloneConfiguredJars, STANDALONE_SYSTEMSERVER_JARS) - configuredJars = configuredJars.AppendList(standaloneConfiguredJars) + configuredJars = configuredJars.AppendList(&standaloneConfiguredJars) classpathJars = append(classpathJars, standaloneClasspathJars...) s.classpathFragmentBase().generateClasspathProtoBuildActions(ctx, configuredJars, classpathJars) |