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

Unified Diff: build/config/android/rules.gni

Issue 951673002: Revert "Pull chromium at 2c3ffb2355a27c32f45e508ef861416b820c823b" (Closed) Base URL: git@github.com:domokit/mojo.git@master
Patch Set: Created 5 years, 10 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/android/config.gni ('k') | build/config/arm.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/android/rules.gni
diff --git a/build/config/android/rules.gni b/build/config/android/rules.gni
index 8ca064248e268036fbc7c1bc9231cca055da7fa0..33dfa37e6c2a33f3a31da77494c5a227540b2976 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -74,12 +74,6 @@ template("generate_jni") {
rebase_path(jni_generator_jarjar_file, root_build_dir),
]
}
- if (!is_clang) {
- # Clang builds currently fail with --native_exports_optional due to
- # http://llvm.org/bugs/show_bug.cgi?id=22602 - only enable for gcc.
- # http://crbug.com/442327
- args += [ "--native_exports_optional" ]
- }
}
config("jni_includes_${target_name}") {
@@ -190,12 +184,6 @@ template("generate_jar_jni") {
"--includes",
rebase_path(jni_generator_include, root_build_dir),
]
- if (!is_clang) {
- # Clang builds currently fail with --native_exports_optional due to
- # http://llvm.org/bugs/show_bug.cgi?id=22602 - only enable for gcc.
- # http://crbug.com/442327
- args += [ "--native_exports_optional" ]
- }
}
}
@@ -358,7 +346,9 @@ template("java_cpp_enum") {
action("${target_name}__generate_enum") {
# The sources aren't compiled so don't check their dependencies.
- check_includes = false
+ # TODO(brettw) uncomment after GN binary rolled pas 314974 (which added
+ # support for this value on actions).
+ #check_includes = false
sources = invoker.sources
script = "//build/android/gyp/java_cpp_enum.py"
« no previous file with comments | « build/config/android/config.gni ('k') | build/config/arm.gni » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698