Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(176)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: scripts/slave/recipe_modules/webrtc/builders.py

Issue 505153002: WebRTC: Remove android_apk recipe (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/tools/build
Patch Set: Rebased Created 6 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « scripts/slave/recipe_modules/webrtc/api.py ('k') | scripts/slave/recipe_modules/webrtc/chromium_android_config.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: scripts/slave/recipe_modules/webrtc/builders.py
diff --git a/scripts/slave/recipe_modules/webrtc/builders.py b/scripts/slave/recipe_modules/webrtc/builders.py
index 7bd23ff6dc793cddfe2c7fe53e6f33266d806408..1edded064e3ee100fc51c8a423859d35ad932a00 100644
--- a/scripts/slave/recipe_modules/webrtc/builders.py
+++ b/scripts/slave/recipe_modules/webrtc/builders.py
@@ -28,13 +28,11 @@ RECIPE_CONFIGS = {
},
'webrtc_android': {
'webrtc_config': 'webrtc_android',
+ 'test_suite': 'android',
},
'webrtc_android_clang': {
'webrtc_config': 'webrtc_android_clang',
},
- 'webrtc_android_apk': {
- 'webrtc_config': 'webrtc_android_apk',
- },
'webrtc_ios': {
'webrtc_config': 'webrtc_ios',
},
@@ -680,7 +678,7 @@ BUILDERS = {
'bot_type': 'builder_tester',
'testing': {'platform': 'linux'},
},
- 'Android': {
+ 'Android Builder': {
'recipe_config': 'webrtc_android',
'webrtc_config_kwargs': {
'BUILD_CONFIG': 'Release',
@@ -689,9 +687,10 @@ BUILDERS = {
'TARGET_BITS': 32,
},
'bot_type': 'builder',
+ 'build_gs_archive': 'android_apk_rel_archive',
'testing': {'platform': 'linux'},
},
- 'Android (dbg)': {
+ 'Android Builder (dbg)': {
'recipe_config': 'webrtc_android',
'webrtc_config_kwargs': {
'BUILD_CONFIG': 'Debug',
@@ -700,6 +699,7 @@ BUILDERS = {
'TARGET_BITS': 32,
},
'bot_type': 'builder',
+ 'build_gs_archive': 'android_apk_dbg_archive',
'testing': {'platform': 'linux'},
},
'Android ARM64 (dbg)': {
@@ -748,32 +748,8 @@ BUILDERS = {
'bot_type': 'builder',
'testing': {'platform': 'linux'},
},
- 'Android Chromium-APK Builder (dbg)': {
- 'recipe_config': 'webrtc_android_apk',
- 'webrtc_config_kwargs': {
- 'BUILD_CONFIG': 'Debug',
- 'TARGET_PLATFORM': 'android',
- 'TARGET_ARCH': 'arm',
- 'TARGET_BITS': 32,
- },
- 'bot_type': 'builder',
- 'build_gs_archive': 'android_apk_dbg_archive',
- 'testing': {'platform': 'linux'},
- },
- 'Android Chromium-APK Builder': {
- 'recipe_config': 'webrtc_android_apk',
- 'webrtc_config_kwargs': {
- 'BUILD_CONFIG': 'Release',
- 'TARGET_PLATFORM': 'android',
- 'TARGET_ARCH': 'arm',
- 'TARGET_BITS': 32,
- },
- 'bot_type': 'builder',
- 'build_gs_archive': 'android_apk_rel_archive',
- 'testing': {'platform': 'linux'},
- },
- 'Android Chromium-APK Tests (KK Nexus5)(dbg)': {
- 'recipe_config': 'webrtc_android_apk',
+ 'Android Tests (KK Nexus5)(dbg)': {
+ 'recipe_config': 'webrtc_android',
'webrtc_config_kwargs': {
'BUILD_CONFIG': 'Debug',
'TARGET_PLATFORM': 'android',
@@ -781,12 +757,12 @@ BUILDERS = {
'TARGET_BITS': 32,
},
'bot_type': 'tester',
- 'parent_buildername': 'Android Chromium-APK Builder (dbg)',
+ 'parent_buildername': 'Android Builder (dbg)',
'build_gs_archive': 'android_apk_dbg_archive',
'testing': {'platform': 'linux'},
},
- 'Android Chromium-APK Tests (KK Nexus5)': {
- 'recipe_config': 'webrtc_android_apk',
+ 'Android Tests (KK Nexus5)': {
+ 'recipe_config': 'webrtc_android',
'webrtc_config_kwargs': {
'BUILD_CONFIG': 'Release',
'TARGET_PLATFORM': 'android',
@@ -794,12 +770,12 @@ BUILDERS = {
'TARGET_BITS': 32,
},
'bot_type': 'tester',
- 'parent_buildername': 'Android Chromium-APK Builder',
+ 'parent_buildername': 'Android Builder',
'build_gs_archive': 'android_apk_rel_archive',
'testing': {'platform': 'linux'},
},
- 'Android Chromium-APK Tests (JB Nexus7.2)(dbg)': {
- 'recipe_config': 'webrtc_android_apk',
+ 'Android Tests (JB Nexus7.2)(dbg)': {
+ 'recipe_config': 'webrtc_android',
'webrtc_config_kwargs': {
'BUILD_CONFIG': 'Debug',
'TARGET_PLATFORM': 'android',
@@ -807,12 +783,12 @@ BUILDERS = {
'TARGET_BITS': 32,
},
'bot_type': 'tester',
- 'parent_buildername': 'Android Chromium-APK Builder (dbg)',
+ 'parent_buildername': 'Android Builder (dbg)',
'build_gs_archive': 'android_apk_dbg_archive',
'testing': {'platform': 'linux'},
},
- 'Android Chromium-APK Tests (JB Nexus7.2)': {
- 'recipe_config': 'webrtc_android_apk',
+ 'Android Tests (JB Nexus7.2)': {
+ 'recipe_config': 'webrtc_android',
'webrtc_config_kwargs': {
'BUILD_CONFIG': 'Release',
'TARGET_PLATFORM': 'android',
@@ -820,7 +796,7 @@ BUILDERS = {
'TARGET_BITS': 32,
},
'bot_type': 'tester',
- 'parent_buildername': 'Android Chromium-APK Builder',
+ 'parent_buildername': 'Android Builder',
'build_gs_archive': 'android_apk_rel_archive',
'testing': {'platform': 'linux'},
},
@@ -1114,7 +1090,7 @@ BUILDERS = {
'TARGET_ARCH': 'arm',
'TARGET_BITS': 32,
},
- 'bot_type': 'builder',
+ 'bot_type': 'builder_tester',
'testing': {'platform': 'linux'},
},
'android_rel': {
@@ -1125,7 +1101,7 @@ BUILDERS = {
'TARGET_ARCH': 'arm',
'TARGET_BITS': 32,
},
- 'bot_type': 'builder',
+ 'bot_type': 'builder_tester',
'testing': {'platform': 'linux'},
},
'android_clang': {
@@ -1174,28 +1150,6 @@ BUILDERS = {
'bot_type': 'builder',
'testing': {'platform': 'linux'},
},
- 'android_apk': {
- 'recipe_config': 'webrtc_android_apk',
- 'webrtc_config_kwargs': {
- 'BUILD_CONFIG': 'Debug',
- 'TARGET_PLATFORM': 'android',
- 'TARGET_ARCH': 'arm',
- 'TARGET_BITS': 32,
- },
- 'bot_type': 'builder_tester',
- 'testing': {'platform': 'linux'},
- },
- 'android_apk_rel': {
- 'recipe_config': 'webrtc_android_apk',
- 'webrtc_config_kwargs': {
- 'BUILD_CONFIG': 'Release',
- 'TARGET_PLATFORM': 'android',
- 'TARGET_ARCH': 'arm',
- 'TARGET_BITS': 32,
- },
- 'bot_type': 'builder_tester',
- 'testing': {'platform': 'linux'},
- },
},
},
}
« no previous file with comments | « scripts/slave/recipe_modules/webrtc/api.py ('k') | scripts/slave/recipe_modules/webrtc/chromium_android_config.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698