From 51917305154c4f689ce8d45f6feb869b0c814820 Mon Sep 17 00:00:00 2001 From: "kjellander@webrtc.org" Date: Wed, 3 Sep 2014 14:34:46 +0000 Subject: Partial revert of r7014 (Android APK refactor) This reverts selected parts of r7014 to enable rolling WebRTC in Chromium DEPS. This works around the problem with GYP includes being processed in the first pass (i.e. variables cannot be used for paths). Using a dependency with a path using a variable that is conditioned for build_with_chromium being 0 or 1 solves the Chromium build. These changes will be restored once I've finished a major GYP refactoring that will break out all test related code (at least the parts that includes the Android APK targets) into a separate chain of GYP targets that are not processed when generating projects for Chromium (which is why r7014 is breaking the Chromium build). BUG=3741 TESTED=Passing compilation of standalone using: GYP_DEFINES="OS=android component=static_library fastbuild=1 target_arch=arm" webrtc/build/gyp_webrtc ninja -C out/Debug Then verified the *_apk targets are generated and compiled. Passing compilation from a Chromium checkout with third_party/webrtc directory removed and a new empty third_party/webrtc mapped to the standalone checkout using: sudo mount --bind /path/to/trunk/webrtc third_party/webrtc Then running build/gyp_chromium I also verified WebRTC GYP targets exist and are able to compile. R=henrike@webrtc.org Review URL: https://webrtc-codereview.appspot.com/20299004 git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@7040 4adac7df-926f-26a2-2b94-8c16560cd09d --- webrtc_tests.gypi | 22 ++++------------------ 1 file changed, 4 insertions(+), 18 deletions(-) (limited to 'webrtc_tests.gypi') diff --git a/webrtc_tests.gypi b/webrtc_tests.gypi index 4bbc5dfc..68b738dc 100644 --- a/webrtc_tests.gypi +++ b/webrtc_tests.gypi @@ -130,31 +130,17 @@ ['OS=="android"', { 'targets': [ { - 'target_name': 'video_engine_tests_apk', + 'target_name': 'video_engine_tests_apk_target', 'type': 'none', - 'variables': { - 'test_suite_name': 'video_engine_tests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)video_engine_tests<(SHARED_LIB_SUFFIX)', - }, 'dependencies': [ - 'video_engine_tests', - ], - 'includes': [ - '../build/apk_test.gypi', + '<(apk_tests_path):video_engine_tests_apk', ], }, { - 'target_name': 'webrtc_perf_tests_apk', + 'target_name': 'webrtc_perf_tests_apk_target', 'type': 'none', - 'variables': { - 'test_suite_name': 'webrtc_perf_tests', - 'input_shlib_path': '<(SHARED_LIB_DIR)/<(SHARED_LIB_PREFIX)webrtc_perf_tests<(SHARED_LIB_SUFFIX)', - }, 'dependencies': [ - 'webrtc_perf_tests', - ], - 'includes': [ - '../build/apk_test.gypi', + '<(apk_tests_path):webrtc_perf_tests_apk', ], }, ], -- cgit v1.2.3