Index: cc/cc.gyp |
diff --git a/cc/cc.gyp b/cc/cc.gyp |
index 43e4b20243a8aafb347bf994a3bc7b7a6c23ec91..b3ff23ed174c3dcb6acdea7d814013e000cb78a6 100644 |
--- a/cc/cc.gyp |
+++ b/cc/cc.gyp |
@@ -20,6 +20,7 @@ |
'<(DEPTH)/ui/events/events.gyp:events_base', |
'<(DEPTH)/ui/gfx/gfx.gyp:gfx', |
'<(DEPTH)/ui/gfx/gfx.gyp:gfx_geometry', |
+ 'cc_opts', |
], |
'variables': { |
'optimize': 'max', |
@@ -458,6 +459,12 @@ |
'resources/skpicture_content_layer_updater.h', |
'resources/task_graph_runner.cc', |
'resources/task_graph_runner.h', |
+ 'resources/texture_compress/atc_dxt.cc', |
+ 'resources/texture_compress/atc_dxt.h', |
+ 'resources/texture_compress/etc1.cc', |
+ 'resources/texture_compress/etc1.h', |
+ 'resources/texture_compress/texture_compress.cc', |
+ 'resources/texture_compress/texture_compress.h', |
'resources/texture_mailbox.cc', |
'resources/texture_mailbox.h', |
'resources/texture_mailbox_deleter.cc', |
@@ -538,6 +545,13 @@ |
], |
# TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
'msvs_disabled_warnings': [ 4267, ], |
+ 'conditions': [ |
+ ['OS == "android"', { |
+ 'includes': [ |
+ '../build/android/cpufeatures.gypi', |
+ ] |
+ }], |
+ ], |
}, |
{ |
# GN version: //cc/surfaces |
@@ -580,5 +594,53 @@ |
'../build/android/increase_size_for_speed.gypi', |
], |
}, |
+ { |
+ 'target_name': 'cc_opts', |
+ 'type': 'static_library', |
+ 'conditions': [ |
+ ['target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', { |
+ 'defines': [ |
+ 'CC_IMPLEMENTATION=1', |
+ ], |
+ 'dependencies': [ |
+ 'cc_opts_neon', |
+ ] |
+ }], |
+ ], |
+ }, |
+ ], |
+ 'conditions': [ |
+ ['target_arch == "arm" and arm_version >= 7 and (arm_neon == 1 or arm_neon_optional == 1)', { |
+ 'targets': [ |
+ { |
+ 'target_name': 'cc_opts_neon', |
+ 'type': 'static_library', |
+ 'dependencies': [ |
+ '<(DEPTH)/base/base.gyp:base', |
+ ], |
+ 'defines': [ |
+ 'CC_IMPLEMENTATION=1', |
+ ], |
+ 'sources': [ |
+ 'resources/texture_compress/arm/atc_dxt_neon.cc', |
+ 'resources/texture_compress/arm/atc_dxt_neon.h', |
+ 'resources/texture_compress/arm/etc1_neon.cc', |
+ 'resources/texture_compress/arm/etc1_neon.h', |
+ ], |
+ # behavior similar to *.c.neon in an Android.mk |
+ 'cflags!': [ |
+ '-mfpu=vfpv3-d16', |
+ ], |
+ 'cflags': [ |
+ '-mfpu=neon', |
+ ], |
+ 'configurations': { |
+ 'Release': { |
+ 'cflags': [ '-O3', '-ffast-math' ], |
+ }, |
+ }, |
+ }, |
+ ], |
+ }], |
], |
} |