| Index: build/android/java_cpp_string.gypi
|
| diff --git a/build/android/java_cpp_enum.gypi b/build/android/java_cpp_string.gypi
|
| similarity index 69%
|
| copy from build/android/java_cpp_enum.gypi
|
| copy to build/android/java_cpp_string.gypi
|
| index d4abafa812f95e753eb93a5b57ef3eba059e2cd5..2550dc6543c9a2c03989e4edd42fe0c72de149f6 100644
|
| --- a/build/android/java_cpp_enum.gypi
|
| +++ b/build/android/java_cpp_string.gypi
|
| @@ -1,19 +1,19 @@
|
| -# Copyright 2014 The Chromium Authors. All rights reserved.
|
| +# Copyright 2016 The Chromium Authors. All rights reserved.
|
| # Use of this source code is governed by a BSD-style license that can be
|
| # found in the LICENSE file.
|
|
|
| # This file is meant to be included into a target to provide an action
|
| -# to generate Java source files from a C++ header file containing annotated
|
| -# enum definitions using a Python script.
|
| +# to generate Java source files from a C++ file containing annotated
|
| +# string definitions using a Python script.
|
| #
|
| # To use this, create a gyp target with the following form:
|
| # {
|
| -# 'target_name': 'bitmap_format_java',
|
| +# 'target_name': 'content_settings_type_java',
|
| # 'type': 'none',
|
| # 'variables': {
|
| -# 'source_file': 'ui/android/bitmap_format.h',
|
| +# 'source_file': '../components/content_settings/core/common/content_settings_types.cc',
|
| # },
|
| -# 'includes': [ '../build/android/java_cpp_enum.gypi' ],
|
| +# 'includes': [ '../build/android/java_cpp_string.gypi' ],
|
| # },
|
| #
|
| # Then have the gyp target which compiles the java code depend on the newly
|
| @@ -22,8 +22,8 @@
|
| {
|
| 'variables': {
|
| # Location where all generated Java sources will be placed.
|
| - 'output_dir': '<(SHARED_INTERMEDIATE_DIR)/enums/<(_target_name)',
|
| - 'generator_path': '<(DEPTH)/build/android/gyp/java_cpp_enum.py',
|
| + 'output_dir': '<(SHARED_INTERMEDIATE_DIR)/strings/<(_target_name)',
|
| + 'generator_path': '<(DEPTH)/build/android/gyp/java_cpp_string.py',
|
| 'generator_args': '<(output_dir) <(source_file)',
|
| },
|
| 'direct_dependent_settings': {
|
| @@ -52,13 +52,13 @@
|
| # This is the main reason this is an action and not a rule. Gyp doesn't
|
| # properly expand RULE_INPUT_PATH here and so it's impossible to
|
| # calculate the list of outputs.
|
| - '<!@pymod_do_main(java_cpp_enum --print_output_only '
|
| + '<!@pymod_do_main(java_cpp_string --print_output_only '
|
| '<@(generator_args))',
|
| ],
|
| 'action': [
|
| 'python', '<(generator_path)', '<@(generator_args)'
|
| ],
|
| - 'message': 'Generating Java from cpp header <(source_file)',
|
| + 'message': 'Generating Java String constants from cpp file <(source_file)',
|
| },
|
| ],
|
| }
|
|
|