Pepper: Change '*_sources' variables in ppapi_sources.gypi to '*_source_files'.

This makes gyp properly relativize the paths; see
<http://code.google.com/p/gyp/wiki/InputFormatReference#Pathname_Relativization>.

TEST=builds + trybots
TBR=noelallen@chromium.org

Review URL: http://codereview.chromium.org/8975001

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@114751 0039d316-1c4b-4281-b951-d872f2087c98

7 files changed, 22 insertions, 21 deletions

diff --git a/native_client_sdk/src/build_tools/build.scons b/native_client_sdk/src/build_tools/build.scons
index 067c03f..708b5b7 100644
--- a/native_client_sdk/src/build_tools/build.scons
+++ b/native_client_sdk/src/build_tools/build.scons
@@ -164,21 +164,22 @@ ppapi_gl_gypi = gyp_extract.LoadGypFile(os.path.join(ppapi_base,
                                                      'ppapi_gl.gypi'))
 
 # From ppapi_cpp.gypi:ppapi_c:c/[^/]*\.h
-c_headers = GypSources(ppapi_sources_map['c_sources'], 'c/[^/]*\.h')
+c_headers = GypSources(ppapi_sources_map['c_source_files'], 'c/[^/]*\.h')
 
 # From ppapi_cpp.gypi:ppapi_c:c/dev/[^/]*\.h
-c_dev_headers = GypSources(ppapi_sources_map['c_sources'], 'c/dev/[^/]*\.h')
+c_dev_headers = GypSources(ppapi_sources_map['c_source_files'],
+                           'c/dev/[^/]*\.h')
 
 # From ppapi_cpp.gypi:ppapi_cpp_objects:cpp/[^/]*\.h
 # From ppapi_cpp.gypi:ppapi_cpp:cpp/[^/]*\.h
 cpp_headers = (
-    GypSources(ppapi_sources_map['cpp_sources'], 'cpp/[^/]*\.h') +
+    GypSources(ppapi_sources_map['cpp_source_files'], 'cpp/[^/]*\.h') +
     gyp_extract.GypTargetSources(
         ppapi_cpp_gypi, 'ppapi_cpp', 'cpp/[^/]*\.h')
 )
 
 # From ppapi_cpp.gypi:ppapi_cpp_objects:cpp/dev/[^/]*\.h
