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

Side by Side Diff: build/java_apk.gypi

Issue 197213006: android: Pass list of java files as command line, instead of through a file list. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 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
« no previous file with comments | « build/java.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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 Android APKs in a consistent manner. 6 # to build Android APKs 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_apk', 10 # 'target_name': 'my_package_apk',
(...skipping 508 matching lines...) Expand 10 before | Expand all | Expand 10 after
519 # wrong .java files when additional_src_dirs is empty. 519 # wrong .java files when additional_src_dirs is empty.
520 # TODO(thakis): Gyp caches >! evaluation by command. Both java.gypi and 520 # TODO(thakis): Gyp caches >! evaluation by command. Both java.gypi and
521 # java_apk.gypi evaluate the same command, and at the moment two targets 521 # java_apk.gypi evaluate the same command, and at the moment two targets
522 # set java_in_dir to "java". Add a dummy comment here to make sure 522 # set java_in_dir to "java". Add a dummy comment here to make sure
523 # that the two targets (one uses java.gypi, the other java_apk.gypi) 523 # that the two targets (one uses java.gypi, the other java_apk.gypi)
524 # get distinct source lists. Medium-term, make targets list all their 524 # get distinct source lists. Medium-term, make targets list all their
525 # Java files instead of using find. (As is, this will be broken if two 525 # Java files instead of using find. (As is, this will be broken if two
526 # targets use the same java_in_dir and both use java_apk.gypi or 526 # targets use the same java_in_dir and both use java_apk.gypi or
527 # both use java.gypi.) 527 # both use java.gypi.)
528 'java_sources': ['>!@(find >(java_in_dir)/src >(additional_src_dirs) -na me "*.java" # apk)'], 528 'java_sources': ['>!@(find >(java_in_dir)/src >(additional_src_dirs) -na me "*.java" # apk)'],
529 'java_source_list': '>|(javasources.<(_target_name).gypcmd >@(java_sourc es))',
530 529
531 }, 530 },
532 'inputs': [ 531 'inputs': [
533 '<(DEPTH)/build/android/gyp/util/build_utils.py', 532 '<(DEPTH)/build/android/gyp/util/build_utils.py',
534 '<(DEPTH)/build/android/gyp/javac.py', 533 '<(DEPTH)/build/android/gyp/javac.py',
535 '>@(java_sources)', 534 '>@(java_sources)',
536 '>(java_source_list)',
537 '>@(input_jars_paths)', 535 '>@(input_jars_paths)',
538 '<(codegen_stamp)', 536 '<(codegen_stamp)',
539 ], 537 ],
540 'conditions': [ 538 'conditions': [
541 ['native_lib_target != ""', { 539 ['native_lib_target != ""', {
542 'inputs': [ '<(native_libraries_java_stamp)' ], 540 'inputs': [ '<(native_libraries_java_stamp)' ],
543 }], 541 }],
544 ], 542 ],
545 'outputs': [ 543 'outputs': [
546 '<(compile_stamp)', 544 '<(compile_stamp)',
547 ], 545 ],
548 'action': [ 546 'action': [
549 'python', '<(DEPTH)/build/android/gyp/javac.py', 547 'python', '<(DEPTH)/build/android/gyp/javac.py',
550 '--output-dir=<(classes_dir)', 548 '--output-dir=<(classes_dir)',
551 '--classpath=>(input_jars_paths) <(android_sdk_jar)', 549 '--classpath=>(input_jars_paths) <(android_sdk_jar)',
552 '--src-filelist=>(java_source_list)',
553 '--src-gendirs=>(gen_src_dirs)', 550 '--src-gendirs=>(gen_src_dirs)',
554 '--javac-includes=<(javac_includes)', 551 '--javac-includes=<(javac_includes)',
555 '--chromium-code=<(chromium_code)', 552 '--chromium-code=<(chromium_code)',
556 '--stamp=<(compile_stamp)', 553 '--stamp=<(compile_stamp)',
554 '>@(java_sources)',
557 ], 555 ],
558 }, 556 },
559 { 557 {
560 'variables': { 558 'variables': {
561 'src_dirs': [ 559 'src_dirs': [
562 '<(java_in_dir)/src', 560 '<(java_in_dir)/src',
563 '>@(additional_src_dirs)', 561 '>@(additional_src_dirs)',
564 ], 562 ],
565 'stamp_path': '<(lint_stamp)', 563 'stamp_path': '<(lint_stamp)',
566 'result_path': '<(lint_result)', 564 'result_path': '<(lint_result)',
(...skipping 195 matching lines...) Expand 10 before | Expand all | Expand 10 after
762 '<(DEPTH)/build/android/ant/apk-package.xml', 760 '<(DEPTH)/build/android/ant/apk-package.xml',
763 761
764 # Add list of inputs to the command line, so if inputs change 762 # Add list of inputs to the command line, so if inputs change
765 # (e.g. if a Java file is removed), the command will be re-run. 763 # (e.g. if a Java file is removed), the command will be re-run.
766 # TODO(newt): remove this once crbug.com/177552 is fixed in ninja. 764 # TODO(newt): remove this once crbug.com/177552 is fixed in ninja.
767 '-DTHIS_IS_IGNORED=>!(echo \'>(_inputs)\' | md5sum)', 765 '-DTHIS_IS_IGNORED=>!(echo \'>(_inputs)\' | md5sum)',
768 ] 766 ]
769 }, 767 },
770 ], 768 ],
771 } 769 }
OLDNEW
« no previous file with comments | « build/java.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698