Index: third_party/gvr-android-sdk/BUILD.gn |
diff --git a/third_party/gvr-android-sdk/BUILD.gn b/third_party/gvr-android-sdk/BUILD.gn |
index d3e83853a871511a3d9392df47cacfdc87cc9409..eaa18ecbcd5bc8197ec43f6cecd45aef46a884f5 100644 |
--- a/third_party/gvr-android-sdk/BUILD.gn |
+++ b/third_party/gvr-android-sdk/BUILD.gn |
@@ -17,6 +17,8 @@ android_aar_prebuilt("gvr_common_java") { |
android_aar_prebuilt("gvr_base_java") { |
aar_path = "src/libraries/base/base.aar" |
proguard_configs = [ "proguard/base.flags" ] |
+ ignore_manifest = true # Ignored because manifest merging is not supported (http://crbug.com/643967) |
+ ignore_native_libraries = true |
} |
android_aar_prebuilt("gvr_controller_java") { |