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

Side by Side Diff: testing/android/native_test.gyp

Issue 10829291: Android's native_tests.gyp should take WebKit's directory structure into account. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Patch Created 8 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « build/apk_test.gypi ('k') | testing/android/native_test_apk.xml » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'conditions': [ 6 'conditions': [
7 ['OS=="android"', { 7 ['OS=="android"', {
8 'targets': [ 8 'targets': [
9 { 9 {
10 'target_name': 'native_test_apk', 10 'target_name': 'native_test_apk',
(...skipping 20 matching lines...) Expand all
31 'outputs': [ 31 'outputs': [
32 # Awkwardly, we build a Debug APK even when gyp is in 32 # Awkwardly, we build a Debug APK even when gyp is in
33 # Release mode. I don't think it matters (e.g. we're 33 # Release mode. I don't think it matters (e.g. we're
34 # probably happy to not codesign) but naming should be 34 # probably happy to not codesign) but naming should be
35 # fixed. The -debug name is an aspect of the android 35 # fixed. The -debug name is an aspect of the android
36 # SDK antfiles (e.g. ${sdk.dir}/tools/ant/build.xml) 36 # SDK antfiles (e.g. ${sdk.dir}/tools/ant/build.xml)
37 '<(PRODUCT_DIR)/replaceme_apk/replaceme-debug.apk', 37 '<(PRODUCT_DIR)/replaceme_apk/replaceme-debug.apk',
38 ], 38 ],
39 'action': [ 39 'action': [
40 'ant', 40 'ant',
41 # TODO: All of these paths are absolute paths right now, while
42 # we really should be using relative paths for anything that is
43 # checked in to the Chromium tree (among which the SDK).
41 '-DPRODUCT_DIR=<(ant_build_out)', 44 '-DPRODUCT_DIR=<(ant_build_out)',
42 '-DANDROID_SDK=<(android_sdk)', 45 '-DANDROID_SDK=<(android_sdk)',
43 '-DANDROID_SDK_ROOT=<(android_sdk_root)', 46 '-DANDROID_SDK_ROOT=<(android_sdk_root)',
44 '-DANDROID_SDK_TOOLS=<(android_sdk_tools)', 47 '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
45 '-DANDROID_SDK_VERSION=<(android_sdk_version)', 48 '-DANDROID_SDK_VERSION=<(android_sdk_version)',
46 '-DANDROID_TOOLCHAIN=<(android_toolchain)', 49 '-DANDROID_TOOLCHAIN=<(android_toolchain)',
50 '-DCHROMIUM_SRC=<(ant_build_out)/../..',
47 '-buildfile', 51 '-buildfile',
48 '<(DEPTH)/testing/android/native_test_apk.xml', 52 '<(DEPTH)/testing/android/native_test_apk.xml',
49 ] 53 ]
50 } 54 }
51 ], 55 ],
52 }, 56 },
53 { 57 {
54 'target_name': 'native_test_native_code', 58 'target_name': 'native_test_native_code',
55 'message': 'building native pieces of native test package', 59 'message': 'building native pieces of native test package',
56 'type': 'static_library', 60 'type': 'static_library',
(...skipping 29 matching lines...) Expand all
86 'direct_dependent_settings': { 90 'direct_dependent_settings': {
87 'include_dirs': [ 91 'include_dirs': [
88 '<(SHARED_INTERMEDIATE_DIR)', 92 '<(SHARED_INTERMEDIATE_DIR)',
89 ], 93 ],
90 }, 94 },
91 }, 95 },
92 ], 96 ],
93 }] 97 }]
94 ], 98 ],
95 } 99 }
OLDNEW
« no previous file with comments | « build/apk_test.gypi ('k') | testing/android/native_test_apk.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698