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

Commit a5c5b9c8 authored by Sundong Ahn's avatar Sundong Ahn
Browse files

Support installable property 

Support not installing sh_binary when installable property is false

Bug: 205065320
Test: m -j
Change-Id: I71a0fd24e8867d6cb2527ecdacc775253f12c9f8
parent a52cbd67

sh/sh_binary.go

+4 −0
Original line number Diff line number Diff line
@@ -268,6 +268,9 @@ func (s *ShBinary) generateAndroidBuildActions(ctx android.ModuleContext) { 
func (s *ShBinary) GenerateAndroidBuildActions(ctx android.ModuleContext) {

	s.generateAndroidBuildActions(ctx)

	installDir := android.PathForModuleInstall(ctx, "bin", proptools.String(s.properties.Sub_dir))

	if !s.Installable() {

		s.SkipInstall()

	}

	s.installedFile = ctx.InstallExecutable(installDir, s.outputFilePath.Base(), s.outputFilePath)

	for _, symlink := range s.Symlinks() {

		ctx.InstallSymlink(installDir, symlink, s.installedFile)
@@ -283,6 +286,7 @@ func (s *ShBinary) AndroidMkEntries() []android.AndroidMkEntries { 
			func(ctx android.AndroidMkExtraEntriesContext, entries *android.AndroidMkEntries) {

				s.customAndroidMkEntries(entries)

				entries.SetString("LOCAL_MODULE_RELATIVE_PATH", proptools.String(s.properties.Sub_dir))

				entries.SetBoolIfTrue("LOCAL_UNINSTALLABLE_MODULE", !s.Installable())

			},

		},

	}}