| OLD | NEW |
| 1 # Copyright 2012 the V8 project authors. All rights reserved. | 1 # Copyright 2012 the V8 project authors. All rights reserved. |
| 2 # Redistribution and use in source and binary forms, with or without | 2 # Redistribution and use in source and binary forms, with or without |
| 3 # modification, are permitted provided that the following conditions are | 3 # modification, are permitted provided that the following conditions are |
| 4 # met: | 4 # met: |
| 5 # | 5 # |
| 6 # * Redistributions of source code must retain the above copyright | 6 # * Redistributions of source code must retain the above copyright |
| 7 # notice, this list of conditions and the following disclaimer. | 7 # notice, this list of conditions and the following disclaimer. |
| 8 # * Redistributions in binary form must reproduce the above | 8 # * Redistributions in binary form must reproduce the above |
| 9 # copyright notice, this list of conditions and the following | 9 # copyright notice, this list of conditions and the following |
| 10 # disclaimer in the documentation and/or other materials provided | 10 # disclaimer in the documentation and/or other materials provided |
| (...skipping 25 matching lines...) Expand all Loading... |
| 36 'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)', | 36 'android_ndk_root%': '<!(/bin/echo -n $ANDROID_NDK_ROOT)', |
| 37 'android_toolchain%': '<!(/bin/echo -n $ANDROID_TOOLCHAIN)', | 37 'android_toolchain%': '<!(/bin/echo -n $ANDROID_TOOLCHAIN)', |
| 38 }, | 38 }, |
| 39 'conditions': [ | 39 'conditions': [ |
| 40 ['android_ndk_root==""', { | 40 ['android_ndk_root==""', { |
| 41 'variables': { | 41 'variables': { |
| 42 'android_sysroot': '<(android_toolchain)/sysroot/', | 42 'android_sysroot': '<(android_toolchain)/sysroot/', |
| 43 'android_stlport': '<(android_toolchain)/sources/cxx-stl/stlport/', | 43 'android_stlport': '<(android_toolchain)/sources/cxx-stl/stlport/', |
| 44 }, | 44 }, |
| 45 'android_include': '<(android_sysroot)/usr/include', | 45 'android_include': '<(android_sysroot)/usr/include', |
| 46 'android_lib': '<(android_sysroot)/usr/lib', | 46 'conditions': [ |
| 47 ['target_arch=="x64"', { |
| 48 'android_lib': '<(android_sysroot)/usr/lib64', |
| 49 }, { |
| 50 'android_lib': '<(android_sysroot)/usr/lib', |
| 51 }], |
| 52 ], |
| 47 'android_stlport_include': '<(android_stlport)/stlport', | 53 'android_stlport_include': '<(android_stlport)/stlport', |
| 48 'android_stlport_libs': '<(android_stlport)/libs', | 54 'android_stlport_libs': '<(android_stlport)/libs', |
| 49 }, { | 55 }, { |
| 50 'variables': { | 56 'variables': { |
| 51 'android_sysroot': '<(android_ndk_root)/platforms/android-<(android_ta
rget_platform)/arch-<(android_target_arch)', | 57 'android_sysroot': '<(android_ndk_root)/platforms/android-<(android_ta
rget_platform)/arch-<(android_target_arch)', |
| 52 'android_stlport': '<(android_ndk_root)/sources/cxx-stl/stlport/', | 58 'android_stlport': '<(android_ndk_root)/sources/cxx-stl/stlport/', |
| 53 }, | 59 }, |
| 54 'android_include': '<(android_sysroot)/usr/include', | 60 'android_include': '<(android_sysroot)/usr/include', |
| 55 'android_lib': '<(android_sysroot)/usr/lib', | 61 'conditions': [ |
| 62 ['target_arch=="x64"', { |
| 63 'android_lib': '<(android_sysroot)/usr/lib64', |
| 64 }, { |
| 65 'android_lib': '<(android_sysroot)/usr/lib', |
| 66 }], |
| 67 ], |
| 56 'android_stlport_include': '<(android_stlport)/stlport', | 68 'android_stlport_include': '<(android_stlport)/stlport', |
| 57 'android_stlport_libs': '<(android_stlport)/libs', | 69 'android_stlport_libs': '<(android_stlport)/libs', |
| 58 }], | 70 }], |
| 59 ], | 71 ], |
| 60 # Enable to use the system stlport, otherwise statically | 72 # Enable to use the system stlport, otherwise statically |
| 61 # link the NDK one? | 73 # link the NDK one? |
| 62 'use_system_stlport%': '<(android_webview_build)', | 74 'use_system_stlport%': '<(android_webview_build)', |
| 63 'android_stlport_library': 'stlport_static', | 75 'android_stlport_library': 'stlport_static', |
| 64 }, # variables | 76 }, # variables |
| 65 'target_defaults': { | 77 'target_defaults': { |
| (...skipping 154 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 220 '-fPIE', | 232 '-fPIE', |
| 221 ], | 233 ], |
| 222 'ldflags': [ | 234 'ldflags': [ |
| 223 '-pie', | 235 '-pie', |
| 224 ], | 236 ], |
| 225 }], | 237 }], |
| 226 ], | 238 ], |
| 227 'target_conditions': [ | 239 'target_conditions': [ |
| 228 ['_type=="executable"', { | 240 ['_type=="executable"', { |
| 229 'conditions': [ | 241 'conditions': [ |
| 230 ['target_arch=="arm64"', { | 242 ['target_arch=="arm64" or target_arch=="x64"', { |
| 231 'ldflags': [ | 243 'ldflags': [ |
| 232 '-Wl,-dynamic-linker,/system/bin/linker64', | 244 '-Wl,-dynamic-linker,/system/bin/linker64', |
| 233 ], | 245 ], |
| 234 }, { | 246 }, { |
| 235 'ldflags': [ | 247 'ldflags': [ |
| 236 '-Wl,-dynamic-linker,/system/bin/linker', | 248 '-Wl,-dynamic-linker,/system/bin/linker', |
| 237 ], | 249 ], |
| 238 }] | 250 }] |
| 239 ], | 251 ], |
| 240 'ldflags': [ | 252 'ldflags': [ |
| (...skipping 29 matching lines...) Expand all Loading... |
| 270 'ldflags!': [ | 282 'ldflags!': [ |
| 271 '-Wl,-z,noexecstack', | 283 '-Wl,-z,noexecstack', |
| 272 '-Wl,--gc-sections', | 284 '-Wl,--gc-sections', |
| 273 '-Wl,-O1', | 285 '-Wl,-O1', |
| 274 '-Wl,--as-needed', | 286 '-Wl,--as-needed', |
| 275 ], | 287 ], |
| 276 }], | 288 }], |
| 277 ], # target_conditions | 289 ], # target_conditions |
| 278 }, # target_defaults | 290 }, # target_defaults |
| 279 } | 291 } |
| OLD | NEW |