-cpp_dev_headers = GypSources(ppapi_sources_map['cpp_sources'],
+cpp_dev_headers = GypSources(ppapi_sources_map['cpp_source_files'],
                              'cpp/dev/[^/]*\.h')
 
 # From ppapi_gl.gypi:ppapi_gles2:.*\.h
@@ -204,7 +205,7 @@ cpp_dev_header_install = env.AddHeaderToSdk(
 # From ppapi_cpp.gypi:ppapi_cpp_objects:cpp/[^/]*\.cc
 # From ppapi_cpp.gypi:ppapi_cpp:cpp/[^/]*\.cc
 cpp_trusted_sources = (
-    GypSources(ppapi_sources_map['cpp_sources'], 'cpp/[^/]*\.cc') +
+    GypSources(ppapi_sources_map['cpp_source_files'], 'cpp/[^/]*\.cc') +
     gyp_extract.GypTargetSources(
         ppapi_cpp_gypi, 'ppapi_cpp', 'cpp/[^/]*\.cc')
 )
diff --git a/ppapi/native_client/src/shared/ppapi/build.scons b/ppapi/native_client/src/shared/ppapi/build.scons
index ed7c303..1269684 100644
--- a/ppapi/native_client/src/shared/ppapi/build.scons
+++ b/ppapi/native_client/src/shared/ppapi/build.scons
@@ -26,7 +26,7 @@ env.FilterOut(CCFLAGS=['-Wswitch-enum'])
 
 ppapi_sources_gypi = open(
     env.File('$SOURCE_ROOT/ppapi/ppapi_sources.gypi').abspath, 'r').read()
-ppapi_sources_list = eval(ppapi_sources_gypi)['variables']['cpp_sources']
+ppapi_sources_list = eval(ppapi_sources_gypi)['variables']['cpp_source_files']
 
 ppapi_cpp_gypi = gyp_extract.LoadGypFile(
     env.File('$SOURCE_ROOT/ppapi/ppapi_cpp.gypi').abspath)
diff --git a/ppapi/native_client/src/shared/ppapi/nacl.scons b/ppapi/native_client/src/shared/ppapi/nacl.scons
index bcd8444..c6bc96d 100644
--- a/ppapi/native_client/src/shared/ppapi/nacl.scons
+++ b/ppapi/native_client/src/shared/ppapi/nacl.scons
@@ -21,7 +21,7 @@ env.FilterOut(CCFLAGS=['-Wswitch-enum'])
 
 ppapi_sources_gypi = open(
     env.File('$SOURCE_ROOT/ppapi/ppapi_sources.gypi').abspath, 'r').read()
-ppapi_sources_list = eval(ppapi_sources_gypi)['variables']['cpp_sources']
+ppapi_sources_list = eval(ppapi_sources_gypi)['variables']['cpp_source_files']
 
 ppapi_cpp_gypi = gyp_extract.LoadGypFile(
     env.File('$SOURCE_ROOT/ppapi/ppapi_cpp.gypi').abspath)
diff --git a/ppapi/ppapi_cpp.gypi b/ppapi/ppapi_cpp.gypi
index e4e61aa..00bb8f0 100644
--- a/ppapi/ppapi_cpp.gypi
+++ b/ppapi/ppapi_cpp.gypi
@@ -19,7 +19,7 @@
         ],
       },
       'sources': [
-        '<@(c_sources)',
+        '<@(c_source_files)',
       ],
     },
     {
@@ -32,7 +32,7 @@
         '..',
       ],
       'sources': [
-        '<@(cpp_sources)',
+        '<@(cpp_source_files)',
       ],
       'conditions': [
         ['OS=="win"', {
diff --git a/ppapi/ppapi_sources.gypi b/ppapi/ppapi_sources.gypi
index 5312209..e4fb62f 100644
--- a/ppapi/ppapi_sources.gypi
+++ b/ppapi/ppapi_sources.gypi
@@ -4,7 +4,7 @@
 
 {
   'variables': {
-    'c_sources': [
+    'c_source_files': [
       'c/pp_bool.h',
       'c/pp_completion_callback.h',
       'c/pp_errors.h',
@@ -115,7 +115,7 @@
       'c/trusted/ppb_url_loader_trusted.h',
       'c/trusted/ppp_broker.h',
     ],
-    'cpp_sources': [
+    'cpp_source_files': [
       'cpp/audio.cc',
       'cpp/audio.h',
       'cpp/audio_config.cc',
@@ -249,7 +249,7 @@
     #
     # Common Testing source for trusted and untrusted (NaCl) pugins.
     #
-    'test_sources_common': [
+    'test_common_source_files': [
       # Common test files
       'tests/all_c_includes.h',
       'tests/all_cpp_includes.h',
@@ -274,7 +274,7 @@
     #
     # Sources used in NaCl tests.
     #
-    'test_sources_nacl': [
+    'test_nacl_source_files': [
       # Test cases (PLEASE KEEP THIS SECTION IN ALPHABETICAL ORDER)
       'tests/test_audio_config.cc',
       'tests/test_cursor_control.cc',
@@ -293,7 +293,7 @@
     #
     # Sources used in trusted tests.
     #
-    'test_sources_trusted': [
+    'test_trusted_source_files': [
       # Test cases (PLEASE KEEP THIS SECTION IN ALPHABETICAL ORDER)
       'tests/test_audio.cc',
       'tests/test_audio.h',
@@ -375,10 +375,10 @@
   'conditions': [
     ['p2p_apis==1', {
       'variables': {
-        'c_sources': [
+        'c_source_files': [
           'c/dev/ppb_transport_dev.h',
         ],
-        'cpp_sources': [
+        'cpp_source_files': [
           'cpp/dev/transport_dev.cc',
           'cpp/dev/transport_dev.h',
         ],
diff --git a/ppapi/ppapi_tests.gypi b/ppapi/ppapi_tests.gypi
index 43ad3d3..5680d1b 100644
--- a/ppapi/ppapi_tests.gypi
+++ b/ppapi/ppapi_tests.gypi
@@ -64,8 +64,8 @@
         'lib/gl/include',
       ],
       'sources': [
-        '<@(test_sources_common)',
-        '<@(test_sources_trusted)',
+        '<@(test_common_source_files)',
+        '<@(test_trusted_source_files)',
       ],
       'dependencies': [
         'ppapi.gyp:ppapi_cpp',
diff --git a/ppapi/ppapi_untrusted.gyp b/ppapi/ppapi_untrusted.gyp
index af0313a..eaca938 100644
--- a/ppapi/ppapi_untrusted.gyp
+++ b/ppapi/ppapi_untrusted.gyp
@@ -20,7 +20,7 @@
         'build_glibc': 0,
         'build_newlib': 1,
         'sources': [
-          '<@(cpp_sources)',
+          '<@(cpp_source_files)',
           'cpp/module_embedder.h',
           'cpp/ppp_entrypoints.cc',
         ],
@@ -58,8 +58,8 @@
           '<(SHARED_INTERMEDIATE_DIR)/tc_newlib/lib32/libppapi.a',
         ],
         'sources': [
-          '<@(test_sources_common)',
-          '<@(test_sources_nacl)',
+          '<@(test_common_source_files)',
+          '<@(test_nacl_source_files)',
         ],
       },
     },