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

Side by Side Diff: base/BUILD.gn

Issue 1597273005: Move ChromiumMultiDex to BuildConfig. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Prevent jni exception in release. Created 4 years, 11 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
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 # HOW TO WRITE CONDITIONALS IN THIS FILE 5 # HOW TO WRITE CONDITIONALS IN THIS FILE
6 # ====================================== 6 # ======================================
7 # 7 #
8 # In many other places, one would write a conditional that expresses all the 8 # In many other places, one would write a conditional that expresses all the
9 # cases when a source file is used or unused, and then either add or subtract 9 # cases when a source file is used or unused, and then either add or subtract
10 # it from the sources list in that case 10 # it from the sources list in that case
(...skipping 2028 matching lines...) Expand 10 before | Expand all | Expand 10 after
2039 # GYP: //base.gyp:android_runtime_jni_headers 2039 # GYP: //base.gyp:android_runtime_jni_headers
2040 generate_jar_jni("android_runtime_jni_headers") { 2040 generate_jar_jni("android_runtime_jni_headers") {
2041 jni_package = "base" 2041 jni_package = "base"
2042 classes = [ "java/lang/Runtime.class" ] 2042 classes = [ "java/lang/Runtime.class" ]
2043 } 2043 }
2044 2044
2045 # GYP: //base.gyp:base_java 2045 # GYP: //base.gyp:base_java
2046 android_library("base_java") { 2046 android_library("base_java") {
2047 srcjar_deps = [ 2047 srcjar_deps = [
2048 ":base_android_java_enums_srcjar", 2048 ":base_android_java_enums_srcjar",
2049 ":base_multidex_gen", 2049 ":base_chromium_build_config_gen",
2050 ":base_native_libraries_gen", 2050 ":base_native_libraries_gen",
2051 ] 2051 ]
2052 2052
2053 deps = [ 2053 deps = [
2054 "//third_party/android_tools:android_support_multidex_java", 2054 "//third_party/android_tools:android_support_multidex_java",
2055 "//third_party/jsr-305:jsr_305_javalib", 2055 "//third_party/jsr-305:jsr_305_javalib",
2056 ] 2056 ]
2057 2057
2058 DEPRECATED_java_in_dir = "android/java/src" 2058 DEPRECATED_java_in_dir = "android/java/src"
2059 2059
2060 # New versions of ChromiumMultiDex.java and NativeLibraries.java 2060 # New versions of ChromiumBuildConfig.java and NativeLibraries.java
2061 # (with the actual correct values) will be created when creating an apk. 2061 # (with the actual correct values) will be created when creating an apk.
2062 jar_excluded_patterns = [ 2062 jar_excluded_patterns = [
2063 "*/ChromiumMultiDex.class", 2063 "*/ChromiumBuildConfig.class",
2064 "*/NativeLibraries.class", 2064 "*/NativeLibraries.class",
2065 "*/NativeLibraries##*.class", 2065 "*/NativeLibraries##*.class",
2066 ] 2066 ]
2067 } 2067 }
2068 2068
2069 # GYP: //base.gyp:base_javatests 2069 # GYP: //base.gyp:base_javatests
2070 android_library("base_javatests") { 2070 android_library("base_javatests") {
2071 deps = [ 2071 deps = [
2072 ":base_java", 2072 ":base_java",
2073 ":base_java_test_support", 2073 ":base_java_test_support",
(...skipping 14 matching lines...) Expand all
2088 # in the multidex shadow library. crbug.com/522043 2088 # in the multidex shadow library. crbug.com/522043
2089 # GYP: //base.gyp:base_junit_test_support 2089 # GYP: //base.gyp:base_junit_test_support
2090 java_library("base_junit_test_support") { 2090 java_library("base_junit_test_support") {
2091 testonly = true 2091 testonly = true
2092 java_files = [ "test/android/junit/src/org/chromium/base/test/shadows/Shadow MultiDex.java" ] 2092 java_files = [ "test/android/junit/src/org/chromium/base/test/shadows/Shadow MultiDex.java" ]
2093 deps = [ 2093 deps = [
2094 "//third_party/android_tools:android_support_multidex_java", 2094 "//third_party/android_tools:android_support_multidex_java",
2095 "//third_party/robolectric:android-all-4.3_r2-robolectric-0", 2095 "//third_party/robolectric:android-all-4.3_r2-robolectric-0",
2096 "//third_party/robolectric:robolectric_java", 2096 "//third_party/robolectric:robolectric_java",
2097 ] 2097 ]
2098 srcjar_deps = [ ":base_multidex_gen" ] 2098 srcjar_deps = [ ":base_chromium_build_config_gen" ]
2099 } 2099 }
2100 2100
2101 # GYP: //base.gyp:base_junit_tests 2101 # GYP: //base.gyp:base_junit_tests
2102 junit_binary("base_junit_tests") { 2102 junit_binary("base_junit_tests") {
2103 java_files = [ 2103 java_files = [
2104 "android/junit/src/org/chromium/base/BaseChromiumApplicationTest.java", 2104 "android/junit/src/org/chromium/base/BaseChromiumApplicationTest.java",
2105 "android/junit/src/org/chromium/base/LogTest.java", 2105 "android/junit/src/org/chromium/base/LogTest.java",
2106 "test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java", 2106 "test/android/junit/src/org/chromium/base/test/util/DisableIfTest.java",
2107 ] 2107 ]
2108 deps = [ 2108 deps = [
2109 ":base_java", 2109 ":base_java",
2110 ":base_java_test_support", 2110 ":base_java_test_support",
2111 ":base_junit_test_support", 2111 ":base_junit_test_support",
2112 ] 2112 ]
2113 } 2113 }
2114 2114
2115 # GYP: //base.gyp:base_java_application_state 2115 # GYP: //base.gyp:base_java_application_state
2116 # GYP: //base.gyp:base_java_library_load_from_apk_status_codes 2116 # GYP: //base.gyp:base_java_library_load_from_apk_status_codes
2117 # GYP: //base.gyp:base_java_library_process_type 2117 # GYP: //base.gyp:base_java_library_process_type
2118 # GYP: //base.gyp:base_java_memory_pressure_level 2118 # GYP: //base.gyp:base_java_memory_pressure_level
2119 java_cpp_enum("base_android_java_enums_srcjar") { 2119 java_cpp_enum("base_android_java_enums_srcjar") {
2120 sources = [ 2120 sources = [
2121 "android/application_status_listener.h", 2121 "android/application_status_listener.h",
2122 "android/library_loader/library_load_from_apk_status_codes.h", 2122 "android/library_loader/library_load_from_apk_status_codes.h",
2123 "android/library_loader/library_loader_hooks.h", 2123 "android/library_loader/library_loader_hooks.h",
2124 "memory/memory_pressure_listener.h", 2124 "memory/memory_pressure_listener.h",
2125 ] 2125 ]
2126 } 2126 }
2127 2127
2128 # GYP: //base/base.gyp:base_multidex_gen 2128 # GYP: //base/base.gyp:base_chromium_build_config_gen
2129 java_cpp_template("base_multidex_gen") { 2129 java_cpp_template("base_chromium_build_config_gen") {
2130 sources = [ 2130 sources = [
2131 "android/java/templates/ChromiumMultiDex.template", 2131 "android/java/templates/ChromiumBuildConfig.template",
2132 ] 2132 ]
2133 package_name = "org/chromium/base/multidex" 2133 package_name = "org/chromium/base"
2134 } 2134 }
2135 2135
2136 # GYP: //base/base.gyp:base_native_libraries_gen 2136 # GYP: //base/base.gyp:base_native_libraries_gen
2137 java_cpp_template("base_native_libraries_gen") { 2137 java_cpp_template("base_native_libraries_gen") {
2138 sources = [ 2138 sources = [
2139 "android/java/templates/NativeLibraries.template", 2139 "android/java/templates/NativeLibraries.template",
2140 ] 2140 ]
2141 package_name = "org/chromium/base/library_loader" 2141 package_name = "org/chromium/base/library_loader"
2142 } 2142 }
2143 2143
2144 # GYP: //base.gyp:base_java_unittest_support 2144 # GYP: //base.gyp:base_java_unittest_support
2145 android_library("base_java_unittest_support") { 2145 android_library("base_java_unittest_support") {
2146 deps = [ 2146 deps = [
2147 ":base_java", 2147 ":base_java",
2148 ] 2148 ]
2149 java_files = 2149 java_files =
2150 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ] 2150 [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
2151 } 2151 }
2152 } 2152 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698