Skip to content

Commit 9242bea

Browse files
committed
Removed redundant recipe_dir attribute of recipes
1 parent 57892d5 commit 9242bea

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

pythonforandroid/recipe.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -225,19 +225,19 @@ def apply_patch(self, filename, arch):
225225
build directory.
226226
"""
227227
info("Applying patch {}".format(filename))
228-
filename = join(self.recipe_dir, filename)
228+
filename = join(self.get_recipe_dir(), filename)
229229
shprint(sh.patch, "-t", "-d", self.get_build_dir(arch), "-p1",
230230
"-i", filename, _tail=10)
231231

232232
def copy_file(self, filename, dest):
233233
info("Copy {} to {}".format(filename, dest))
234-
filename = join(self.recipe_dir, filename)
234+
filename = join(self.get_recipe_dir(), filename)
235235
dest = join(self.build_dir, dest)
236236
shutil.copy(filename, dest)
237237

238238
def append_file(self, filename, dest):
239239
info("Append {} to {}".format(filename, dest))
240-
filename = join(self.recipe_dir, filename)
240+
filename = join(self.get_recipe_dir(), filename)
241241
dest = join(self.build_dir, dest)
242242
with open(filename, "rb") as fd:
243243
data = fd.read()
@@ -638,7 +638,6 @@ def get_recipe(cls, name, ctx):
638638
if len(logger.handlers) > 1:
639639
logger.removeHandler(logger.handlers[1])
640640
recipe = mod.recipe
641-
recipe.recipe_dir = dirname(recipe_file)
642641
recipe.ctx = ctx
643642
cls.recipes[name] = recipe
644643
return recipe

0 commit comments

Comments
 (0)