Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 188f2ee1 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Use RelativeInstallPath for DataPaths in apex"

parents d2946c3e 0a51aa2c

apex/builder.go

+2 −2
Original line number Diff line number Diff line
@@ -409,7 +409,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
				panic(fmt.Errorf("path %q does not end with %q", dataPath, relPath))

			}



			dataDest := android.PathForModuleOut(ctx, "image"+suffix, fi.apexRelativePath(relPath)).String()

			dataDest := android.PathForModuleOut(ctx, "image"+suffix, fi.apexRelativePath(relPath), d.RelativeInstallPath).String()



			copyCommands = append(copyCommands, "cp -f "+d.SrcPath.String()+" "+dataDest)

			implicitInputs = append(implicitInputs, d.SrcPath)
@@ -473,7 +473,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { 
			if f.installDir == "bin" || strings.HasPrefix(f.installDir, "bin/") {

				executablePaths = append(executablePaths, pathInApex)

				for _, d := range f.dataPaths {

					readOnlyPaths = append(readOnlyPaths, filepath.Join(f.installDir, d.SrcPath.Rel()))

					readOnlyPaths = append(readOnlyPaths, filepath.Join(f.installDir, d.RelativeInstallPath, d.SrcPath.Rel()))

				}

				for _, s := range f.symlinks {

					executablePaths = append(executablePaths, filepath.Join(f.installDir, s))