libvpx.gyp : issues fix for webview.

libvpx.gyp

Index: libvpx.gyp
diff --git a/libvpx.gyp b/libvpx.gyp
index 3e93783e2a7273fd74189afd2389a6696278eab4..212af7aa1902611d5fd9d3879ce7e4f57a172093 100644
--- a/libvpx.gyp
+++ b/libvpx.gyp
@@ -53,7 +53,7 @@
     'variables': {
       'conditions': [
         ['OS=="win" and buildtype=="Official"', {
-          # Do not set to 'size', as it results in an error on win64. 
+          # Do not set to 'size', as it results in an error on win64.
           'optimize' :'speed',
         }],
       ],
@@ -284,8 +284,6 @@
           # .include directive files from the place where they're
           # generated to.
           'cflags': [
-             '-Wa,-I,<!(pwd)/source/config/<(OS_CATEGORY)/<(target_arch_full)',
-             '-Wa,-I,<!(pwd)/source/config',
              '-Wa,-I,<(shared_generated_dir)',
           ],
           'xcode_settings': {
@@ -353,6 +351,16 @@
                 ],
               },
             }],
+            # .include directive files from the place where they're
+            # generated to, but they aren't used in android webview and
+            # generate the absolute path which isn't allowed in Android make
+            # file.
+            ['android_webview_build!=1', {
+              'cflags': [

[Johann, 2014/05/16 04:15:58]

would prefer to keep the chunks that modify cflags together. This could be moved
up or the other directive could be moved down.

# Add include paths for assembler:
cflags[...]
# For android webview, the following paths are not required and not allowed:
webview!=1[...]

I believe the reason for some of these paths were os x clang searched
differently than other versions we were using. But this isn't under
xcode_settings so I may be misremembering.

[michaelbai, 2014/05/16 18:09:00]

xcode_settings has same setting in line 291,  and
Do you know why the path leads with comma?


On 2014/05/16 04:15:58, Johann wrote:

[Johann, 2014/05/16 18:25:31]

All the more reason to keep these modification close to each other
the , trailing -Wa and -I? I do not know what that means.

[michaelbai, 2014/05/16 19:57:31]

Put them together


On 2014/05/16 18:25:31, Johann wrote:

[Torne, 2014/05/19 09:02:09]

-Wa is the gcc option for passing arguments to the assembler. The commas
separate the different arguments to pass to the assembler, so that it can tell
the difference between you wanting to pass N assembler arguments from you
wanting to pass, say, N-1 assembler arguments and 1 other gcc argument. So,
-Wa,-I,foo means "pass the arguments -I and foo to the assembler". Without the
commas gcc would attempt to interpret the -I and foo args itself.

+                '-Wa,-I,<!(pwd)/source/config/<(OS_CATEGORY)/<(target_arch_full)',
+                '-Wa,-I,<!(pwd)/source/config',
+              ],
+            }],
           ],
         },
       ],
@@ -457,7 +465,7 @@
           ['android_webview_build==1', {
             # pass the empty string for 3rd and 4th arguments of
             # intermediates-dir-for macro.
-            'lib_intermediate_name' : '$(realpath $(call intermediates-dir-for, STATIC_LIBRARIES, libvpx_asm_offsets_vp8,,, $(GYP_VAR_PREFIX)))/libvpx_asm_offsets_vp8.a',
+            'lib_intermediate_name' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vp8,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vp8.a',
           }],
           ['(target_arch=="arm" or target_arch=="armv7")', {
             'output_format': 'gas',
@@ -530,7 +538,7 @@
           ['android_webview_build==1', {
             # pass the empty string for 3rd and 4th arguments of
             # intermediates-dir-for macro.
-            'lib_intermediate_name' : '<(android_src)/$(call intermediates-dir-for, STATIC_LIBRARIES, libvpx_asm_offsets_vpx_scale,,, $(GYP_VAR_PREFIX))/libvpx_asm_offsets_vpx_scale.a',
+            'lib_intermediate_name' : '$(abspath $(call intermediates-dir-for,STATIC_LIBRARIES,libvpx_asm_offsets_vpx_scale,,,$(gyp_var_prefix)))/libvpx_asm_offsets_vpx_scale.a',
           }],
           ['(target_arch=="arm" or target_arch=="armv7")', {
             'output_format': 'gas',