diff options
| author | Paul Duffin <paulduffin@google.com> | 2020-03-09 20:23:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2020-03-09 20:23:15 +0000 |
| commit | a81668628e7ccda49291c4b4779b02f4772affe2 (patch) | |
| tree | 9234818cbe4c704435f4b490d8bc22a843e31ef9 /java/java.go | |
| parent | a8e37b98bba2a8bf61d01b20994ced119a0387be (diff) | |
| parent | a04c107bfaf9262daafecc9174bd9e85b79264bd (diff) | |
Merge "Add support for multiple os types"
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/java/java.go b/java/java.go index c65131750..d0b5adfa9 100644 --- a/java/java.go +++ b/java/java.go @@ -1879,12 +1879,12 @@ const ( ) // path to the jar file of a java library. Relative to <sdk_root>/<api_dir> -func sdkSnapshotFilePathForJar(name string) string { - return sdkSnapshotFilePathForMember(name, jarFileSuffix) +func sdkSnapshotFilePathForJar(osPrefix, name string) string { + return sdkSnapshotFilePathForMember(osPrefix, name, jarFileSuffix) } -func sdkSnapshotFilePathForMember(name string, suffix string) string { - return filepath.Join(javaDir, name+suffix) +func sdkSnapshotFilePathForMember(osPrefix, name string, suffix string) string { + return filepath.Join(javaDir, osPrefix, name+suffix) } type librarySdkMemberType struct { @@ -1931,7 +1931,7 @@ func (p *librarySdkMemberProperties) PopulateFromVariant(variant android.SdkAwar func (p *librarySdkMemberProperties) AddToPropertySet(sdkModuleContext android.ModuleContext, builder android.SnapshotBuilder, propertySet android.BpPropertySet) { if p.jarToExport != nil { exportedJar := p.jarToExport - snapshotRelativeJavaLibPath := sdkSnapshotFilePathForJar(p.library.Name()) + snapshotRelativeJavaLibPath := sdkSnapshotFilePathForJar(p.OsPrefix(), p.library.Name()) builder.CopyToSnapshot(exportedJar, snapshotRelativeJavaLibPath) for _, dir := range p.library.AidlIncludeDirs() { @@ -2137,10 +2137,10 @@ func (p *testSdkMemberProperties) PopulateFromVariant(variant android.SdkAware) func (p *testSdkMemberProperties) AddToPropertySet(sdkModuleContext android.ModuleContext, builder android.SnapshotBuilder, propertySet android.BpPropertySet) { if p.jarToExport != nil { - snapshotRelativeJavaLibPath := sdkSnapshotFilePathForJar(p.test.Name()) + snapshotRelativeJavaLibPath := sdkSnapshotFilePathForJar(p.OsPrefix(), p.test.Name()) builder.CopyToSnapshot(p.jarToExport, snapshotRelativeJavaLibPath) - snapshotRelativeTestConfigPath := sdkSnapshotFilePathForMember(p.test.Name(), testConfigSuffix) + snapshotRelativeTestConfigPath := sdkSnapshotFilePathForMember(p.OsPrefix(), p.test.Name(), testConfigSuffix) builder.CopyToSnapshot(p.test.testConfig, snapshotRelativeTestConfigPath) propertySet.AddProperty("jars", []string{snapshotRelativeJavaLibPath}) @@ -2348,7 +2348,7 @@ func BinaryHostFactory() android.Module { // type ImportProperties struct { - Jars []string `android:"path"` + Jars []string `android:"path,arch_variant"` Sdk_version *string |