Revert "Merge remote branch 'cros/upstream' into tempbranch2"
This reverts commit 25fc6d1f28e54c46689f12d3b93c2540ef45323a.
TBR=ericli@chromium.org
Review URL: http://codereview.chromium.org/3541002
Change-Id: Ib0165b19bfdf02264f8a6a74ddf3ae74c8c0f7df
diff --git a/client/deps/libaio/common.py b/client/deps/libaio/common.py
new file mode 100644
index 0000000..0f18586
--- /dev/null
+++ b/client/deps/libaio/common.py
@@ -0,0 +1,8 @@
+import os, sys
+dirname = os.path.dirname(sys.modules[__name__].__file__)
+client_dir = os.path.abspath(os.path.join(dirname, "../../"))
+sys.path.insert(0, client_dir)
+import setup_modules
+sys.path.pop(0)
+setup_modules.setup(base_path=client_dir,
+ root_module_name="autotest_lib.client")
diff --git a/client/deps/libaio/libaio.py b/client/deps/libaio/libaio.py
index 5389f32..62a6ed8 100755
--- a/client/deps/libaio/libaio.py
+++ b/client/deps/libaio/libaio.py
@@ -1,6 +1,7 @@
#!/usr/bin/python
import os
+import common
from autotest_lib.client.bin import utils
version = 1
@@ -10,8 +11,8 @@
utils.extract_tarball_to_dir(tarball, srcdir)
os.chdir(srcdir)
utils.system('patch -p1 < ../00_arches.patch')
- utils.make()
- utils.make('prefix=%s install' % topdir)
+ utils.system('make')
+ utils.system('make prefix=%s install' % topdir)
os.chdir(topdir)