The current roll_aosp.sh is generating an invalid Android.bp by
including the local repo's .git file:
cc_genrule {
name: "angle_commit_id",
tool_files: [
"src/commit_id.py",
],
cmd: "$(location) gen $(location commit.h)",
srcs: [
".git/refs/heads/rollAngle",
],
sdk_version: "28",
out: [
"commit.h",
],
}
This is fixed by enabling the GN arg 'angle_enable_commit_id=false' in
the script:
cc_genrule {
name: "angle_commit_id",
tool_files: [
"src/commit_id.py",
],
cmd: "$(location) gen $(location commit.h)",
sdk_version: "28",
out: [
"commit.h",
],
}
Bug: angleproject:5050
Test: Manual verification in AOSP checkout
Change-Id: I08a08084c4c25411b29b22544c2ed8c06f6f54d8
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2412790Reviewed-by:
Geoff Lang <geofflang@chromium.org>
| Name |
Last commit
|
Last update |
|---|---|---|
| .. | ||
| code_generation_hashes | Loading commit data... | |
| angle_presubmit_utils.py | Loading commit data... | |
| angle_presubmit_utils_unittest.py | Loading commit data... | |
| apply_clang_format_on_all_sources.py | Loading commit data... | |
| bmp_to_nv12.py | Loading commit data... | |
| bootstrap.py | Loading commit data... | |
| egl.xml | Loading commit data... | |
| egl_angle_ext.xml | Loading commit data... | |
| entry_point_packed_gl_enums.json | Loading commit data... | |
| export_targets.py | Loading commit data... | |
| file_exists.py | Loading commit data... | |
| gen_angle_gn_info_json.py | Loading commit data... | |
| gen_gl_enum_utils.py | Loading commit data... | |
| gen_proc_table.py | Loading commit data... | |
| gen_vk_gl_cts_build.py | Loading commit data... | |
| generate_android_bp.py | Loading commit data... | |
| generate_entry_points.py | Loading commit data... | |
| generate_loader.py | Loading commit data... | |
| generate_new_renderer.py | Loading commit data... | |
| generate_stats.py | Loading commit data... | |
| gl.xml | Loading commit data... | |
| gl_angle_ext.xml | Loading commit data... | |
| msvs_projects.py | Loading commit data... | |
| perf_test_runner.py | Loading commit data... | |
| registry_xml.py | Loading commit data... | |
| remove_files.py | Loading commit data... | |
| roll_aosp.sh | Loading commit data... | |
| roll_chromium_deps.py | Loading commit data... | |
| run_code_generation.py | Loading commit data... | |
| run_gtest_angle_test.py | Loading commit data... | |
| trigger.bat | Loading commit data... | |
| trigger.py | Loading commit data... | |
| update_canary_angle.py | Loading commit data... | |
| vk_mandatory_format_support_capture_to_json.js | Loading commit data... | |
| wgl.xml | Loading commit data... |