| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 | 6 |
| 7 if (is_android) { | 7 if (is_android) { |
| 8 import("//build/config/android/config.gni") | 8 import("//build/config/android/config.gni") |
| 9 } else { | 9 } else { |
| 10 # TODO(brettw) remove this once && early-out is checked in. | 10 # TODO(brettw) remove this once && early-out is checked in. |
| (...skipping 45 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 56 if (is_debug) { | 56 if (is_debug) { |
| 57 # TODO(GYP) this should also be set when release_valgrind_build is set, | 57 # TODO(GYP) this should also be set when release_valgrind_build is set, |
| 58 # but we don't have that flag in the GN build yet. | 58 # but we don't have that flag in the GN build yet. |
| 59 feature_defines_list += [ "WTF_USE_DYNAMIC_ANNOTATIONS=1" ] | 59 feature_defines_list += [ "WTF_USE_DYNAMIC_ANNOTATIONS=1" ] |
| 60 } | 60 } |
| 61 | 61 |
| 62 if (use_concatenated_impulse_responses) { | 62 if (use_concatenated_impulse_responses) { |
| 63 feature_defines_list += [ "WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1" ] | 63 feature_defines_list += [ "WTF_USE_CONCATENATED_IMPULSE_RESPONSES=1" ] |
| 64 } | 64 } |
| 65 | 65 |
| 66 if (is_android) { | 66 if (!is_android) { |
| 67 feature_defines_list += [ | |
| 68 "ENABLE_MEDIA_CAPTURE=1", | |
| 69 ] | |
| 70 } else { | |
| 71 feature_defines_list += [ | 67 feature_defines_list += [ |
| 72 "ENABLE_INPUT_MULTIPLE_FIELDS_UI=1", | 68 "ENABLE_INPUT_MULTIPLE_FIELDS_UI=1", |
| 73 "ENABLE_MEDIA_CAPTURE=0", | |
| 74 "ENABLE_WEB_AUDIO=1", | 69 "ENABLE_WEB_AUDIO=1", |
| 75 ] | 70 ] |
| 76 } | 71 } |
| 77 | 72 |
| 78 if (use_webaudio_ffmpeg) { | 73 if (use_webaudio_ffmpeg) { |
| 79 feature_defines_list += [ "WTF_USE_WEBAUDIO_FFMPEG=1" ] | 74 feature_defines_list += [ "WTF_USE_WEBAUDIO_FFMPEG=1" ] |
| 80 } | 75 } |
| 81 | 76 |
| 82 if (use_openmax_dl_fft) { | 77 if (use_openmax_dl_fft) { |
| 83 feature_defines_list += [ | 78 feature_defines_list += [ |
| (...skipping 17 matching lines...) Expand all Loading... |
| 101 } | 96 } |
| 102 | 97 |
| 103 # feature_defines_string ------------------------------------------------------- | 98 # feature_defines_string ------------------------------------------------------- |
| 104 | 99 |
| 105 # Convert the list to a space-separated string for passing to scripts. | 100 # Convert the list to a space-separated string for passing to scripts. |
| 106 # This would be the equivalent of passing '<(feature_defines)' in GYP. | 101 # This would be the equivalent of passing '<(feature_defines)' in GYP. |
| 107 feature_defines_string = exec_script( | 102 feature_defines_string = exec_script( |
| 108 "build/gn_list_to_space_separated_string.py", | 103 "build/gn_list_to_space_separated_string.py", |
| 109 feature_defines_list, | 104 feature_defines_list, |
| 110 "trim string") | 105 "trim string") |
| OLD | NEW |