am 805b1690: (-s ours) Move support library to r8. do not merge.
* commit '805b1690679072a6295ff073d4b233e069d8b49b':
Move support library to r8. do not merge.
diff --git a/sdk/support_source.properties b/sdk/support_source.properties
index 846dcd3..7ea8c5d 100644
--- a/sdk/support_source.properties
+++ b/sdk/support_source.properties
@@ -1,5 +1,5 @@
Pkg.UserSrc=false
-Pkg.Revision=8
+Pkg.Revision=7
Extra.Vendor=android
Extra.VendorId=android
Extra.VendorDisplay=Android
diff --git a/testrunner/create_test.py b/testrunner/create_test.py
index faea013..90da254 100755
--- a/testrunner/create_test.py
+++ b/testrunner/create_test.py
@@ -121,20 +121,21 @@
_PrintMessage("Created %s" % tests_manifest_path)
-def _GenerateTestMK(mk, mapping=None):
+def _GenerateTestMK(mk, app_path, mapping=None):
"""Create and populate tests/Android.mk with variable values from Android.mk.
Does nothing if tests/Android.mk already exists.
Args:
mk: AndroidMK object for application makefile
+ app_path: path to the application being tested
mapping: optional user defined mapping of variable values, replaces
values stored in mk
Raises:
IOError: tests/Android.mk cannot be opened for writing
"""
# skip if file already exists
- tests_path = "%s/%s" % (mk.app_path, TestsConsts.TESTS_FOLDER)
+ tests_path = "%s/%s" % (app_path, TestsConsts.TESTS_FOLDER)
tests_mk_path = "%s/%s" % (tests_path, mk.FILENAME)
if os.path.exists(tests_mk_path):
_PrintMessage("%s already exists, not overwritten" % tests_mk_path)
@@ -142,7 +143,7 @@
# append test build if not existent in makefile
if not mk.HasInclude(TestsConsts.MK_BUILD_INCLUDE):
- mk_path = "%s/%s" % (mk.app_path, mk.FILENAME)
+ mk_path = "%s/%s" % (app_path, mk.FILENAME)
mk_file = open(mk_path, mode="a")
mk_file.write(TestsConsts.MK_BUILD_STRING)
mk_file.close()
@@ -224,12 +225,12 @@
sys.exit()
try:
- mk = android_mk.AndroidMK(app_path=app_path)
+ mk = android_mk.CreateAndroidMK(path=app_path)
manifest = android_manifest.AndroidManifest(app_path=app_path)
_ValidateInputFiles(mk, manifest)
module_name = mk.GetVariable(mk.PACKAGE_NAME)
- _GenerateTestMK(mk)
+ _GenerateTestMK(mk, app_path)
_GenerateTestManifest(manifest, module_name)
except Exception, e:
_PrintError("Error: %s" % e)
diff --git a/testrunner/runtest.py b/testrunner/runtest.py
index 6226350..56e847b 100755
--- a/testrunner/runtest.py
+++ b/testrunner/runtest.py
@@ -69,7 +69,7 @@
"for a list of tests, or you can launch one or more tests.")
# default value for make -jX
- _DEFAULT_JOBS = 4
+ _DEFAULT_JOBS = 16
_DALVIK_VERIFIER_OFF_PROP = "dalvik.vm.dexopt-flags = v=n"