diff options
| author | Ulya Trafimovich <skvadrik@google.com> | 2020-06-03 11:40:45 +0100 |
|---|---|---|
| committer | Ulya Trafimovich <skvadrik@google.com> | 2020-06-03 11:40:45 +0100 |
| commit | 562c240185dd4adcbdb75d2924c69657f6ac7cff (patch) | |
| tree | e98ec8ccea2fc7974028b859a6e92d1be6ee5896 /java/java.go | |
| parent | 4a19d08d39f85403708111dbe44bdd1174959566 (diff) | |
Rename DexJar interface method to DexJarBuildPath.
This is a prerequisite change before adding DexJarInstallPath.
Test: lunch aosp_cf_phone-userdebug && m
Change-Id: I033e08b8bb06c0a844a6bbbfcdc48ce33e9c95cf
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/java/java.go b/java/java.go index 09df2ad43..778fe316e 100644 --- a/java/java.go +++ b/java/java.go @@ -498,7 +498,7 @@ type Dependency interface { ImplementationJars() android.Paths ResourceJars() android.Paths ImplementationAndResourcesJars() android.Paths - DexJar() android.Path + DexJarBuildPath() android.Path AidlIncludeDirs() android.Paths ExportedSdkLibs() []string ExportedPlugins() (android.Paths, []string) @@ -1736,7 +1736,7 @@ func (j *Module) ImplementationJars() android.Paths { return android.Paths{j.implementationJarFile} } -func (j *Module) DexJar() android.Path { +func (j *Module) DexJarBuildPath() android.Path { return j.dexJarFile } @@ -2562,7 +2562,7 @@ func (j *Import) ImplementationAndResourcesJars() android.Paths { return android.Paths{j.combinedClasspathFile} } -func (j *Import) DexJar() android.Path { +func (j *Import) DexJarBuildPath() android.Path { return nil } @@ -2745,7 +2745,7 @@ func (j *DexImport) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.Stem()+".jar", dexOutputFile) } -func (j *DexImport) DexJar() android.Path { +func (j *DexImport) DexJarBuildPath() android.Path { return j.dexJarFile } |