[packages/android-tools] fix compilation out of tree issues

glen glen at pld-linux.org
Sun Nov 13 14:34:12 CET 2016


commit 0de251360d215153541345e742ce9451546dca6d
Author: Elan Ruusamäe <glen at delfi.ee>
Date:   Sun Nov 13 15:33:39 2016 +0200

    fix compilation out of tree issues

 generate_build.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/generate_build.rb b/generate_build.rb
index 400dec8..ee7660f 100644
--- a/generate_build.rb
+++ b/generate_build.rb
@@ -139,7 +139,7 @@ fastbootfiles = %w(
   usb_linux.cpp
   util_linux.cpp
 )
-libfastboot = compile(expand('fastboot', fastbootfiles), '-DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Iadb -Iinclude -Imkbootimg -Ibase/include -Ilibsparse/include -I../extras/ext4_utils -I../extras/f2fs_utils')
+libfastboot = compile(expand('fastboot', fastbootfiles), '-DFASTBOOT_REVISION=\"$PKGVER\" -D_GNU_SOURCE -Iadb -Iinclude -Imkbootimg -Ibase/include -Ilibsparse/include -Iextras/ext4_utils -Iextras/f2fs_utils')
 
 sparsefiles = %w(
   backed_block.c
@@ -174,7 +174,7 @@ ext4files = %w(
   crc16.c
   ext4_sb.c
 )
-libext4 = compile(expand('../extras/ext4_utils', ext4files), '-Ilibsparse/include -Iinclude')
+libext4 = compile(expand('extras/ext4_utils', ext4files), '-Ilibsparse/include -Iinclude')
 
 link('fastboot/fastboot', libsparse + libzip + liblog + libutil + libcutils + libbase + libext4 + libfastboot + libadbsh + libadbd, '-lpthread -lselinux -lz -lcrypto -lutil')
 
================================================================

---- gitweb:

http://git.pld-linux.org/gitweb.cgi/packages/android-tools.git/commitdiff/0de251360d215153541345e742ce9451546dca6d



More information about the pld-cvs-commit mailing list