diff options
| author | Colin Cross <ccross@android.com> | 2017-08-31 12:29:17 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2017-08-31 13:48:52 -0700 |
| commit | 5c51792926b063945d786cc8a1e407a2ce2159cf (patch) | |
| tree | cef55100e4632b4a1c4d141392287802c65f3693 /java/java.go | |
| parent | add7fdf1a5d7652cfc8ef8da4e517eb4e11e0e08 (diff) | |
| download | android_build_soong-5c51792926b063945d786cc8a1e407a2ce2159cf.tar.gz android_build_soong-5c51792926b063945d786cc8a1e407a2ce2159cf.tar.bz2 android_build_soong-5c51792926b063945d786cc8a1e407a2ce2159cf.zip | |
Make binaries executable
Split InstallFileName into InstallExecutable that does chmod +x
after copying the file. Also remove InstallFile and rename
InstallFileName to InstallFile.
Test: m -j checkbuild
Change-Id: Id41ad4eafe521f6cd5d8cc250b7747ecb3da8dfc
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 e2e15d46..89c20163 100644 --- a/java/java.go +++ b/java/java.go @@ -457,7 +457,7 @@ type Library struct { func (j *Library) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.compile(ctx) - j.installFile = ctx.InstallFileName(android.PathForModuleInstall(ctx, "framework"), ctx.ModuleName()+".jar", j.outputFile) + j.installFile = ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"), ctx.ModuleName()+".jar", j.outputFile) } func (j *Library) DepsMutator(ctx android.BottomUpMutatorContext) { @@ -510,8 +510,8 @@ func (j *Binary) GenerateAndroidBuildActions(ctx android.ModuleContext) { // 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. j.wrapperFile = android.PathForModuleSrc(ctx, j.binaryProperties.Wrapper) - j.binaryFile = ctx.InstallFile(android.PathForModuleInstall(ctx, "bin"), - j.wrapperFile, j.installFile) + j.binaryFile = ctx.InstallExecutable(android.PathForModuleInstall(ctx, "bin"), + ctx.ModuleName(), j.wrapperFile, j.installFile) } func (j *Binary) DepsMutator(ctx android.BottomUpMutatorContext) { @@ -590,7 +590,7 @@ func (j *Import) GenerateAndroidBuildActions(ctx android.ModuleContext) { j.combinedClasspathFile = TransformClassesToJar(ctx, j.classJarSpecs, android.OptionalPath{}, nil) - ctx.InstallFileName(android.PathForModuleInstall(ctx, "framework"), + ctx.InstallFile(android.PathForModuleInstall(ctx, "framework"), ctx.ModuleName()+".jar", j.combinedClasspathFile) } |