Merge changes I154a6f3a,I79f0c20a,I605ae9af,I647c7305,I95e96e3e, ...
* changes: Move fuzzer's CollectAllSharedDependencies into GenerateAndroidBuildActions Support AllowMissingDependencies in prebuilt_apex modules Support AllowMissingDependencies for apex dependencies Add AllowMissingDependencies support for prebuilt_etc module with no src property Make OutputFileForModule work for AllowMissingDependencies Fix panics when target arch is riscv64
This commit is contained in:
13
apex/apex.go
13
apex/apex.go
@@ -286,6 +286,9 @@ type apexArchBundleProperties struct {
|
||||
Arm64 struct {
|
||||
ApexNativeDependencies
|
||||
}
|
||||
Riscv64 struct {
|
||||
ApexNativeDependencies
|
||||
}
|
||||
X86 struct {
|
||||
ApexNativeDependencies
|
||||
}
|
||||
@@ -787,6 +790,8 @@ func (a *apexBundle) DepsMutator(ctx android.BottomUpMutatorContext) {
|
||||
depsList = append(depsList, a.archProperties.Arch.Arm.ApexNativeDependencies)
|
||||
case android.Arm64:
|
||||
depsList = append(depsList, a.archProperties.Arch.Arm64.ApexNativeDependencies)
|
||||
case android.Riscv64:
|
||||
depsList = append(depsList, a.archProperties.Arch.Riscv64.ApexNativeDependencies)
|
||||
case android.X86:
|
||||
depsList = append(depsList, a.archProperties.Arch.X86.ApexNativeDependencies)
|
||||
case android.X86_64:
|
||||
@@ -1559,7 +1564,7 @@ func apexFileForNativeLibrary(ctx android.BaseModuleContext, ccMod *cc.Module, h
|
||||
dirInApex = filepath.Join(dirInApex, "bionic")
|
||||
}
|
||||
|
||||
fileToCopy := ccMod.OutputFile().Path()
|
||||
fileToCopy := android.OutputFileForModule(ctx, ccMod, "")
|
||||
androidMkModuleName := ccMod.BaseModuleName() + ccMod.Properties.SubName
|
||||
return newApexFile(ctx, fileToCopy, androidMkModuleName, dirInApex, nativeSharedLib, ccMod)
|
||||
}
|
||||
@@ -1570,7 +1575,7 @@ func apexFileForExecutable(ctx android.BaseModuleContext, cc *cc.Module) apexFil
|
||||
dirInApex = filepath.Join(dirInApex, cc.Target().NativeBridgeRelativePath)
|
||||
}
|
||||
dirInApex = filepath.Join(dirInApex, cc.RelativeInstallPath())
|
||||
fileToCopy := cc.OutputFile().Path()
|
||||
fileToCopy := android.OutputFileForModule(ctx, cc, "")
|
||||
androidMkModuleName := cc.BaseModuleName() + cc.Properties.SubName
|
||||
af := newApexFile(ctx, fileToCopy, androidMkModuleName, dirInApex, nativeExecutable, cc)
|
||||
af.symlinks = cc.Symlinks()
|
||||
@@ -1583,7 +1588,7 @@ func apexFileForRustExecutable(ctx android.BaseModuleContext, rustm *rust.Module
|
||||
if rustm.Target().NativeBridge == android.NativeBridgeEnabled {
|
||||
dirInApex = filepath.Join(dirInApex, rustm.Target().NativeBridgeRelativePath)
|
||||
}
|
||||
fileToCopy := rustm.OutputFile().Path()
|
||||
fileToCopy := android.OutputFileForModule(ctx, rustm, "")
|
||||
androidMkModuleName := rustm.BaseModuleName() + rustm.Properties.SubName
|
||||
af := newApexFile(ctx, fileToCopy, androidMkModuleName, dirInApex, nativeExecutable, rustm)
|
||||
return af
|
||||
@@ -1602,7 +1607,7 @@ func apexFileForRustLibrary(ctx android.BaseModuleContext, rustm *rust.Module) a
|
||||
if rustm.Target().NativeBridge == android.NativeBridgeEnabled {
|
||||
dirInApex = filepath.Join(dirInApex, rustm.Target().NativeBridgeRelativePath)
|
||||
}
|
||||
fileToCopy := rustm.OutputFile().Path()
|
||||
fileToCopy := android.OutputFileForModule(ctx, rustm, "")
|
||||
androidMkModuleName := rustm.BaseModuleName() + rustm.Properties.SubName
|
||||
return newApexFile(ctx, fileToCopy, androidMkModuleName, dirInApex, nativeSharedLib, rustm)
|
||||
}
|
||||
|
Reference in New Issue
Block a user