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

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

Issue 1423633002: GN: Fix up net_unittests to match GYP (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: review comments Created 5 years, 2 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 | « no previous file | net/BUILD.gn » ('j') | net/BUILD.gn » ('J')
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 76f57dd73758fced358cfcbdb9ca90f6d11362fb..7bd22b43c34468cb834661a5a0b3f0812c6f46e5 100644
--- a/build/config/android/rules.gni
+++ b/build/config/android/rules.gni
@@ -1780,7 +1780,11 @@ template("unittest_apk") {
}
android_apk(target_name) {
- forward_variables_from(invoker, [ "asset_location" ])
+ forward_variables_from(invoker,
+ [
+ "asset_location",
+ "android_manifest",
+ ])
final_apk_path = "$root_build_dir/${apk_name}_apk/${apk_name}-debug.apk"
java_files = [
"//testing/android/native_test/java/src/org/chromium/native_test/NativeBrowserTestActivity.java",
@@ -1788,7 +1792,10 @@ template("unittest_apk") {
"//testing/android/native_test/java/src/org/chromium/native_test/NativeUnitTestActivity.java",
"//testing/android/native_test/java/src/org/chromium/native_test/NativeTestInstrumentationTestRunner.java",
]
- android_manifest = "//testing/android/native_test/java/AndroidManifest.xml"
+ if (!defined(invoker.android_manifest)) {
+ android_manifest =
+ "//testing/android/native_test/java/AndroidManifest.xml"
+ }
native_libs = [ unittests_binary ]
deps = [
"//base:base_java",
« no previous file with comments | « no previous file | net/BUILD.gn » ('j') | net/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698