Index: chromecast/chromecast.gyp |
diff --git a/chromecast/chromecast.gyp b/chromecast/chromecast.gyp |
index c5ca6770003ccda86d562301898a450696eeed94..b5e58118845b65ef00bb174b751a52c3f20cc4ea 100644 |
--- a/chromecast/chromecast.gyp |
+++ b/chromecast/chromecast.gyp |
@@ -11,7 +11,7 @@ |
# Refers to enum CastProductType in components/metrics/proto/cast_logs.proto |
'cast_product_type%': 0, # CAST_PRODUCT_TYPE_UNKNOWN |
'chromium_code': 1, |
- 'never_lint': 1, |
+ #'never_lint': 1, |
aurimas (slooooooooow)
2015/06/23 00:42:19
Should we remove this completely?
gunsch
2015/06/23 00:45:43
Done.
|
'chromecast_branding%': 'Chromium', |
'disable_display%': 0, |
'enable_default_cast_graphics%': 1, |
@@ -490,6 +490,7 @@ |
'../base/base.gyp:base_java', |
], |
'variables': { |
+ 'android_manifest_path': 'android/AndroidManifest.xml', |
'java_in_dir': 'base/java', |
}, |
'includes': ['../build/java.gypi'], |
@@ -508,6 +509,7 @@ |
'../ui/android/ui_android.gyp:ui_java', |
], |
'variables': { |
+ 'android_manifest_path': 'android/AndroidManifest.xml', |
'has_java_resources': 1, |
'java_in_dir': 'browser/android/apk', |
'resource_dir': 'browser/android/apk/res', |