Index: ppapi/ppapi_nacl_test_common.gyp |
diff --git a/chrome/test/data/nacl/nacl_browser_test.gypi b/ppapi/ppapi_nacl_test_common.gyp |
similarity index 79% |
rename from chrome/test/data/nacl/nacl_browser_test.gypi |
rename to ppapi/ppapi_nacl_test_common.gyp |
index 1fd222f97ca2e2ae81f8658474888bd34a939e66..cff92d8e74d7b043713d4e06ff6e0aea89ea0c1d 100644 |
--- a/chrome/test/data/nacl/nacl_browser_test.gypi |
+++ b/ppapi/ppapi_nacl_test_common.gyp |
@@ -1,27 +1,49 @@ |
-# Copyright (c) 2012 The Chromium Authors. All rights reserved. |
+# Copyright (c) 2013 The Chromium Authors. All rights reserved. |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
{ |
'includes': [ |
- '../../../../native_client/build/untrusted.gypi', |
+ '../native_client/build/untrusted.gypi', |
], |
- 'target_defaults': { |
+ 'targets': [ |
+ { |
+ 'target_name': 'nacl_test_common', |
+ 'type': 'none', |
+ 'dependencies': [ |
+ '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib', |
+ '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', |
+ '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib', |
+ ], |
+ 'direct_dependent_settings': { |
# We need to override the variables in untrusted.gypi outside of a |
# target_condition block because the target_condition block in |
# untrusted gypi is fully evaluated and interpolated before any of the |
- # target_condition blocks in this file are expanded. This means that any |
- # variables overriden inside a target_condition block in this file will not |
- # affect the values in untrusted.gypi. |
+ # target_condition blocks in this file are expanded. This means that |
+ # any variables overriden inside a target_condition block in this file |
+ # will not affect the values in untrusted.gypi. |
'variables': { |
'test_files': [], |
- 'nacl_newlib_out_dir': '<(PRODUCT_DIR)/nacl_test_data/newlib', |
- 'nacl_glibc_out_dir': '<(PRODUCT_DIR)/nacl_test_data/glibc', |
- 'nacl_pnacl_newlib_out_dir': '<(PRODUCT_DIR)/nacl_test_data/pnacl', |
+ 'nacl_newlib_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/newlib', |
+ 'nacl_glibc_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/glibc', |
+ 'nacl_pnacl_newlib_out_dir': '<(PRODUCT_DIR)/>(nexe_destination_dir)/pnacl', |
'target_conditions': [ |
['nexe_target!=""', { |
- # These variables are used for nexe building and for library building, |
- # so they should be unconditionally re-defined. |
+ # Patch over the fact that untrusted.gypi doesn't define these in |
+ # all cases. |
+ 'enable_x86_64%': 0, |
+ 'enable_x86_32%': 0, |
+ 'enable_arm%': 0, |
+ 'link_flags': [ |
+ '-lppapi_cpp', |
+ '-lppapi', |
+ '-pthread', |
+ ], |
+ 'extra_args': [ |
+ '--strip-all', |
+ ], |
+ # These variables are used for nexe building and for library |
+ # building, so they should be unconditionally re-defined. |
'out_newlib32': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_32.nexe', |
'out_newlib64': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_x86_64.nexe', |
'out_newlib_arm': '>(nacl_newlib_out_dir)/>(nexe_target)_newlib_arm.nexe', |
@@ -35,11 +57,6 @@ |
}], |
], |
}, |
- 'dependencies': [ |
- '<(DEPTH)/native_client/src/untrusted/nacl/nacl.gyp:nacl_lib', |
- '<(DEPTH)/ppapi/ppapi_untrusted.gyp:ppapi_cpp_lib', |
- '<(DEPTH)/ppapi/native_client/native_client.gyp:ppapi_lib', |
- ], |
'target_conditions': [ |
['test_files!=[] and build_newlib==1', { |
'copies': [ |
@@ -72,39 +89,21 @@ |
], |
}], |
['nexe_target!=""', { |
- 'variables': { |
- # Patch over the fact that untrusted.gypi doesn't define these in all |
- # cases. |
- 'enable_x86_64%': 0, |
- 'enable_x86_32%': 0, |
- 'enable_arm%': 0, |
- 'include_dirs': [ |
- '<(DEPTH)', |
- ], |
- 'link_flags': [ |
- '-lppapi_cpp', |
- '-lppapi', |
- '-pthread', |
- ], |
- 'extra_args': [ |
- '--strip-all', |
- ], |
- }, |
'target_conditions': [ |
['build_newlib==1', { |
'actions': [ |
{ |
'action_name': 'Generate NEWLIB NMF', |
- # Unlike glibc, nexes are not actually inputs - only the names matter. |
- # We don't have the nexes as inputs because the ARM nexe may not |
- # exist. However, VS 2010 seems to blackhole this entire target if |
- # there are no inputs to this action. To work around this we add a |
- # bogus input. |
+ # Unlike glibc, nexes are not actually inputs - only the |
+ # names matter. We don't have the nexes as inputs because |
+ # the ARM nexe may not exist. However, VS 2010 seems to |
+ # blackhole this entire target if there are no inputs to |
+ # this action. To work around this we add a bogus input. |
'inputs': [], |
'outputs': ['>(nmf_newlib)'], |
'action': [ |
'python', |
- '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', |
+ '>(current_depth)/native_client_sdk/src/tools/create_nmf.py', |
'>@(_inputs)', |
'--output=>(nmf_newlib)', |
], |
@@ -140,7 +139,7 @@ |
'outputs': ['>(nmf_glibc)'], |
'action': [ |
'python', |
- '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', |
+ '>(current_depth)/native_client_sdk/src/tools/create_nmf.py', |
'>@(_inputs)', |
'--objdump=>(nacl_objdump)', |
'--output=>(nmf_glibc)', |
@@ -162,7 +161,8 @@ |
'--library-path=<(SHARED_INTERMEDIATE_DIR)/tc_glibc/lib32', |
], |
}], |
- # TODO(ncbray) handle arm case. We don't have ARM glibc yet. |
+ # TODO(ncbray) handle arm case. We don't have ARM glibc |
+ # yet. |
], |
}, |
], |
@@ -175,7 +175,7 @@ |
'outputs': ['>(nmf_pnacl_newlib)'], |
'action': [ |
'python', |
- '<(DEPTH)/native_client_sdk/src/tools/create_nmf.py', |
+ '>(current_depth)/native_client_sdk/src/tools/create_nmf.py', |
'>@(_inputs)', |
'--output=>(nmf_pnacl_newlib)', |
], |
@@ -185,5 +185,7 @@ |
], |
}], |
], |
- }, |
+ }, |
+ }, |
+ ], |
} |