chiark / gitweb /
add libs/armeabi-v7a to list of dirs deleted before building...
authorDavid Black <david8black@gmail.com>
Wed, 8 May 2013 13:04:33 +0000 (14:04 +0100)
committerDavid Black <david8black@gmail.com>
Wed, 8 May 2013 13:04:33 +0000 (14:04 +0100)
I had completely forgotten that native libs were being deleted before
building . It is a sensible thing to do but I'm sure others will fall
foul of this one day.

fdroidserver/common.py

index 531b53ef4e327f6afbd3af882666b3fd5132be4b..fc097194aa13b8f81421b1c6d3ee424fcc4f68ba 100644 (file)
@@ -2034,9 +2034,9 @@ def prepare_source(vcs, app, build, build_dir, extlib_dir, sdk_path, ndk_path, j
     if basesrclib:
         srclibpaths.append(basesrclib)
 
-    # There should never be gen or bin directories in the source, so just get
+    # There should never be bin, gen or native libs directories in the source, so just get
     # rid of them...
-    for baddir in ['gen', 'bin', 'obj', 'libs/armeabi', 'libs/mips', 'libs/x86']:
+    for baddir in ['gen', 'bin', 'obj', 'libs/armeabi-v7a', 'libs/armeabi', 'libs/mips', 'libs/x86']:
         badpath = os.path.join(root_dir, baddir)
         if os.path.exists(badpath):
             shutil.rmtree(badpath)