Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / build / android / pylib / gtest / setup.py

diff --git a/src/build/android/pylib/gtest/setup.py b/src/build/android/pylib/gtest/setup.py
index e89846e..00a5753 100644 (file)
--- a/src/build/android/pylib/gtest/setup.py
+++ b/src/build/android/pylib/gtest/setup.py
@@ -39,6 +39,7 @@ _ISOLATE_FILE_PATHS = {
     'media_perftests': 'media/media_perftests.isolate',
     'media_unittests': 'media/media_unittests.isolate',
     'net_unittests': 'net/net_unittests.isolate',
+    'sql_unittests': 'sql/sql_unittests.isolate',
     'ui_unittests': 'ui/ui_unittests.isolate',
     'unit_tests': 'chrome/unit_tests.isolate',
     'webkit_unit_tests':
@@ -134,9 +135,12 @@ def _GenerateDepsDirUsingIsolate(suite_name, isolate_file_path=None):
       '--path-variable', 'PRODUCT_DIR', constants.GetOutDirectory(),
 
       '--config-variable', 'OS', 'android',
+      '--config-variable', 'CONFIGURATION_NAME', constants.GetBuildType(),
       '--config-variable', 'chromeos', '0',
       '--config-variable', 'component', 'static_library',
       '--config-variable', 'icu_use_data_file_flag', '1',
+      # TODO(maruel): This may not be always true.
+      '--config-variable', 'target_arch', 'arm',
       '--config-variable', 'use_openssl', '0',
   ]
   assert not cmd_helper.RunCmd(isolate_cmd)