diff options
| author | sehr@chromium.org <sehr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-22 22:19:32 +0000 |
|---|---|---|
| committer | sehr@chromium.org <sehr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-22 22:19:32 +0000 |
| commit | 49701e0a8e8c72efc5088032e290613f641f9de5 (patch) | |
| tree | a7aff1701f9915b99031f86d6f4b4436f01e7d35 /gpu | |
| parent | 87acf4dd72e3b0494491893b4fc367a6025b1f3c (diff) | |
| download | chromium_src-49701e0a8e8c72efc5088032e290613f641f9de5.zip chromium_src-49701e0a8e8c72efc5088032e290613f641f9de5.tar.gz chromium_src-49701e0a8e8c72efc5088032e290613f641f9de5.tar.bz2 | |
Some build changes for nacl on Android
1) Use TOOLCHAIN_OS rather than OS for package names
2) gpu_nacl.gyp shouldn't include trusted code test dependencies.
BUG= https://code.google.com/p/nativeclient/issues/detail?id=3032
R=bbudge@chromium.org, bradnelson@google.com, piman@chromium.org, sievers@chromium.org
Review URL: https://codereview.chromium.org/295933013
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272345 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu')
| -rw-r--r-- | gpu/gpu.gyp | 11 | ||||
| -rw-r--r-- | gpu/gpu_common.gypi | 17 |
2 files changed, 11 insertions, 17 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 9d52a33..7731825 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -606,6 +606,17 @@ '../build/apk_test.gypi', ], }, + { + 'target_name': 'gpu_unittests_apk', + 'type': 'none', + 'dependencies': [ + 'gpu_unittests', + ], + 'variables': { + 'test_suite_name': 'gpu_unittests', + }, + 'includes': [ '../build/apk_test.gypi' ], + }, ], }], ], diff --git a/gpu/gpu_common.gypi b/gpu/gpu_common.gypi index e5027b5..dda0f34 100644 --- a/gpu/gpu_common.gypi +++ b/gpu/gpu_common.gypi @@ -48,21 +48,4 @@ 'command_buffer/client/vertex_array_object_manager.h', ] }, - 'conditions': [ - ['OS == "android"', { - 'targets': [ - { - 'target_name': 'gpu_unittests_apk', - 'type': 'none', - 'dependencies': [ - 'gpu_unittests', - ], - 'variables': { - 'test_suite_name': 'gpu_unittests', - }, - 'includes': [ '../build/apk_test.gypi' ], - }, - ], - }], - ], } |