Fix on-device paths to used libraries in dexpreopt.
Test: lunch aosp_cf_x86_phone-userdebug && m Test: Cherry-pick in internal master and check that on-device path to com.google.android.dialer.support.jar now is on /product partition (as it should be) and not on /system: $ oatdump \ --instruction-set=x86 \ --oat-file=out/target/product/vsoc_x86/product/priv-app/GoogleDialer/oat/x86/GoogleDialer.odex \ | grep '^classpath' \ | grep -o '[^[]*com.google.android.dialer.support.jar' /product/framework/com.google.android.dialer.support.jar Bug: 132357300 Change-Id: Idf279ac713b9b29ff3a29f1b072bc1d57f48db26
This commit is contained in:
@@ -502,6 +502,7 @@ type Dependency interface {
|
||||
ResourceJars() android.Paths
|
||||
ImplementationAndResourcesJars() android.Paths
|
||||
DexJarBuildPath() android.Path
|
||||
DexJarInstallPath() android.Path
|
||||
AidlIncludeDirs() android.Paths
|
||||
ExportedSdkLibs() []string
|
||||
ExportedPlugins() (android.Paths, []string)
|
||||
@@ -1748,6 +1749,10 @@ func (j *Module) DexJarBuildPath() android.Path {
|
||||
return j.dexJarFile
|
||||
}
|
||||
|
||||
func (j *Module) DexJarInstallPath() android.Path {
|
||||
return j.installFile
|
||||
}
|
||||
|
||||
func (j *Module) ResourceJars() android.Paths {
|
||||
if j.resourceJar == nil {
|
||||
return nil
|
||||
@@ -2574,6 +2579,10 @@ func (j *Import) DexJarBuildPath() android.Path {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (j *Import) DexJarInstallPath() android.Path {
|
||||
return nil
|
||||
}
|
||||
|
||||
func (j *Import) AidlIncludeDirs() android.Paths {
|
||||
return j.exportAidlIncludeDirs
|
||||
}
|
||||
|
Reference in New Issue
Block a user