1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43
| @@ -348,6 +348,17 @@ if os.access(fn, os.F_OK): cmd.append("--pagesize") cmd.append(open(fn).read().rstrip("\n")) + + fn = os.path.join(sourcedir, "second") + if os.access(fn, os.F_OK): + cmd.append("--second") + cmd.append(fn) + + + fn = os.path.join(sourcedir, "third") + if os.access(fn, os.F_OK): + cmd.append("--third") + cmd.append(fn) args = info_dict.get("mkbootimg_args", None) if args and args.strip(): @@ -362,10 +373,10 @@ os.path.basename(sourcedir),) sign_cmd = ["drmsigntool", img.name, "build/target/product/security/privateKey.bin"] - p4 = Run(sign_cmd) - p4.communicate() - assert p4.returncode == 0, "mkbootimg of %s image failed" % ( - os.path.basename(sourcedir),) + # p4 = Run(sign_cmd) + # p4.communicate() +# assert p4.returncode == 0, "mkbootimg of %s image failed" % ( +# os.path.basename(sourcedir),) #if info_dict.get("verity_key", None): # path = "/" + os.path.basename(sourcedir).lower() @@ -877,8 +888,8 @@ f = b info = imp.find_module(f, [d]) print "loaded device-specific extensions from", path - self.module = imp.load_module("device_specific", *info) - D("module = %s", self.module); + # self.module = imp.load_module("device_specific", *info) + # D("module = %s", self.module); except ImportError: print "unable to load device-specific module; assuming none"
|