-
Show log
Commit
-
Hash : 683ab738
Author :
Date : 2021-10-28T14:02:49
Android: Add back third_party/ to AOSP The ANGLE autoroller into AOSP is currently stuck due to a merge conflict in third_party/glmark2. Specifically, this directory was deleted in AOSP, but modified in upstream ANGLE. The solution is to add back the third_party/ directories into AOSP, and the ANGLE-owned files. The full contents will not be added back if they are a git submodule. Some third_party/ directories will continue to be deleted due to how large they are: third_party/jdk third_party/llvm-build third_party/android_build_tools third_party/android_sdk We can look into adding these back in the future if it becomes necessary. Additionally, the license information in the Android.bp is being updated to reflect the newly added files. Bug: angleproject:6635 Change-Id: I793e5b0797218963a4d06a0399b3be80edd43b37 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3251685 Commit-Queue: Tim Van Patten <timvp@google.com> Reviewed-by: Geoff Lang <geofflang@chromium.org>
-
Files
- angle_deqp_test_merge.py
- angle_presubmit_utils.py
- angle_presubmit_utils_unittest.py
- apply_clang_format_on_all_sources.py
- bmp_to_nv12.py
- bootstrap.py
- cl.xml
- code_generation_hashes/
- egl.xml
- egl_angle_ext.xml
- entry_point_packed_egl_enums.json
- entry_point_packed_gl_enums.json
- export_targets.py
- extension_data/
- file_exists.py
- gen_angle_gn_info_json.py
- gen_gl_enum_utils.py
- gen_proc_table.py
- gen_vk_gl_cts_build.py
- generate_android_bp.py
- generate_entry_points.py
- generate_loader.py
- generate_new_renderer.py
- generate_stats.py
- gl.xml
- gl_angle_ext.xml
- msvs_projects.py
- perf_test_runner.py
- process_angle_perf_results.py
- registry_xml.py
- remove_files.py
- roll_aosp.sh
- roll_chromium_deps.py
- run_code_generation.py
- run_gtest_angle_test.py
- trigger.bat
- trigger.py
- update_chrome_angle.py
- update_extension_data.py
- vk_mandatory_format_support_capture_to_json.js
- wgl.xml
