Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(5)

Side by Side Diff: build/java.gypi

Issue 10963041: Revert "Revert 158067 - Remove native side of content_view_client" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add additional_input_paths as a variable and input to java.gypi Created 8 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 # This file is meant to be included into a target to provide a rule 5 # This file is meant to be included into a target to provide a rule
6 # to build Java in a consistent manner. 6 # to build Java in a consistent manner.
7 # 7 #
8 # To use this, create a gyp target with the following form: 8 # To use this, create a gyp target with the following form:
9 # { 9 # {
10 # 'target_name': 'my-package_java', 10 # 'target_name': 'my-package_java',
(...skipping 21 matching lines...) Expand all
32 '<(DEPTH)/build/build_output_dirs_android.gyp:build_output_dirs' 32 '<(DEPTH)/build/build_output_dirs_android.gyp:build_output_dirs'
33 ], 33 ],
34 'direct_dependent_settings': { 34 'direct_dependent_settings': {
35 'variables': { 35 'variables': {
36 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar '], 36 'input_jars_paths': ['<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar '],
37 }, 37 },
38 }, 38 },
39 'variables': { 39 'variables': {
40 'input_jars_paths': [], 40 'input_jars_paths': [],
41 'additional_src_dirs': [], 41 'additional_src_dirs': [],
42 'additional_input_paths': [],
42 }, 43 },
43 'actions': [ 44 'actions': [
44 { 45 {
45 'action_name': 'ant_<(package_name)', 46 'action_name': 'ant_<(package_name)',
46 'message': 'Building <(package_name) java sources.', 47 'message': 'Building <(package_name) java sources.',
47 'inputs': [ 48 'inputs': [
48 'android/ant/common.xml', 49 'android/ant/common.xml',
49 'android/ant/chromium-jars.xml', 50 'android/ant/chromium-jars.xml',
50 '<!@(find <(java_in_dir) -name "*.java")', 51 '<!@(find <(java_in_dir) -name "*.java")',
51 '>@(input_jars_paths)', 52 '>@(input_jars_paths)',
53 '>@(additional_input_paths)',
52 ], 54 ],
53 'outputs': [ 55 'outputs': [
54 '<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar', 56 '<(PRODUCT_DIR)/lib.java/chromium_<(package_name).jar',
55 ], 57 ],
56 'action': [ 58 'action': [
57 'ant', 59 'ant',
58 '-DPRODUCT_DIR=<(ant_build_out)', 60 '-DPRODUCT_DIR=<(ant_build_out)',
59 '-DPACKAGE_NAME=<(package_name)', 61 '-DPACKAGE_NAME=<(package_name)',
60 '-DINPUT_JARS_PATHS=>(input_jars_paths)', 62 '-DINPUT_JARS_PATHS=>(input_jars_paths)',
61 '-DADDITIONAL_SRC_DIRS=>(additional_src_dirs)', 63 '-DADDITIONAL_SRC_DIRS=>(additional_src_dirs)',
62 '-DANDROID_SDK=<(android_sdk)', 64 '-DANDROID_SDK=<(android_sdk)',
63 '-DANDROID_SDK_ROOT=<(android_sdk_root)', 65 '-DANDROID_SDK_ROOT=<(android_sdk_root)',
64 '-DANDROID_SDK_TOOLS=<(android_sdk_tools)', 66 '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
65 '-DANDROID_SDK_VERSION=<(android_sdk_version)', 67 '-DANDROID_SDK_VERSION=<(android_sdk_version)',
66 '-DANDROID_GDBSERVER=<(android_gdbserver)', 68 '-DANDROID_GDBSERVER=<(android_gdbserver)',
67 '-Dbasedir=<(java_in_dir)', 69 '-Dbasedir=<(java_in_dir)',
68 '-buildfile', 70 '-buildfile',
69 '<(DEPTH)/build/android/ant/chromium-jars.xml' 71 '<(DEPTH)/build/android/ant/chromium-jars.xml'
70 ] 72 ]
71 }, 73 },
72 ], 74 ],
73 } 75 }
OLDNEW
« no previous file with comments | « base/android/jni_generator/jni_generator.py ('k') | content/browser/android/browser_jni_registrar.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698