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

Side by Side Diff: chrome/chrome_android.gypi

Issue 11308030: Use _target_name instead of package_name for java*.gypi (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@apk_jar
Patch Set: Created 8 years, 1 month 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
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 'variables': { 5 'variables': {
6 'chromium_code': 1, 6 'chromium_code': 1,
7 }, 7 },
8 'includes': [ 8 'includes': [
9 'chrome_android_paks.gypi', # Included for the list of pak resources. 9 'chrome_android_paks.gypi', # Included for the list of pak resources.
10 ], 10 ],
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
42 { 42 {
43 'target_name': 'chromium_testshell', 43 'target_name': 'chromium_testshell',
44 'type': 'none', 44 'type': 'none',
45 'dependencies': [ 45 'dependencies': [
46 '../media/media.gyp:media_java', 46 '../media/media.gyp:media_java',
47 'chrome.gyp:chrome_java', 47 'chrome.gyp:chrome_java',
48 'chrome_android_paks', 48 'chrome_android_paks',
49 'libchromiumtestshell', 49 'libchromiumtestshell',
50 ], 50 ],
51 'variables': { 51 'variables': {
52 'package_name': 'chromium_testshell',
53 'apk_name': 'ChromiumTestShell', 52 'apk_name': 'ChromiumTestShell',
54 'manifest_package_name': 'org.chromium.chrome.testshell', 53 'manifest_package_name': 'org.chromium.chrome.testshell',
55 'java_in_dir': 'android/testshell/java', 54 'java_in_dir': 'android/testshell/java',
56 'resource_dir': '../res', 55 'resource_dir': '../res',
57 'asset_location': '<(ant_build_out)/../assets/chrome', 56 'asset_location': '<(ant_build_out)/../assets/chrome',
58 'native_libs_paths': [ '<(SHARED_LIB_DIR)/libchromiumtestshell.so', ], 57 'native_libs_paths': [ '<(SHARED_LIB_DIR)/libchromiumtestshell.so', ],
59 'additional_input_paths': [ '<@(chrome_android_pak_output_resources)', ] , 58 'additional_input_paths': [ '<@(chrome_android_pak_output_resources)', ] ,
60 }, 59 },
61 'includes': [ '../build/java_apk.gypi', ], 60 'includes': [ '../build/java_apk.gypi', ],
62 }, 61 },
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
139 ], 138 ],
140 'copies': [ 139 'copies': [
141 { 140 {
142 'destination': '<(chrome_android_pak_output_folder)', 141 'destination': '<(chrome_android_pak_output_folder)',
143 'files': [ '<@(chrome_android_pak_input_resources)' ], 142 'files': [ '<@(chrome_android_pak_input_resources)' ],
144 } 143 }
145 ], 144 ],
146 }, 145 },
147 ], 146 ],
148 } 147 }
OLDNEW
« build/java.gypi ('K') | « chrome/chrome.gyp ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698