Disable qcms_tests target for Android or iOS.

BUG=578960,577155
TESTS=qcms_tests target not available on Android build, both
GYP and GN. Build and run qcms_tests target on Linux build.

Review URL: https://codereview.chromium.org/1609643003

Cr-Commit-Position: refs/heads/master@{#370394}

2 files changed, 34 insertions, 18 deletions

diff --git a/third_party/qcms/BUILD.gn b/third_party/qcms/BUILD.gn
index e6041e7..6b4cf46 100644
--- a/third_party/qcms/BUILD.gn
+++ b/third_party/qcms/BUILD.gn
@@ -6,8 +6,11 @@ config("qcms_config") {
   include_dirs = [ "src" ]
 }
 
+# Do not build QCMS on Android or iOS. (See http://crbug.com/577155)
+disable_qcms = is_android || is_ios
+
 source_set("qcms") {
-  if (is_android || is_ios) {
+  if (disable_qcms) {
     sources = [
       "src/empty.c",
     ]
@@ -45,7 +48,7 @@ source_set("qcms") {
   }
 }
 
-if (current_cpu == "x86" || current_cpu == "x64") {
+if (!disable_qcms && (current_cpu == "x86" || current_cpu == "x64")) {
   executable("qcms_tests") {
     defines = [ "SSE2_ENABLE" ]
     sources = [
diff --git a/third_party/qcms/qcms.gyp b/third_party/qcms/qcms.gyp
index 4b54db5..c18ffe2 100644
--- a/third_party/qcms/qcms.gyp
+++ b/third_party/qcms/qcms.gyp
@@ -3,6 +3,16 @@
 # found in the LICENSE file.
 
 {
+  'variables': {
+    'conditions': [
+      # Do not build QCMS on Android or iOS. (See http://crbug.com/577155)
+      ['OS == "android" or OS == "ios"', {
+        'disable_qcms%': 1,
+      }, {
+        'disable_qcms%': 0,
+      }],
+    ],
+  },
   'targets': [
     {
       'target_name': 'qcms',
@@ -20,12 +30,11 @@
       },
 
       'conditions': [
-        ['OS=="android" or OS=="ios"', {
+        ['disable_qcms == 1', {
           'sources': [
             'src/empty.c',
           ],
-        }],
-        ['OS!="android" and OS!="ios"', {
+        }, { # disable_qcms == 0
           'sources': [
             'src/chain.c',
             'src/chain.h',
@@ -58,20 +67,17 @@
         }],
       ],
     },
-    {
-      'target_name': 'qcms_tests',
-      'product_name': 'qcms_tests',
-      'type': 'executable',
-      'conditions': [
-        ['target_arch=="ia32" or target_arch=="x64"', {
+  ],
+  'conditions': [
+    ['disable_qcms == 0', {
+      'targets': [
+        {
+          'target_name': 'qcms_tests',
+          'product_name': 'qcms_tests',
+          'type': 'executable',
           'defines': [
             'SSE2_ENABLE',
           ],
-          'sources': [
-            'src/tests/qcms_test_tetra_clut_rgba.c',
-            'src/tests/qcms_test_main.c',
-            'src/tests/qcms_test_munsell.c',
-          ],
           'dependencies': [
             'qcms',
           ],
@@ -81,10 +87,17 @@
                 '-lm',
               ],
             }],
+            ['target_arch=="ia32" or target_arch=="x64"', {
+              'sources': [
+                'src/tests/qcms_test_tetra_clut_rgba.c',
+                'src/tests/qcms_test_main.c',
+                'src/tests/qcms_test_munsell.c',
+              ],
+            }],
           ],
-        }],
+        },
       ],
-    },  
+    }],
   ],
 }