move global var to local

pull/8/head
cfig 8 years ago
parent 8bcdeda55a
commit 1f8a88eaf4

@ -35,9 +35,6 @@ def workdir='build/unzip_boot'
project.ext.rootWorkDir = new File(workdir).getAbsolutePath() project.ext.rootWorkDir = new File(workdir).getAbsolutePath()
def defaultRootDir = workdir + "/root" def defaultRootDir = workdir + "/root"
def sdkVersion = 7; def sdkVersion = 7;
String[] bins = [ "sh", "logcat", "logd", "linker", "toolbox", "toybox", "applypatch", "debuggerd", "reboot" ]
String[] libs_6 = [ "libdl.so", "libutils.so", "libc++.so", "libc.so", "libm.so", "libz.so", "libstdc++.so", "libcutils.so", "libselinux.so", "liblog.so", "libpcre.so", "libsysutils.so", "libnl.so", "libbase.so", "libbacktrace.so", "libunwind.so" ]
String[] libs = [ "libdl.so", "libutils.so", "libc++.so", "libc.so", "libm.so", "libz.so", "libstdc++.so", "libcutils.so", "libselinux.so", "liblog.so", "libpcre.so", "libsysutils.so", "libnl.so", "libbase.so", "libbacktrace.so", "libunwind.so", "libcrypto.so", "libpackagelistparser.so", "libpcrecpp.so", "liblzma.so" ]
boolean gDebug=true boolean gDebug=true
String activeImg = null; String activeImg = null;
if (new File("boot.img").exists()) { if (new File("boot.img").exists()) {
@ -299,7 +296,7 @@ task addSystemBin(type: Copy) {
from System.getProperty("ANDROID_PRODUCT_OUT") + '/system/bin' from System.getProperty("ANDROID_PRODUCT_OUT") + '/system/bin'
into workdir + "/root/system/bin" into workdir + "/root/system/bin"
include { details -> include { details ->
inTargetList(details.file.name, "bin") inTargetList(details.file.name, "bin", sdkVersion)
} }
} }
@ -307,11 +304,14 @@ task addSystemLib(type: Copy) {
from System.getProperty("ANDROID_PRODUCT_OUT") + '/system/lib' from System.getProperty("ANDROID_PRODUCT_OUT") + '/system/lib'
into workdir + "/root/system/lib" into workdir + "/root/system/lib"
include { details -> include { details ->
inTargetList(details.file.name, "lib") inTargetList(details.file.name, "lib", sdkVersion)
} }
} }
boolean inTargetList(String file, String inType) { boolean inTargetList(String file, String inType, int sdkVersion) {
String[] bins = [ "sh", "logcat", "logd", "linker", "toolbox", "toybox", "applypatch", "debuggerd", "reboot" ]
String[] libs_6 = [ "libdl.so", "libutils.so", "libc++.so", "libc.so", "libm.so", "libz.so", "libstdc++.so", "libcutils.so", "libselinux.so", "liblog.so", "libpcre.so", "libsysutils.so", "libnl.so", "libbase.so", "libbacktrace.so", "libunwind.so" ]
String[] libs = [ "libdl.so", "libutils.so", "libc++.so", "libc.so", "libm.so", "libz.so", "libstdc++.so", "libcutils.so", "libselinux.so", "liblog.so", "libpcre.so", "libsysutils.so", "libnl.so", "libbase.so", "libbacktrace.so", "libunwind.so", "libcrypto.so", "libpackagelistparser.so", "libpcrecpp.so", "liblzma.so" ]
switch (inType) { switch (inType) {
case "bin": case "bin":
return inArray(file, bins); return inArray(file, bins);

Loading…
Cancel
Save