Commit 615444a5 authored by Justin DeWitt's avatar Justin DeWitt Committed by Commit Bot

[AAR] Re-enable info file asserts.

These were temporarily disabled to allow a multi-sided merge.

Tbr: bialpio@chromium.org
Bug: 1113301
Change-Id: I1d9ef778868e89547ef42117cfb804304558890f
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2376028Reviewed-by: default avatarPiotr Bialecki <bialpio@chromium.org>
Reviewed-by: default avatarAndrew Grieve <agrieve@chromium.org>
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#802501}
parent 78535ee8
...@@ -4197,10 +4197,8 @@ if (enable_java_templates) { ...@@ -4197,10 +4197,8 @@ if (enable_java_templates) {
rebase_path(invoker.aar_path, root_build_dir), rebase_path(invoker.aar_path, root_build_dir),
"--output-dir", "--output-dir",
rebase_path(_output_path, root_build_dir), rebase_path(_output_path, root_build_dir),
"--assert-info-file",
# TODO(dewittj): Re-enable after internal roll updating the info files. rebase_path(_info_path, root_build_dir),
#"--assert-info-file",
#rebase_path(_info_path, root_build_dir),
] ]
if (_strip_resources) { if (_strip_resources) {
args += [ "--ignore-resources" ] args += [ "--ignore-resources" ]
......
...@@ -8,6 +8,7 @@ has_native_libraries = true ...@@ -8,6 +8,7 @@ has_native_libraries = true
has_proguard_flags = true has_proguard_flags = true
has_r_text_file = true has_r_text_file = true
is_manifest_empty = false is_manifest_empty = false
manifest_package = "com.google.ar.core"
native_libraries = [ native_libraries = [
"jni/arm64-v8a/libarcore_sdk_c.so", "jni/arm64-v8a/libarcore_sdk_c.so",
"jni/arm64-v8a/libarcore_sdk_jni.so", "jni/arm64-v8a/libarcore_sdk_jni.so",
......
...@@ -8,6 +8,7 @@ has_native_libraries = false ...@@ -8,6 +8,7 @@ has_native_libraries = false
has_proguard_flags = false has_proguard_flags = false
has_r_text_file = false has_r_text_file = false
is_manifest_empty = true is_manifest_empty = true
manifest_package = "com.google.vr.testframework.controller"
resources = [] resources = []
subjar_tuples = [] subjar_tuples = []
subjars = [] subjars = []
...@@ -8,6 +8,7 @@ has_native_libraries = false ...@@ -8,6 +8,7 @@ has_native_libraries = false
has_proguard_flags = false has_proguard_flags = false
has_r_text_file = true has_r_text_file = true
is_manifest_empty = true is_manifest_empty = true
manifest_package = "com.google.vr.cardboard"
resources = [ resources = [
"res/drawable-hdpi-v4/quantum_ic_close_white_24.png", "res/drawable-hdpi-v4/quantum_ic_close_white_24.png",
"res/drawable-hdpi-v4/quantum_ic_settings_white_24.png", "res/drawable-hdpi-v4/quantum_ic_settings_white_24.png",
......
...@@ -8,6 +8,7 @@ has_native_libraries = false ...@@ -8,6 +8,7 @@ has_native_libraries = false
has_proguard_flags = false has_proguard_flags = false
has_r_text_file = false has_r_text_file = false
is_manifest_empty = true is_manifest_empty = true
manifest_package = "com.google.vr.sdk.controller"
resources = [] resources = []
subjar_tuples = [] subjar_tuples = []
subjars = [] subjars = []
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment