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

Side by Side Diff: build/all_android.gyp

Issue 12913017: Support multiple proguard flags from java_apk.gypi. Proguard supports multiple proguard configurati… (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 7 years, 8 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
« no previous file with comments | « no previous file | build/android/ant/apk-obfuscate.xml » ('j') | 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 is all.gyp file for Android to prevent breakage in Android and other 5 # This is all.gyp file for Android to prevent breakage in Android and other
6 # platform; It will be churning a lot in the short term and eventually be merged 6 # platform; It will be churning a lot in the short term and eventually be merged
7 # into all.gyp. 7 # into all.gyp.
8 8
9 { 9 {
10 'variables': { 10 'variables': {
(...skipping 25 matching lines...) Expand all
36 # 36 #
37 # WARNING: 37 # WARNING:
38 # Do not add targets here without communicating the implications 38 # Do not add targets here without communicating the implications
39 # on tryserver triggers and load. Discuss with jrg please. 39 # on tryserver triggers and load. Discuss with jrg please.
40 'target_name': 'android_builder_tests', 40 'target_name': 'android_builder_tests',
41 'type': 'none', 41 'type': 'none',
42 'dependencies': [ 42 'dependencies': [
43 '../android_webview/android_webview.gyp:android_webview_unittests', 43 '../android_webview/android_webview.gyp:android_webview_unittests',
44 '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests', 44 '../base/android/jni_generator/jni_generator.gyp:jni_generator_tests',
45 '../base/base.gyp:base_unittests', 45 '../base/base.gyp:base_unittests',
46 '../build/android/tests/multiple_proguards/multiple_proguards.gyp:multip le_proguards_test_apk',
46 '../cc/cc_tests.gyp:cc_perftests_apk', 47 '../cc/cc_tests.gyp:cc_perftests_apk',
47 '../cc/cc_tests.gyp:cc_unittests', 48 '../cc/cc_tests.gyp:cc_unittests',
48 '../chrome/chrome.gyp:unit_tests', 49 '../chrome/chrome.gyp:unit_tests',
49 '../components/components.gyp:components_unittests', 50 '../components/components.gyp:components_unittests',
50 '../content/content.gyp:content_browsertests', 51 '../content/content.gyp:content_browsertests',
51 '../content/content.gyp:content_shell_test_apk', 52 '../content/content.gyp:content_shell_test_apk',
52 '../content/content.gyp:content_unittests', 53 '../content/content.gyp:content_unittests',
53 '../gpu/gpu.gyp:gl_tests', 54 '../gpu/gpu.gyp:gl_tests',
54 '../gpu/gpu.gyp:gpu_unittests', 55 '../gpu/gpu.gyp:gpu_unittests',
55 '../ipc/ipc.gyp:ipc_tests', 56 '../ipc/ipc.gyp:ipc_tests',
(...skipping 68 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 { 125 {
125 # In-progress targets that are expected to fail and are NOT run 126 # In-progress targets that are expected to fail and are NOT run
126 # on any bot. 127 # on any bot.
127 'target_name': 'android_in_progress', 128 'target_name': 'android_in_progress',
128 'type': 'none', 129 'type': 'none',
129 'dependencies': [ 130 'dependencies': [
130 ], 131 ],
131 }, 132 },
132 ], # targets 133 ], # targets
133 } 134 }
OLDNEW
« no previous file with comments | « no previous file | build/android/ant/apk-obfuscate.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698