Tile Compression

cc/cc_tests.gyp

Index: cc/cc_tests.gyp
diff --git a/cc/cc_tests.gyp b/cc/cc_tests.gyp
index c32fcba76460feab1064f68e90183dc55ffbd69b..4d6103c599cf025dc8882d9ddd2bc5539f1bcabb 100644
--- a/cc/cc_tests.gyp
+++ b/cc/cc_tests.gyp
@@ -343,6 +343,7 @@
         'resources/picture_pile_impl_perftest.cc',
         'resources/tile_task_worker_pool_perftest.cc',
         'resources/task_graph_runner_perftest.cc',
+        'resources/texture_compress/texture_compress_perftest.cc',
         'resources/tile_manager_perftest.cc',
         'test/cc_test_suite.cc',
         'test/run_all_perftests.cc',
@@ -370,6 +371,11 @@
             ],
           }
         ],
+        ['OS == "android"', {
+          'includes': [
+            '../build/android/cpufeatures.gypi',
+          ]
+        }],
       ],
       # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
       'msvs_disabled_warnings': [ 4267, ],