| Index: scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.32-to-android.arm.32.json
|
| diff --git a/scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.32-to-android.arm.32.json b/scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.32-to-android.arm.32.json
|
| index d999cdd0ff6aff93367bd0a93b296d2e4090373c..c0789a9f2efbb03322394e2b9b07505a89d2d957 100644
|
| --- a/scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.32-to-android.arm.32.json
|
| +++ b/scripts/slave/recipe_modules/chromium/config.expected/Debug-linux.intel.32-to-android.arm.32.json
|
| @@ -1,4 +1,17 @@
|
| {
|
| + "android": {
|
| + "build_config_fs": "Debug",
|
| + "build_dir": "Path('[CHECKOUT]', 'out')",
|
| + "compile_py": {
|
| + "build_tool": "ninja",
|
| + "compiler": "goma"
|
| + },
|
| + "gyp_env": {
|
| + "GYP_CROSSCOMPILE": "1",
|
| + "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_version=46 host_os=linux order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfile.out') target_arch=arm",
|
| + "GYP_GENERATORS": "ninja"
|
| + }
|
| + },
|
| "android_defaults": {
|
| "build_config_fs": "Debug",
|
| "build_dir": "Path('[CHECKOUT]', 'out')",
|
| @@ -26,6 +39,7 @@
|
| ]
|
| },
|
| "gyp_env": {
|
| + "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "component=shared_library target_arch=arm",
|
| "GYP_GENERATORS": "ninja"
|
| }
|
| @@ -41,6 +55,7 @@
|
| ]
|
| },
|
| "gyp_env": {
|
| + "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "clang=1 component=shared_library target_arch=arm",
|
| "GYP_GENERATORS": "ninja"
|
| }
|
| @@ -57,6 +72,7 @@
|
| ]
|
| },
|
| "gyp_env": {
|
| + "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "component=shared_library target_arch=arm",
|
| "GYP_GENERATORS": "ninja"
|
| }
|
| @@ -73,6 +89,7 @@
|
| ]
|
| },
|
| "gyp_env": {
|
| + "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "clang=1 component=shared_library target_arch=arm",
|
| "GYP_GENERATORS": "ninja"
|
| }
|
| @@ -219,6 +236,7 @@
|
| "build_tool": "ninja"
|
| },
|
| "gyp_env": {
|
| + "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "component=shared_library target_arch=arm",
|
| "GYP_GENERATORS": "ninja"
|
| }
|
| @@ -279,9 +297,27 @@
|
| "build_tool": "make"
|
| },
|
| "gyp_env": {
|
| + "GYP_CROSSCOMPILE": "1",
|
| "GYP_DEFINES": "target_arch=arm v8_target_arch=arm"
|
| }
|
| },
|
| + "webrtc_android_apk_try_builder": {
|
| + "build_config_fs": "Debug",
|
| + "build_dir": "Path('[CHECKOUT]', 'out')",
|
| + "compile_py": {
|
| + "build_tool": "ninja",
|
| + "compiler": "goma",
|
| + "default_targets": [
|
| + "android_builder_webrtc"
|
| + ]
|
| + },
|
| + "gyp_env": {
|
| + "GYP_CROSSCOMPILE": "1",
|
| + "GYP_DEFINES": "OS=android component=static_library fastbuild=1 gcc_version=46 host_os=linux include_tests=1 order_text_section=Path('[CHECKOUT]', 'orderfiles', 'orderfile.out') target_arch=arm",
|
| + "GYP_GENERATORS": "ninja",
|
| + "GYP_GENERATOR_FLAGS": "default_target=android_builder_webrtc"
|
| + }
|
| + },
|
| "x86_builder": "Cannot target x86 with TARGET_ARCH == arm",
|
| "x86_try_builder": "config \"x86_try_builder\" includes \"x86_builder\", but [Cannot target x86 with TARGET_ARCH == arm]",
|
| "x86_try_instrumentation_tests": "config \"x86_try_instrumentation_tests\" includes \"x86_builder\", but [Cannot target x86 with TARGET_ARCH == arm]",
|
|
|