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

Unified Diff: build/apk_test.gypi

Issue 136693011: Disable incognito if parental controls are enabled on android. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Keep native_test as the package to be compliant w/ testing framework Created 6 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/apk_test.gypi
diff --git a/build/apk_test.gypi b/build/apk_test.gypi
index f7748315842f50128b462c2bd73437af72f11eed..8ec23a21fd1fe898a1c586173c8a8f84fc9c769c 100644
--- a/build/apk_test.gypi
+++ b/build/apk_test.gypi
@@ -31,7 +31,6 @@
'intermediate_dir': '<(PRODUCT_DIR)/<(test_suite_name)_apk',
'final_apk_path': '<(intermediate_dir)/<(test_suite_name)-debug.apk',
'java_in_dir': '<(DEPTH)/testing/android/java',
- 'android_manifest_path': '<(DEPTH)/testing/android/AndroidManifest.xml',
'native_lib_target': 'lib<(test_suite_name)',
# TODO(yfriedman, cjhopman): Support managed installs for gtests.
'gyp_managed_install': 0,
« no previous file with comments | « no previous file | chrome/android/java/src/org/chromium/chrome/browser/ChromiumApplication.java » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698