chrome/android/java/AndroidManifest.xml - Issue 1818423003: Revert of Remove configuration policy from chrome build files.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/android/java/AndroidManifest.xml

Issue 1818423003: Revert of Remove configuration policy from chrome build files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@policy_chrome_defines

Patch Set: Created 4 years, 9 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

Index: chrome/android/java/AndroidManifest.xml

diff --git a/chrome/android/java/AndroidManifest.xml b/chrome/android/java/AndroidManifest.xml

index 7977a281c39efa4a87b18358fbad93dbb031ad46..865541d1e6ee5d24d2103ceb6151397cffac12c8 100644

--- a/chrome/android/java/AndroidManifest.xml

+++ b/chrome/android/java/AndroidManifest.xml

@@ -115,8 +115,10 @@

{% if channel in ['dev', 'canary', 'default'] %}

{% endif %}

+ {% if configuration_policy == '1' %}

android:resource="@xml/app_restrictions"/>

+ {% endif %}

<!-- Note: All activities directly or indirectly derived from ChromeActivity

must specify android:hardwareAccelerated="false".

« no previous file with comments | « chrome/android/chrome_public_apk_tmpl.gni ('k') | chrome/app/BUILD.gn » ('j') | no next file with comments »