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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: content/content.gyp

Issue 1297023003: [Android] Roll android_tools to Android M SDK. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: update SDK version in pylib Created 5 years, 4 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 | « chrome/test/android/BUILD.gn ('k') | content/public/android/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: content/content.gyp
diff --git a/content/content.gyp b/content/content.gyp
index e8ea97c0b393aaf00a663f1de5ad7c2369f8b8d0..efcbf740586c2604ee6a4aa8cc9cdea4fb9cf508 100644
--- a/content/content.gyp
+++ b/content/content.gyp
@@ -460,14 +460,6 @@
'screen_orientation_values_java',
'accessibility_java',
],
- # TODO(sgurun) remove this when M is public. crbug/512264.
- 'conditions': [
- ['android_sdk_version != "M"', {
- 'dependencies': [
- '../third_party/android_tools/android_tools.gyp:preview_java_sources',
- ],
- }],
- ],
'variables': {
'java_in_dir': '../content/public/android/java',
'has_java_resources': 1,
« no previous file with comments | « chrome/test/android/BUILD.gn ('k') | content/public/android/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698