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

Side by Side Diff: build/config/android/internal_rules.gni

Issue 2840533003: [android] Make main_dex_list.py use the same proguard as everything else. (Closed)
Patch Set: remove unused constant Created 3 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 | « build/android/pylib/constants/__init__.py ('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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 # Do not add any imports to non-//build directories here. 5 # Do not add any imports to non-//build directories here.
6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in. 6 # Some projects (e.g. V8) do not have non-build directories DEPS'ed in.
7 import("//build_overrides/build.gni") 7 import("//build_overrides/build.gni")
8 import("//build/config/android/config.gni") 8 import("//build/config/android/config.gni")
9 import("//build/config/dcheck_always_on.gni") 9 import("//build/config/dcheck_always_on.gni")
10 import("//build/config/sanitizers/sanitizers.gni") 10 import("//build/config/sanitizers/sanitizers.gni")
(...skipping 23 matching lines...) Expand all
34 "*android_webview/glue:glue", 34 "*android_webview/glue:glue",
35 "//chrome/test/android/cast_emulator:cast_emulator", 35 "//chrome/test/android/cast_emulator:cast_emulator",
36 ] 36 ]
37 37
38 # Targets that match the whitelist but are not actually java targets. 38 # Targets that match the whitelist but are not actually java targets.
39 _java_target_blacklist = [ 39 _java_target_blacklist = [
40 "//chrome:packed_resources", 40 "//chrome:packed_resources",
41 "*:*_unpack_aar", 41 "*:*_unpack_aar",
42 ] 42 ]
43 43
44 _default_proguard_jar_path = "//third_party/proguard/lib/proguard.jar"
45
44 # Write the target's .build_config file. This is a json file that contains a 46 # Write the target's .build_config file. This is a json file that contains a
45 # dictionary of information about how to build this target (things that 47 # dictionary of information about how to build this target (things that
46 # require knowledge about this target's dependencies and cannot be calculated 48 # require knowledge about this target's dependencies and cannot be calculated
47 # at gn-time). There is a special syntax to add a value in that dictionary to 49 # at gn-time). There is a special syntax to add a value in that dictionary to
48 # an action/action_foreachs args: 50 # an action/action_foreachs args:
49 # --python-arg=@FileArg($rebased_build_config_path:key0:key1) 51 # --python-arg=@FileArg($rebased_build_config_path:key0:key1)
50 # At runtime, such an arg will be replaced by the value in the build_config. 52 # At runtime, such an arg will be replaced by the value in the build_config.
51 # See build/android/gyp/write_build_config.py and 53 # See build/android/gyp/write_build_config.py and
52 # build/android/gyp/util/build_utils.py:ExpandFileArgs 54 # build/android/gyp/util/build_utils.py:ExpandFileArgs
53 template("write_build_config") { 55 template("write_build_config") {
(...skipping 701 matching lines...) Expand 10 before | Expand all | Expand 10 after
755 [ 757 [
756 "deps", 758 "deps",
757 "data_deps", 759 "data_deps",
758 "public_deps", 760 "public_deps",
759 "testonly", 761 "testonly",
760 ]) 762 ])
761 script = "//build/android/gyp/proguard.py" 763 script = "//build/android/gyp/proguard.py"
762 if (defined(invoker.proguard_jar_path)) { 764 if (defined(invoker.proguard_jar_path)) {
763 _proguard_jar_path = invoker.proguard_jar_path 765 _proguard_jar_path = invoker.proguard_jar_path
764 } else { 766 } else {
765 _proguard_jar_path = "//third_party/proguard/lib/proguard.jar" 767 _proguard_jar_path = _default_proguard_jar_path
766 } 768 }
767 _output_jar_path = invoker.output_jar_path 769 _output_jar_path = invoker.output_jar_path
768 inputs = [ 770 inputs = [
769 _proguard_jar_path, 771 _proguard_jar_path,
770 ] 772 ]
771 if (defined(invoker.alternative_android_sdk_jar)) { 773 if (defined(invoker.alternative_android_sdk_jar)) {
772 inputs += [ invoker.alternative_android_sdk_jar ] 774 inputs += [ invoker.alternative_android_sdk_jar ]
773 _rebased_android_sdk_jar = 775 _rebased_android_sdk_jar =
774 rebase_path(invoker.alternative_android_sdk_jar) 776 rebase_path(invoker.alternative_android_sdk_jar)
775 } else { 777 } else {
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
931 "inputs", 933 "inputs",
932 "sources", 934 "sources",
933 "testonly", 935 "testonly",
934 ]) 936 ])
935 937
936 script = "//build/android/gyp/main_dex_list.py" 938 script = "//build/android/gyp/main_dex_list.py"
937 depfile = "$target_gen_dir/$target_name.d" 939 depfile = "$target_gen_dir/$target_name.d"
938 940
939 main_dex_rules = "//build/android/main_dex_classes.flags" 941 main_dex_rules = "//build/android/main_dex_classes.flags"
940 942
943 if (defined(invoker.proguard_jar_path)) {
944 _proguard_jar_path = invoker.proguard_jar_path
945 } else {
946 _proguard_jar_path = _default_proguard_jar_path
947 }
948
941 if (!defined(inputs)) { 949 if (!defined(inputs)) {
942 inputs = [] 950 inputs = []
943 } 951 }
944 inputs += [ main_dex_rules ] 952 inputs += [
953 main_dex_rules,
954 _proguard_jar_path,
955 ]
945 956
946 outputs = [ 957 outputs = [
947 _main_dex_list_path, 958 _main_dex_list_path,
948 ] 959 ]
949 960
950 args = [ 961 args = [
951 "--depfile", 962 "--depfile",
952 rebase_path(depfile, root_build_dir), 963 rebase_path(depfile, root_build_dir),
953 "--android-sdk-tools", 964 "--android-sdk-tools",
954 rebased_android_sdk_build_tools, 965 rebased_android_sdk_build_tools,
955 "--main-dex-list-path", 966 "--main-dex-list-path",
956 rebase_path(_main_dex_list_path, root_build_dir), 967 rebase_path(_main_dex_list_path, root_build_dir),
957 "--main-dex-rules-path", 968 "--main-dex-rules-path",
958 rebase_path(main_dex_rules, root_build_dir), 969 rebase_path(main_dex_rules, root_build_dir),
970 "--proguard-path",
971 rebase_path(_proguard_jar_path, root_build_dir),
959 ] 972 ]
960 973
961 if (defined(invoker.extra_main_dex_proguard_config)) { 974 if (defined(invoker.extra_main_dex_proguard_config)) {
962 inputs += [ invoker.extra_main_dex_proguard_config ] 975 inputs += [ invoker.extra_main_dex_proguard_config ]
963 args += [ 976 args += [
964 "--main-dex-rules-path", 977 "--main-dex-rules-path",
965 rebase_path(invoker.extra_main_dex_proguard_config, root_build_dir), 978 rebase_path(invoker.extra_main_dex_proguard_config, root_build_dir),
966 ] 979 ]
967 } 980 }
968 981
(...skipping 1808 matching lines...) Expand 10 before | Expand all | Expand 10 after
2777 rebase_path(root_build_dir, root_build_dir), 2790 rebase_path(root_build_dir, root_build_dir),
2778 "--packed-libraries-dir", 2791 "--packed-libraries-dir",
2779 rebase_path(_packed_libraries_dir, root_build_dir), 2792 rebase_path(_packed_libraries_dir, root_build_dir),
2780 "--libraries=${invoker.libraries_filearg}", 2793 "--libraries=${invoker.libraries_filearg}",
2781 "--filelistjson", 2794 "--filelistjson",
2782 rebase_path(invoker.file_list_json, root_build_dir), 2795 rebase_path(invoker.file_list_json, root_build_dir),
2783 ] 2796 ]
2784 } 2797 }
2785 } 2798 }
2786 } 2799 }
OLDNEW
« no previous file with comments | « build/android/pylib/constants/__init__.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698