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

Side by Side Diff: components/cronet/android/BUILD.gn

Issue 2242243002: Revert of Include generated EffectiveConnectionType.java in cronet api jar and JavaDoc (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 4 years, 4 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 | components/cronet/tools/generate_javadoc.py » ('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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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 import("//build/buildflag_header.gni") 5 import("//build/buildflag_header.gni")
6 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
7 import("//build/config/android/rules.gni") 7 import("//build/config/android/rules.gni")
8 import("//build/util/version.gni") 8 import("//build/util/version.gni")
9 import("//chrome/version.gni") 9 import("//chrome/version.gni")
10 import("//testing/test.gni") 10 import("//testing/test.gni")
(...skipping 798 matching lines...) Expand 10 before | Expand all | Expand 10 after
809 depfile, 809 depfile,
810 invoker.jar_path, 810 invoker.jar_path,
811 ] 811 ]
812 args = [ 812 args = [
813 "--src-dir=${_rebased_src_dirs}", 813 "--src-dir=${_rebased_src_dirs}",
814 "--jar-path", 814 "--jar-path",
815 rebase_path(invoker.jar_path, root_build_dir), 815 rebase_path(invoker.jar_path, root_build_dir),
816 "--depfile", 816 "--depfile",
817 rebase_path(depfile, root_build_dir), 817 rebase_path(depfile, root_build_dir),
818 ] 818 ]
819
820 if (defined(invoker.src_jars)) {
821 _rebased_src_jars = rebase_path(invoker.src_jars, root_build_dir)
822 args += [ "--src-jar=${_rebased_src_jars}" ]
823 }
824 deps = [
825 ":effective_connection_type_java",
826 ]
827 } 819 }
828 } 820 }
829 821
830 jar_src("jar_cronet_api_source") { 822 jar_src("jar_cronet_api_source") {
831 src_dirs = [ "api/src" ] 823 src_dirs = [ "api/src" ]
832
833 # Include generated Java files which should be a part of the API.
834 src_jars = [ "$root_gen_dir/components/cronet/android/effective_connection_typ e_java.srcjar" ]
835 jar_path = "$_package_dir/cronet_api-src.jar" 824 jar_path = "$_package_dir/cronet_api-src.jar"
836 } 825 }
837 826
838 jar_src("jar_cronet_sample_source") { 827 jar_src("jar_cronet_sample_source") {
839 src_dirs = [ "sample" ] 828 src_dirs = [ "sample" ]
840 jar_path = "$_package_dir/cronet-sample-src.jar" 829 jar_path = "$_package_dir/cronet-sample-src.jar"
841 } 830 }
842 831
843 jar_src("jar_cronet_other_source") { 832 jar_src("jar_cronet_other_source") {
844 src_dirs = [ 833 src_dirs = [
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
876 rebase_path("//components/cronet", root_build_dir), 865 rebase_path("//components/cronet", root_build_dir),
877 "--overview-file", 866 "--overview-file",
878 rebase_path("$_package_dir/README.md.html", root_build_dir), 867 rebase_path("$_package_dir/README.md.html", root_build_dir),
879 "--readme-file", 868 "--readme-file",
880 rebase_path("//components/cronet/README.md", root_build_dir), 869 rebase_path("//components/cronet/README.md", root_build_dir),
881 "--depfile", 870 "--depfile",
882 rebase_path(depfile, root_build_dir), 871 rebase_path(depfile, root_build_dir),
883 "--lib-java-dir", 872 "--lib-java-dir",
884 rebase_path("$root_build_dir/lib.java/components/cronet/android", 873 rebase_path("$root_build_dir/lib.java/components/cronet/android",
885 root_build_dir), 874 root_build_dir),
886
887 # JavaDoc is generated from Cronet's API source jar.
888 "--input-src-jar",
889 rebase_path("$_package_dir/cronet_api-src.jar", root_build_dir),
890 ] 875 ]
891 deps = [ 876 deps = [
892 ":cronet_javadoc_classpath", 877 ":cronet_javadoc_classpath",
893 ":jar_cronet_api_source",
894 ] 878 ]
895 } 879 }
896 880
897 copy("cronet_package_copy") { 881 copy("cronet_package_copy") {
898 sources = [ 882 sources = [
899 "$root_out_dir/lib.java/components/cronet/android/cronet_api.jar", 883 "$root_out_dir/lib.java/components/cronet/android/cronet_api.jar",
900 "//AUTHORS", 884 "//AUTHORS",
901 "//chrome/VERSION", 885 "//chrome/VERSION",
902 "//components/cronet/android/proguard.cfg", 886 "//components/cronet/android/proguard.cfg",
903 ] 887 ]
(...skipping 36 matching lines...) Expand 10 before | Expand all | Expand 10 after
940 ":cronet_package_copy_native_lib", 924 ":cronet_package_copy_native_lib",
941 ":cronet_package_copy_native_lib_unstripped", 925 ":cronet_package_copy_native_lib_unstripped",
942 ":generate_javadoc", 926 ":generate_javadoc",
943 ":generate_licenses", 927 ":generate_licenses",
944 ":jar_cronet_api_source", 928 ":jar_cronet_api_source",
945 ":jar_cronet_other_source", 929 ":jar_cronet_other_source",
946 ":jar_cronet_sample_source", 930 ":jar_cronet_sample_source",
947 ":repackage_extracted_jars", 931 ":repackage_extracted_jars",
948 ] 932 ]
949 } 933 }
OLDNEW
« no previous file with comments | « no previous file | components/cronet/tools/generate_javadoc.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698