Index: content/content.gyp |
diff --git a/content/content.gyp b/content/content.gyp |
index efcbf740586c2604ee6a4aa8cc9cdea4fb9cf508..fbb64d16b4d5201b6139c766077912cc74a3dad2 100644 |
--- a/content/content.gyp |
+++ b/content/content.gyp |
@@ -466,6 +466,15 @@ |
'R_package': 'org.chromium.content', |
'R_package_relpath': 'org/chromium/content', |
}, |
+ # TODO(sgurun) remove this when M is public. crbug/512264. |
+ 'conditions': [ |
+ ['android_sdk_version != "M"', { |
Ted C
2015/07/21 00:35:48
although temporary, it really shouldn't be in cont
sgurun-gerrit only
2015/07/21 20:22:15
Done.
|
+ 'variables': { |
+ 'additional_src_dirs' : ['../content/public/android/frameworks'], |
+ 'jar_excluded_classes' : [ '*/ViewStructure.class'], |
+ }, |
+ }], |
+ ], |
'includes': [ '../build/java.gypi' ], |
}, |
{ |