diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2015-12-21 14:55:28 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2015-12-21 15:03:15 -0800 |
| commit | 782a2d116a010d3cbc3ce26c43039b82ee579e55 (patch) | |
| tree | 808234caba5a366940f834e335b3e665cdb184e0 /java | |
| parent | 7b310eefb74fc93f80c359d0b0486fc242100946 (diff) | |
| download | build_soong-782a2d116a010d3cbc3ce26c43039b82ee579e55.tar.gz build_soong-782a2d116a010d3cbc3ce26c43039b82ee579e55.tar.bz2 build_soong-782a2d116a010d3cbc3ce26c43039b82ee579e55.zip | |
Refactor install paths
Explicitly allow installation into the data partition instead of using
"../data" for tests. At the same time, pipe through the information
required for vendor modules.
Change-Id: I6baf9d828c285e1080e43074beef8aebdbb38875
Diffstat (limited to 'java')
| -rw-r--r-- | java/app.go | 2 | ||||
| -rw-r--r-- | java/java.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/java/app.go b/java/app.go index f0eb3c8a..3d162812 100644 --- a/java/app.go +++ b/java/app.go @@ -152,7 +152,7 @@ func (a *AndroidApp) GenerateJavaBuildActions(ctx common.AndroidModuleContext) { } a.outputFile = CreateAppPackage(ctx, aaptPackageFlags, a.outputFile, certificates) - ctx.InstallFileName("app", ctx.ModuleName()+".apk", a.outputFile) + ctx.InstallFileName(common.PathForModuleInstall(ctx, "app"), ctx.ModuleName()+".apk", a.outputFile) } var aaptIgnoreFilenames = []string{ diff --git a/java/java.go b/java/java.go index 839fb01d..db1ae057 100644 --- a/java/java.go +++ b/java/java.go @@ -442,7 +442,7 @@ type JavaLibrary struct { func (j *JavaLibrary) GenerateJavaBuildActions(ctx common.AndroidModuleContext) { j.javaBase.GenerateJavaBuildActions(ctx) - j.installFile = ctx.InstallFileName("framework", ctx.ModuleName()+".jar", j.outputFile) + j.installFile = ctx.InstallFileName(common.PathForModuleInstall(ctx, "framework"), ctx.ModuleName()+".jar", j.outputFile) } func JavaLibraryFactory() (blueprint.Module, []interface{}) { @@ -479,7 +479,7 @@ func (j *JavaBinary) GenerateJavaBuildActions(ctx common.AndroidModuleContext) { // Depend on the installed jar (j.installFile) so that the wrapper doesn't get executed by // another build rule before the jar has been installed. - ctx.InstallFile("bin", common.PathForModuleSrc(ctx, j.binaryProperties.Wrapper), + ctx.InstallFile(common.PathForModuleInstall(ctx, "bin"), common.PathForModuleSrc(ctx, j.binaryProperties.Wrapper), j.installFile) } @@ -526,7 +526,7 @@ func (j *JavaPrebuilt) GenerateAndroidBuildActions(ctx common.AndroidModuleConte j.classpathFile = prebuilt j.classJarSpecs = []jarSpec{classJarSpec} j.resourceJarSpecs = []jarSpec{resourceJarSpec} - ctx.InstallFileName("framework", ctx.ModuleName()+".jar", j.classpathFile) + ctx.InstallFileName(common.PathForModuleInstall(ctx, "framework"), ctx.ModuleName()+".jar", j.classpathFile) } var _ JavaDependency = (*JavaPrebuilt)(nil) |