kc3-lang/angle/scripts/roll_aosp.sh

scripts/roll_aosp.sh

Log

Author Commit Date CI Message
Yuly Novikov a035c7b6 2025-07-03T16:33:11 Fix rolling to Android after googletest update Because of changes in googletest build files, re2 must be rolled into Android as well. Bug: angleproject:428697844 Change-Id: I3960cccf7cca808b8e4cc2d5f0def030a57f956f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6705237 Commit-Queue: Geoff Lang <geofflang@chromium.org> Auto-Submit: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tim Van Patten 3b7528e1 2025-05-20T12:31:28 Support running the full end2end suite against the System EGL Update the end2end test instantiation to either fully target the packaged ANGLE libraries or the system EGL, but not a combination of both simultaneously. The GN argument |angle_test_enable_system_egl| controls which driver is being tested by all the instantiated tests. It's default value is "false", which means the tests target the ANGLE libraries by default: kDefaultGLESDriver = GLESDriverType::AngleEGL When |angle_test_enable_system_egl = true|: kDefaultGLESDriver = GLESDriverType::SystemEGL This allows for testing the system EGL with the full end2end test suite, which is useful on devices where ANGLE is the system EGL (e.g., Android). It also allows for specifying which backend to use (or all) during system EGL testing, when ANGLE is the EGL driver. This also includes removing the various ESx_EGL() functions, because the end2end tests must now fully commit to testing either the ANGLE driver or system driver, rather than a combination of both. This is similar to many other test suites, such as the Khronos CTS (dEQP), which only test validate a single driver per invocation. Bug: b/279980674 Test: angle_end2end_tests Change-Id: I4f7dc2ccb4f26b3bd02767d0a0d2876f8612f2ae Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6580876 Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com> Reviewed-by: Amirali Abdolrashidi <abdolrashidi@google.com>
Tim Van Patten 3c2bff4b 2025-05-22T12:33:12 Rename angle_end2end_tests_aosp to angle_end2end_tests_library Rename the GN arg angle_end2end_tests_aosp to angle_end2end_tests_library, because while building the end2end tests is relevant for Android, it's not restricted or specific to Android. Bug: b/279980674 Change-Id: I8f03e0fe264ac918cb34c379be85b65d7bfc0ab1 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6580873 Reviewed-by: Yuxin Hu <yuxinhu@google.com> Commit-Queue: Tim Van Patten <timvp@google.com>
Solti 101cf210 2025-05-15T16:40:43 roll rapidjson src to Android See b/279980674#comment52 for more details. Test: presubmit, and tested the rolling to Android in https://googleplex-android-review.git.corp.google.com/c/platform/external/angle/+/33713920 Bug: b/279980674 Change-Id: I834317a4a81d169cb0bfa32f0e33f2b0929ce279 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6579712 Reviewed-by: Yuxin Hu <yuxinhu@google.com> Commit-Queue: Solti Ho <solti@google.com>
Yuxin Hu 26e790f7 2025-05-21T14:07:40 Update the gn arg to avoid warning message in gn desc json file After this change https://chromium-review.googlesource.com/c/chromium/src/+/6547915, using android32_ndk_api_level and android64_ndk_api_level gn args will results in a warning message generated at the top of the gn desc json file: WARNING Build argument has no effect. android32_ndk_api_level = 26 ^- Did you mean "android_ndk_api_level"? This causes the json.load() function in generate_android_bp.py failing when parsing the json file json.decoder.JSONDecodeError: Expecting value: line 1 column 1 (char 0) Update roll_aosp.sh to use the android_ndk_apk_level to remove the warning message. Also update the gn arg from android32_ndk_apk_level and android64_ndk_api_level to android_ndk_apk_level in other files. Bug: b/418837345 Change-Id: I12fa48dcb5638b37a9965d0adb339a2dee018297 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6576736 Commit-Queue: Yuxin Hu <yuxinhu@google.com> Reviewed-by: Cody Northrop <cnorthrop@google.com> Auto-Submit: Yuxin Hu <yuxinhu@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>
Solti Ho f91e3d46 2025-05-19T11:32:02 Revert "roll rapidjson src to Android" This reverts commit 45b02ff020de99baea8c711f0cc391adda241038. Reason for revert: Android roller is borken. Bug: b/279980674 Original change's description: > roll rapidjson src to Android > > Test: presubmit > Bug: b/279980674 > Change-Id: Idb3ed14d337d1296cf50c66e796ae58ff9311514 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6553084 > Reviewed-by: Geoff Lang <geofflang@chromium.org> > Commit-Queue: Solti Ho <solti@google.com> Bug: b/279980674 Change-Id: Iee11ddeaa87cfb3bad15eaed193e4d3d0c1dec3f Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6565339 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Solti Ho <solti@google.com>
Solti 45b02ff0 2025-05-15T16:40:43 roll rapidjson src to Android Test: presubmit Bug: b/279980674 Change-Id: Idb3ed14d337d1296cf50c66e796ae58ff9311514 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6553084 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Solti Ho <solti@google.com>
Yuly Novikov a3d8058e 2025-03-27T15:21:20 Stop rolling more deps into Android Remove not needed dependencies: third_party/bazel third_party/colorama third_party/proguard third_party/turbine Bug: None Change-Id: I6da1610b7fcb700decbf7f6778e920030a419dc9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6402455 Reviewed-by: Roman Lavrov <romanl@google.com> Commit-Queue: Roman Lavrov <romanl@google.com> Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Auto-Submit: Yuly Novikov <ynovikov@chromium.org>
Yuly Novikov 6bb1576c 2025-03-25T16:36:49 Remove not needed third_party deps from Android rolls Bug: None Change-Id: Icc12f3f6c84c21fcb8c76881f8849c7cad358dde Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6387225 Reviewed-by: Roman Lavrov <romanl@google.com> Commit-Queue: Roman Lavrov <romanl@google.com> Auto-Submit: Yuly Novikov <ynovikov@chromium.org>
Amirali Abdolrashidi 9b8cf765 2024-12-09T16:43:34 Remove non-conformant flag from roll_aosp.sh * angle_expose_non_conformant_extensions_and_versions is no longer included in roll_aosp.sh to be enabled by default. Bug: b/376899587 Change-Id: Id86671d8fdd4e1fe008146babe1f3fa109523d99 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6082669 Commit-Queue: Amirali Abdolrashidi <abdolrashidi@google.com> Reviewed-by: Yuxin Hu <yuxinhu@google.com> Reviewed-by: Cody Northrop <cnorthrop@google.com>
Shahbaz Youssefi 8504b3cf 2024-11-18T15:32:49 Add third_party/rust/ to Chromium rolls Bug: angleproject:349994211 Change-Id: I79b587394b8fad9c5b1b53d2d72604f4ea5de4bd Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/6032333 Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Auto-Submit: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Roman Lavrov 44a8184b 2024-09-09T10:31:10 Android aosp: refactor roll_aosp.sh, add docs A few minor simplifications and documenting some caveats. Bug: b/279980674 Change-Id: I895721a97f9aa849a2cd6a67fe3a76098c10e9e9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5845911 Reviewed-by: Yuxin Hu <yuxinhu@google.com> Reviewed-by: Cody Northrop <cnorthrop@google.com>
Roman Lavrov c91e2792 2024-09-13T14:22:19 Tests: aosp end2end test lib depends on _ndk_ gtest/gmock This appears to resolve build issues in https://crrev.com/c/5857112 Re-enable end2nd test target in aosp. Bug: b/279980674 Change-Id: Icf8f1cf9868564b70515cb121526a3a1210e8b27 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5860262 Reviewed-by: Yuxin Hu <yuxinhu@google.com> Commit-Queue: Roman Lavrov <romanl@google.com>
Yuxin Hu 96733038 2024-09-12T16:10:53 Add back sdk_version entry to build targets ANGLE in android repo are failing to compile on some lunch targets: e.g. mainline_modules*, with sdk_version entry removed from build targets. For instance, after removing sdk_version for build target libEGL_angle, compilation failed with this error message: ``` error: external/angle/Android.bp:8174:1: dependency "libEGL_angle" of "ANGLE" missing variant: os:android,arch:arm64_armv8-a,sdk:sdk,link:shared available variants: os:android,arch:arm64_armv8-a,link:shared os:android,arch:arm_armv8-a,link:shared ``` Add back sdk_version entry to the build targets. END2END_TEST_TARGET needs to be disabled, because with sdk_version entry added to END2END_TEST_TARGET, the target failed to compile due to its' dependency libgmock is missing the variant: ``` error: external/angle/Android.bp:699:1: dependency "libgmock" of "libangle_end2end_tests__library" missing variant: os:android,arch:arm64_armv8-a,sdk:sdk,link:static ``` Bug: b/279980674 Change-Id: I96ea45b93519b84d72a70559d1ade9076ef9d955 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5857112 Reviewed-by: Cody Northrop <cnorthrop@google.com> Commit-Queue: Yuxin Hu <yuxinhu@google.com>
Roman Lavrov bfadbe80 2024-09-09T14:25:26 Revert "Tests: temporarily disable end2end test .so library in AOSP" This reverts commit 2deb9534d550dbacf024ed9250f8bfa95d505a3b. Reason for revert: aosp builds fixed by https://crrev.com/c/5842687 and https://crrev.com/c/5845930 Original change's description: > Tests: temporarily disable end2end test .so library in AOSP > > aosp build failures: https://r.android.com/3258459 > > Bug: b/279980674 > Change-Id: I64cbd4821f542436d15e0d9e32a306bdceeeafa3 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5842021 > Commit-Queue: Roman Lavrov <romanl@google.com> > Reviewed-by: Cody Northrop <cnorthrop@google.com> Bug: b/279980674 Change-Id: I296e4a36c259e5d862b7aa45718bec8168b21f0b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5845931 Commit-Queue: Roman Lavrov <romanl@google.com> Reviewed-by: Cody Northrop <cnorthrop@google.com>
Roman Lavrov f063960c 2024-09-06T18:50:05 roll_aosp.sh: keep third_party/jdk/BUILD.gn Re-added BUILD.gn to aosp in https://r.android.com/3257014, need to avoid it getting deleted again by the script. Bug: b/279980674 Change-Id: I3adad6a906385078607498c9e608d92a3430b4fa Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5842687 Reviewed-by: Yuxin Hu <yuxinhu@google.com>
Roman Lavrov 2deb9534 2024-09-06T18:31:35 Tests: temporarily disable end2end test .so library in AOSP aosp build failures: https://r.android.com/3258459 Bug: b/279980674 Change-Id: I64cbd4821f542436d15e0d9e32a306bdceeeafa3 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5842021 Commit-Queue: Roman Lavrov <romanl@google.com> Reviewed-by: Cody Northrop <cnorthrop@google.com>
Roman Lavrov 49a8d05c 2024-09-05T17:41:07 Tests: Add end2end test .so library to AOSP build m[mm] external/angle:libangle_end2end_tests__library produces libangle_end2end_tests__library.so I tested that integration with Chromium wrappers works with some manual patches; no integration is included in this CL. googlest/gtest dependencies replaced with platform libgtest, libgmock TestSuite heavily depends on rapidjson so it is currently excluded, only the standard gtest implementation is included (--gtest_list_tests, --gtest_filter, --gtest_output etc) This also disables support for expectation files as it is piped through TestSuite instance. Bug: b/279980674 Change-Id: I35cb2328d74a3ac778e1d93bb4fe4ac044920b6a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5838526 Reviewed-by: Cody Northrop <cnorthrop@google.com> Commit-Queue: Roman Lavrov <romanl@google.com>
Yuxin Hu 81c01d2f 2024-08-01T14:15:48 Add an option to output baked angle git hash to angle_commit.h We can leverage the ${rolling_to} hash value that is available in skia auto roller and use it as the ANGLE_COMMIT_HASH for Android Builds. Skia roller script can set ${rolling_to} hash to an environment variable ANGLE_UPSTREAM_HASH. In commit_id.py, check that if environment variable ANGLE_UPSTREAM_HASH is available, output the environment var into angle_commit.h. Bug: b/348044346 Bug: skia:356444755 Change-Id: I5232e4026d8b02d3ba603af0018060edb487566e Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5758427 Reviewed-by: Amirali Abdolrashidi <abdolrashidi@google.com> Commit-Queue: Yuxin Hu <yuxinhu@google.com> Reviewed-by: Roman Lavrov <romanl@google.com>
Yuxin Hu 0ef06687 2024-07-29T14:26:15 Stage the angle_commit.h for commit during ANGLE Android Roll Add the missing "git add angle_commit.h" command in roll_aosp.sh so that this file is staged for commit during ANGLE to Android roll. Otherwise it will be missed from the rolled CL e.g. https://android-review.git.corp.google.com/c/platform/external/angle/+/3198314, causing the compiler to fail to find the angle_commit.h Place the code that generates the angle_commit.h into a separate function generate_angle_commit_file() for clear code reading purpose. Bug: b/348044346 Change-Id: I06fc0f91c396218c1d4ab6b8f6aef883380ad7b5 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5747414 Reviewed-by: Roman Lavrov <romanl@google.com>
Yuxin Hu c9744617 2024-07-25T14:07:38 Fix Unknown Android Git Hash in Android Builds The ANGLE git hash is generated by running the script src/commit_id.py during compile time. However, in Android repo, access to .git is not guaranteed. This results the "unknown hash" value being generated by src/commit_id.py when compiling ANGLE in Android repo. To fix it, instead of invoking the src/commit_id.py during compile time, invoke the script during ANGLE to Android roll time. This change: 1) Removes the code in generate_android_bp.py that exports the build target angle_commit_id into Android.bp, so that the script src/commit_id.py is not invoked when compiling ANGLE in Android. 2) Invokes src/commit_id.py in aosp_roll.sh, to generate the angle_commit.h when we roll ANGLE changes into Android. Sample results with this change in Android is https://googleplex-android-review.git.corp.google.com/c/platform/external/angle/+/28476591 Bug: b/348044346 Change-Id: I91862ba6ab20ffb2cf9e99ee9b4fa6b83727c634 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5741631 Commit-Queue: Yuxin Hu <yuxinhu@google.com> Reviewed-by: Charlie Lao <cclao@google.com> Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org>
Yuly Novikov f184de3f 2024-07-25T12:42:03 Don't roll third_party/rust-toolchain into AOSP Bug: angleproject:349994211 Change-Id: I57855c7c950627a2597d56816c3d16b7859d4114 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5741434 Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Auto-Submit: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
Shahbaz Youssefi d193d51b 2024-06-17T22:46:08 Replace issue ids post migration to new issue tracker This change replaces anglebug.com/NNNN links. Bug: None Change-Id: I8ac3aec8d2a8a844b3d7b99fc0a6b2be8da31761 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5637912 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Shahbaz Youssefi <syoussefi@chromium.org>
Yuly Novikov b71fe1c5 2024-05-16T15:10:09 Flatten vulkan-deps. Sub-repos will be now checked out in third_party directly, instead of under third_party/vulkan-deps. Bug: chromium:341002187 Change-Id: Ia1c10ce5e7865c164b29bdcabb6ab8a7e4ae35b7 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5545577 Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Roman Lavrov <romanl@google.com> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Amirali Abdolrashidi 8332e5b1 2024-04-26T14:29:32 Use python3 instead of python for bootstrap * In roll_aosp.sh, replaced the remaining python usage with python3. Bug: b/246559064 Change-Id: Iea9737376c34264fec5d60e4cb772eb8c5be81f2 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5494462 Reviewed-by: Roman Lavrov <romanl@google.com> Auto-Submit: Amirali Abdolrashidi <abdolrashidi@google.com> Commit-Queue: Roman Lavrov <romanl@google.com>
Roman Lavrov 127dabe5 2024-01-25T11:55:09 Android.bp: Move cflags repeated in each target to cc_defaults At the moment there are 24 such flags so Android.bp also gets reduced by a couple thousand lines. One of them is DCR_CLANG_REVISION which changes frequently and will now be a single-line change. Also add --output flag to the script, print() can be useful for quick debugging. Example diff (first few libs only) https://diff.googleplex.com/#key=eVUN8izqTcWe Bug: b/322338350 Change-Id: I21b987e3c7101c0bcbefa4a3b4ff30b1a4154ce4 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5236720 Commit-Queue: Roman Lavrov <romanl@google.com> Reviewed-by: Geoff Lang <geofflang@chromium.org>
Liza Burakova f2c00e8c 2024-01-18T18:36:33 Adding Dawn stub backend to ANGLE Bug: angleproject:8473 Change-Id: I81ea83986e4e566169aa82250b5cfb727985ed01 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5201413 Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Commit-Queue: Liza Burakova <liza@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org>
Roman Lavrov 0ff2c771 2023-12-05T15:17:22 Revert "aosp: remove gclient flag --delete_unversioned_trees" This reverts commit c40f1a04271f5a99fda8b9e48b521493210e13bc. Reason for revert: doesn't help Original change's description: > aosp: remove gclient flag --delete_unversioned_trees > > Suggested by Gerrit folks: b/305091097#comment13 > This flag has been set for a long time, but after migration to > submodules it might be causing trouble. > > Bug: b/305091097 > Change-Id: I9eba5bf4ebe192942ab72b7670628f957b03ecc6 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5077411 > Auto-Submit: Roman Lavrov <romanl@google.com> > Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Bug: b/305091097 Change-Id: I6b954f01cb10e030af72e7965343e4007ba21c35 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5087159 Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com> Commit-Queue: Roman Lavrov <romanl@google.com>
Roman Lavrov c40f1a04 2023-12-01T09:17:04 aosp: remove gclient flag --delete_unversioned_trees Suggested by Gerrit folks: b/305091097#comment13 This flag has been set for a long time, but after migration to submodules it might be causing trouble. Bug: b/305091097 Change-Id: I9eba5bf4ebe192942ab72b7670628f957b03ecc6 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/5077411 Auto-Submit: Roman Lavrov <romanl@google.com> Reviewed-by: Yuly Novikov <ynovikov@chromium.org>
Cody Northrop 43130a0a 2023-09-19T14:35:46 Android: Clean up from previous bad rolls See the bug for details, but we think the presence of previous temp directories may be preventing roller CLs. Test: Locally ran roll_aosp.sh Bug: angleproject:8352 Change-Id: I7851185b8c77d1b91c7289e3a13c5c0b4175745c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4877189 Commit-Queue: Cody Northrop <cnorthrop@google.com> Reviewed-by: Roman Lavrov <romanl@google.com>
Yuly Novikov 1add0786 2023-08-21T11:50:06 Don't roll siso into AOSP Not needed, takes space. Bug: angleproject:8309 Change-Id: I3ebe501e18280bd59c183330f89e9766c6c21a6e Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4798289 Reviewed-by: Roman Lavrov <romanl@google.com> Commit-Queue: Roman Lavrov <romanl@google.com> Auto-Submit: Yuly Novikov <ynovikov@chromium.org>
Yuly Novikov 9e056e20 2023-08-16T15:30:57 Delete .gitmodules from ANGLE dependencies when rolling into AOSP Since git submodules aren't allowed in "external" projects, and ANGLE is an external project. Bug: b/40044404 Change-Id: I084530d2de47eb7b10b5d15a399312f2651b6525 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4784289 Commit-Queue: Yuly Novikov <ynovikov@chromium.org> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org> Auto-Submit: Yuly Novikov <ynovikov@chromium.org>
Cody Northrop c93682d3 2023-07-12T11:08:25 Revert "Stop rolling third_party/cpu_features" This reverts commit da710ac3f731c128caf0aff75c0cd6e58a0591af Reason for revert: Causes Android roll to fail http://anglebug.com/8255 Original change's description: > Stop rolling third_party/cpu_features > > It was probably needed for zlib previously but now zlib already depends > on the ndk's cpufeatures. There are no references to third_party > cpu_features in the generated Android.bp. > > Bug: b/289259681 > Change-Id: Ib849b26391d0c23e533662094e74384c267c8620 > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4656761 > Reviewed-by: Solti Ho <solti@google.com> > Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org> > Auto-Submit: Roman Lavrov <romanl@google.com> > Commit-Queue: Solti Ho <solti@google.com> Test: scripts/roll_aosp.sh Bug: angleproject:8255 Change-Id: I2a879a3675a1c041a0e6ffff2be886aa693e486d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4680107 Reviewed-by: Solti Ho <solti@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>
Roman Lavrov da710ac3 2023-06-29T09:36:42 Stop rolling third_party/cpu_features It was probably needed for zlib previously but now zlib already depends on the ndk's cpufeatures. There are no references to third_party cpu_features in the generated Android.bp. Bug: b/289259681 Change-Id: Ib849b26391d0c23e533662094e74384c267c8620 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4656761 Reviewed-by: Solti Ho <solti@google.com> Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org> Auto-Submit: Roman Lavrov <romanl@google.com> Commit-Queue: Solti Ho <solti@google.com>
Geoff Lang d55c91c3 2023-06-09T15:14:54 Don't roll third_party/android_toolchain into AOSP. Bug: None Change-Id: I43a34f4e17b81482d8a0f994f9b729b7abd94b3d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4603670 Reviewed-by: Solti Ho <solti@google.com>
Roman Lavrov 024114b2 2022-12-16T11:32:30 Reland "Replace zlib from chrome by Android's zlib." Add zlib to delete_only_deps, otherwise gclient seems to choke on it https://crbug.com/skia/14155#c3 Also git add $root_add_dep instead of "$root_add_dep/*" as the latter wouldn't add deleted directories like third_party/zlib in this case. We also need zlib in unsupported_third_party_deps so that it gets deleted after gclient sync. When a file from a nested git repo was already added to the tree previously, git no longer relies on .git subdirectory detection and works as if .git wasn't there. This is a reland of commit 39f0eaf8095b303b09951ceb6ffda8254ed24c8d Original change's description: > Replace zlib from chrome by Android's zlib. > > Implements Elliott's https://r.android.com/2360448 in our codegen. The > only diffs are ordering and third_party_android_ndk_cpu_features. > We only seem to depend on cpufeatures for zlib. > > //third_party/zlib/google:compression_utils_portable is the root > dependency, so cutting it makes other zlib libs disappear from > Android.bp > > zlib_google_compression_utils_portable and libz_static > that this CL depends on were added in https://r.android.com/2359720 > > Tested by running roll_aosp.sh in Android tree and building. > third_party/zlib got deleted locally so presumably it should > get deleted by the roller > > Bug: b/262603863 > Change-Id: I2651cc21121d741526055fa2b0288d0dcfa5c62a > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4111891 > Reviewed-by: Cody Northrop <cnorthrop@google.com> > Commit-Queue: Roman Lavrov <romanl@google.com> Bug: b/262603863 Change-Id: I87226e294a3e293ed5fcdeb2f0cf52f55917c1f3 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4300169 Reviewed-by: Amirali Abdolrashidi <abdolrashidi@google.com> Commit-Queue: Roman Lavrov <romanl@google.com>
Roman Lavrov a0736135 2023-03-01T15:17:07 Revert "Replace zlib from chrome by Android's zlib." This reverts commit 39f0eaf8095b303b09951ceb6ffda8254ed24c8d. Reason for revert: Broke roller https://crbug.com/skia/14155 Original change's description: > Replace zlib from chrome by Android's zlib. > > Implements Elliott's https://r.android.com/2360448 in our codegen. The > only diffs are ordering and third_party_android_ndk_cpu_features. > We only seem to depend on cpufeatures for zlib. > > //third_party/zlib/google:compression_utils_portable is the root > dependency, so cutting it makes other zlib libs disappear from > Android.bp > > zlib_google_compression_utils_portable and libz_static > that this CL depends on were added in https://r.android.com/2359720 > > Tested by running roll_aosp.sh in Android tree and building. > third_party/zlib got deleted locally so presumably it should > get deleted by the roller > > Bug: b/262603863 > Change-Id: I2651cc21121d741526055fa2b0288d0dcfa5c62a > Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4111891 > Reviewed-by: Cody Northrop <cnorthrop@google.com> > Commit-Queue: Roman Lavrov <romanl@google.com> Bug: b/262603863 Change-Id: Ie17cb5b63a2c86a7414230bf9b0e8ef16e8734bb No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4298280 Commit-Queue: Roman Lavrov <romanl@google.com> Bot-Commit: Rubber Stamper <rubber-stamper@appspot.gserviceaccount.com>
Roman Lavrov 39f0eaf8 2022-12-16T11:32:30 Replace zlib from chrome by Android's zlib. Implements Elliott's https://r.android.com/2360448 in our codegen. The only diffs are ordering and third_party_android_ndk_cpu_features. We only seem to depend on cpufeatures for zlib. //third_party/zlib/google:compression_utils_portable is the root dependency, so cutting it makes other zlib libs disappear from Android.bp zlib_google_compression_utils_portable and libz_static that this CL depends on were added in https://r.android.com/2359720 Tested by running roll_aosp.sh in Android tree and building. third_party/zlib got deleted locally so presumably it should get deleted by the roller Bug: b/262603863 Change-Id: I2651cc21121d741526055fa2b0288d0dcfa5c62a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/4111891 Reviewed-by: Cody Northrop <cnorthrop@google.com> Commit-Queue: Roman Lavrov <romanl@google.com>
Roman Lavrov bc21af43 2022-09-23T11:38:17 Cleanup: readability and make --genAndroidBp non-destructive. `roll_aosp.sh --genAndroidBp` used to nuke out/Android. Move that out of the function so that it's only nuked when ran without args. Add a warning at the top of roll_aosp.sh. Use explicit flags to avoid dependency on keeping ABI ordering in sync between roll_aosp.sh, also makes it easier to understand when looking at --help etc. Use all caps for module-level constants, common in python. Replace @cache with python3's @functools.cache. Switched to python3 in https://crrev.com/c/3907879. Bug: b/242929755 Change-Id: Ib3fcd46c283f00e3d2d573c1ac7bbb6f6c1231e9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3913627 Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Cody Northrop <cnorthrop@google.com> Commit-Queue: Roman Lavrov <romanl@google.com>
Roman Lavrov 7353de23 2022-09-20T15:05:26 Use python3 instead of python (python2 on skia roller) This will result in a lot of Android.bp diffs because the order of dict iteration used to be dependent on the hashing implementation in python2 and starting from python3.x it changed to be equivalent to OrderedDict, remembering order in which keys were inserted. The advantage of remembering key ordering instead of sorting (which I previously attempted https://crrev.com/c/3863009 but had to revert) is that 'name: {lib_name}' shows up first because that's what the script adds first, which makes Android.bp slightly easier to read. Bug: b/246559064 Change-Id: I7e4020fb9d3ca3842bc771b94b6628c285a2e4cd Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3907879 Reviewed-by: Amirali Abdolrashidi <abdolrashidi@google.com> Commit-Queue: Roman Lavrov <romanl@google.com>
Yuxin Hu bcc39a32 2022-06-16T10:54:12 Enable ExposeNonConformantExtensionsAndVersions Enable ExposeNonConformantExtensionsAndVersions in aosp so that these deqp tests that use es version 3.2 can pass on Android CTS: dEQP.EGL/functional_image_create_gles3_android_native_array_rgb565_texture_array dEQP.EGL/functional_image_create_gles3_android_native_array_rgb8_texture_array dEQP.EGL/functional_image_create_gles3_android_native_array_rgba8_texture_array Bug: angleproject:7351 Change-Id: Ic03ea0e3e46a65134a88dd8dce95611d42427bd9 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3709402 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Yuxin Hu <yuxinhu@google.com> Reviewed-by: Ian Elliott <ianelliott@google.com>
Cody Northrop b79178a3 2022-05-05T14:16:40 Scripts: Strip prebuilt debug APK from AOSP roll The //build dir was recently added to AOSP roll. We can't merge it due to inclusion of a prebuilt debuggable APK. Failing roll: https://android-review.googlesource.com/c/platform/external/angle/+/2086946 File in question: angle/build$ find . -name "*.apk*" ./android/CheckInstallApk-debug.apk This CL adds it explicitly to the files to strip before committing. Test: ./scripts/roll_aosp.sh and inspect //build Bug: b/231365398 Change-Id: Ic5487a88dd50a0ff54311b4870682671a5ebc080 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3629943 Reviewed-by: Amirali Abdolrashidi <abdolrashidi@google.com> Commit-Queue: Cody Northrop <cnorthrop@google.com>
Doug Horn 9865ed8b 2022-05-03T16:06:56 Check in //build files needed. Previously, only //third_party was actually `git add`ed. This change checks in the build files needed to access test scripting. Test: ./scripts/roll_aosp.sh m -j32 ANGLE Bug: b/231365398 Change-Id: Ib4bf75bc96e089bf7fe5d7b4d2304829c293c8ea Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3625833 Commit-Queue: Doug Horn <doughorn@google.com> Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Cody Northrop <cnorthrop@google.com>
Jamie Madill 7a32cf54 2022-04-20T15:36:56 Android: Add //build to blueprint. Also removes OWNERS files stripping as these are no longer a problem. Bug: angleproject:7219 Change-Id: Ib791bac3cf161958430363805ea47747e26644cd Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3598010 Reviewed-by: Ian Elliott <ianelliott@google.com> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
Ian Elliott fa5c349d 2022-03-23T17:27:54 Add "use_custom_libcxx = false" to "roll_aosp.sh" Per https://chromium-review.googlesource.com/c/chromium/src/+/3520025 the old gn arg "libcxx_abi_unstable" was removed, and we need to set "use_custom_libcxx = false" instead. This will hopefully fix the ANGLE->AOSP autoroller that was broken by the above CL. Bug: angleproject:7110 Change-Id: I3b6de998964efb674ea356a14e852f0e285b7242 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3546721 Reviewed-by: Ian Elliott <ianelliott@google.com> Auto-Submit: Ian Elliott <ianelliott@google.com> Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Ian Elliott 706824d8 2022-03-22T16:13:17 Remove "libcxx_abi_unstable" from "roll_aosp.sh" This was removed as a gn arg by: crrev/c/3520025. That broke the ANGLE->AOSP autoroller. Bug: angleproject:7110 Change-Id: I3d8b4483b75fb168e91078ff5ee0a53298d98efb Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3542990 Commit-Queue: Ian Elliott <ianelliott@google.com> Reviewed-by: Yuly Novikov <ynovikov@chromium.org> Commit-Queue: Yuly Novikov <ynovikov@chromium.org>
Tim Van Patten 683ab738 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>
Tim Van Patten 348eaf15 2021-07-23T11:26:09 roll_aosp.sh: Add dcheck_always_on = false The GN args 'dcheck_always_on' was recently enabled by default, which resulted in an increase to ANGLE's APK size in AOSP from 16.3MB to 20.6MB. Adding 'dcheck_always_on = false' to roll_aosp.sh to disable the feature reduces the APK back to the original 16.3MB size. Bug: b/189125396 Change-Id: I606c30fe49291fa893228644c4b1fe4dd5fbeabf Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3048933 Reviewed-by: Shahbaz Youssefi <syoussefi@chromium.org> Reviewed-by: Tim Van Patten <timvp@google.com> Commit-Queue: Tim Van Patten <timvp@google.com>
Tim Van Patten 16a9a892 2021-07-12T15:30:57 Cleanup license data and remove Android.mk files In an effort to better satisfy the Android legal/license requirements: 1.) Cleanup the license data in the generated Android.bp. 2.) Remove unused Android.mk files. Bug: b/191882454 Change-Id: Ia1937c1e2e822e688cca2a4d3ebc9a294f67ad69 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3021851 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com>
Tim Van Patten 0b5f268a 2021-06-28T13:03:46 Fixes and updates to roll_aosp.sh 1.) Remove unused zlib contrib/ directories - There are missing licenses in third_party/zlib/contrib/, so remove the unused directories from the AOSP checkin. 2.) `git add` all third_party/ changes - All of the unused third_party/ changes have been manually merged, so we can now automatically add any changes to third_party/. Bug: b/191882454 Bug: b/187342779 Change-Id: If209ff3bb34ad53c08f431a06a2f84d153181e45 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2992578 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com>
Tim Van Patten 7753c837 2021-06-18T14:25:40 Fix roll_aosp.sh 'gn gen' failure The 'gn gen' step in roll_aosp.sh is failing due to trying to access third_party/rapidjson/BUILD.gn, which isn't in AOSP. The rapidJSON library is required to build the ANGLE libraries with frame capture enabled, which isn't necessary for AOSP builds. This CL adds the GN arg 'angle_has_rapidjson' which roll_aosp.sh will set to 'false' to prevent 'gn gen' from attempting to access third_party/rapidjson/BUILD.gn. Bug: b/187342779 Change-Id: I6fcc0e94b6325be7523e35f966b8e4dbc708e3b0 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2973338 Reviewed-by: Geoff Lang <geofflang@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com>
Tim Van Patten 3707b01f 2021-06-16T09:43:39 Be more specific when deleting unused third_party/ dirs The command to delete unused third_party/ directories needs to be more specific to delete unused third_party/vulkan-deps/ directories. Additionally, use the flag '-path', since that's more portable than '-wholename' which is GNU-specific. Bug: b/187342779 Change-Id: Ie8b02360d0d86f9b42141212aaa6c2aa27a063c1 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2965605 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com>
Tim Van Patten c40262dc 2021-06-10T17:27:45 Remove unused third_party/ deps from Android checkin Remove unused third_party/ deps from the Android checkins to reduce the license burden from unused libraries. Bug: b/187342779 Change-Id: I87358377d0dbbc644cb85555464f4afad9d5c333 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2954924 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com>
Tim Van Patten 4df2e8ce 2021-05-24T13:15:45 Reduce ANGLE APK size Add some flags to generate_android_bp.py to make the AOSP match the ANGLE build flags, which makes the CQ testing more relevant and reduces the ANGLE APK size. Additionally, disable various GN args that are no longer required (GL, ESSL, HSSL). Together, this reduces the ANGLE APK size in AOSP from 22.2MB to 16.7MB. This CL also makes some fixes to roll_aosp.sh that are suggested by "Shell Scipt". Bug: b/189125396 Test: manual verification Change-Id: Iea33de799a00ffff182cf028a6998e1ef01a00e1 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2912933 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com>
Tim Van Patten 57202fb0 2021-04-30T13:56:11 Fix Rolling ANGLE into AOSP Rolling ANGLE into AOSP currently generates several build errors. This CL fixes them. Bug: angleproject:5919 Bug: angleproject:5873 Change-Id: Ic24c3c27a2dd3a1db4d6d2e3642eb1b16148569a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2863883 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com>
Mohan Maiya 4bd370dd 2021-04-02T16:51:47 Refactor roll_aosp.sh roll_aosp.sh can now generate an Android.bp file without having to perform a roll. This facilitates on demand generation of Android.bp. Provide an option to enable API traces with "--enableApiTrace" flag. Usage - # Generates Android.bp and perform a roll ./scripts/roll_aosp.sh # Generates Android.bp ./scripts/roll_aosp.sh --genAndroidBp # Generates Android.bp with API tracing enabled ./scripts/roll_aosp.sh --genAndroidBp --enableApiTrace Bug: angleproject:5774 Change-Id: I3a2bd505f5d75d6d5fc331d61fa9517d6042db70 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2774758 Reviewed-by: Tim Van Patten <timvp@google.com> Commit-Queue: Mohan Maiya <m.maiya@samsung.com>
Jason Macnak d392af02 2021-01-12T10:08:31 Update roll AOSP scripts to reflect vulkan-deps subdirectory Performing a roll with this changes produces https://android-review.googlesource.com/c/1548235 Bug: b/147316305 Bug: angleproject:5456 Test: scripts/roll_aosp.sh && m ANGLE Change-Id: I0f5a698e81a1299abde7cfccb4e1467c8dc02aad Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2625168 Commit-Queue: Tim Van Patten <timvp@google.com> Reviewed-by: Tim Van Patten <timvp@google.com> Reviewed-by: Geoff Lang <geofflang@chromium.org>
Jason Macnak 2c65da28 2021-01-08T11:49:18 Default roll_aosp.sh to copy artifacts to vendor partition ... to support using ANGLE as a native GL driver. Note: this will not affect devices installing the APK with `PRODUCT_PACKAGES += ANGLE` and will *not* also install the libs to vendor. Bug: b/147316305 Bug: angleproject:5456 Test: ./scripts/roll_aosp.sh and build in AOSP Change-Id: I98cab8d0735a4f66293ac063e0eef2ae7ddbee7b Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2618529 Reviewed-by: Tim Van Patten <timvp@google.com> Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com>
Kaiyi Li 8707811d 2020-12-01T11:50:56 Add an option to copy the artifact to vendor partition Add a --copy-to-vendor-partition optional argument to both roll_aosp.sh and generate_android_bp.py. When specified the root targets will be generated with vendor: true and a relative install path to egl folder, so that we can use ANGLE as the Android OpenGLES driver when the system starts up. Test: run roll_aosp.sh --copy-to-vendor-partion, build the Android image with m -j72, load the image with the Android emulator and find all ANGLE related *.so's are under the /vendor/lib/egl folder. Bug: angleproject:5456 Change-Id: I38c64e8ea3ad5f5d0cc0b8cd77856f49109b23c7 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2568907 Commit-Queue: Tim Van Patten <timvp@google.com> Reviewed-by: Tim Van Patten <timvp@google.com>
Geoff Lang a5e98a83 2020-11-19T15:50:36 roll_aosp: Pass more forceful args to gclient sync Gclient sync would get stuck if the deps were left in a bad state from a previous failed roll. Pass the same args as the Chrome bots to forcefully sync. Bug: b/150458033 Change-Id: I6bd1aefbd7e4db22dd08acf781b6a08985f600da Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2551533 Reviewed-by: Geoff Lang <geofflang@chromium.org>
Geoff Lang 156c227d 2020-11-06T13:06:02 Remove the amend commit from roll_aosp.sh Bug: b/150458033 Change-Id: Ice5711a672b63a7dac0618749c7e56d862e0e5ad Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2523373 Reviewed-by: Geoff Lang <geofflang@chromium.org>
Geoff Lang e70b1527 2020-11-06T12:51:35 Always use the -f flag with rm in roll_aosp.sh rm will error when the file is missing without the -f flag. We delete a few files without checking that they exist first. Bug: b/150458033 Change-Id: I5a104d383f59d418eaa55534526194f626c88f57 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2523372 Reviewed-by: Geoff Lang <geofflang@chromium.org>
Geoff Lang 6a8d5bcb 2020-11-06T11:22:36 Fix wrong working directory for roll_aosp.sh Bug: b/150458033 Change-Id: I17c605cbe02341b31855dc771225bf0c95445bfd Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2522009 Reviewed-by: Geoff Lang <geofflang@chromium.org>
Geoff Lang b59437cb 2020-11-06T11:07:32 Check out depot_tools in roll_aosp.sh Bug: b/150458033 Change-Id: I8b299f96d74499669495ca25d5b08711db90ce61 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2522008 Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tim Van Patten 4c5630d0 2020-10-29T12:45:46 Disable libcxx_abi_unstable in roll_aosp.sh The definition _LIBCPP_ABI_UNSTABLE breaks std::string in Android AOSP builds, starting with GetHelperExecutableDir(), but others fail later if that's worked around. Instead, we'll disable that flag with a GN arg for AOSP rolls. Bug: angleproject:5263 Test: Build on AOSP and launch Cuttlefish Change-Id: Ia4b293a5ce0b09206f4ed87a5a442e544e2021c1 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2508529 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com>
Jamie Madill acd15cae 2020-10-11T17:16:34 Re-land "Link C++ histogram support into angle_perftests." This is the first step in uploading histogram data instead of a gtest special format. We importing several new libraries: - tools/protoc_wrapper - third_party/protobuf - third_party/catapult (was already used for Android) No functional change. Only affects compilation. Protobuf support is disabled when not available. Bug: angleproject:5161 Change-Id: I64be0977648993b1012ff0d9e0439c5876697e36 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2497221 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Jamie Madill <jmadill@chromium.org>
Tim Van Patten e99b8bc0 2020-10-23T18:50:33 Fixes to roll ANGLE into AOSP Rolling ANGLE into AOSP requires the following fixes: 1.) Update scripts/roll_aosp.sh to not delete third_party/abseil-cpp. 2.) Update BUILD.gn to add a dependency on libnativewindow for "angle_common". Test: AOSP Presubmit Bug: angleproject:5230 Change-Id: If97c44ce041e576edc7c0c43700030b4538e8ab5 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2495550 Reviewed-by: Tim Van Patten <timvp@google.com> Commit-Queue: Tim Van Patten <timvp@google.com>
Tim Van Patten e417bfb0 2020-09-15T14:08:36 Android: Set angle_enable_commit_id=false in roll_aosp.sh 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/+/2412790 Reviewed-by: Geoff Lang <geofflang@chromium.org>
Tim Van Patten 20eb9be5 2020-07-07T16:24:55 Generate Android.bp from multiple gn descriptions With the introduction of ABI-specific build targets (zlib), the script generate_android_bp.py needs to be updated to consume ABI-specific gn descriptions and generate ABI-specific build rules for each target. The roll_aosp.sh script was updated to generate ABI-specific gn descriptions for each: arm arm64 x86 x64 Bug: b/160727922 Test: Manual script execution and building in AOSP Change-Id: I459b388176f8fcc010f9f5668535d941b931cdd4 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2285272 Commit-Queue: Tim Van Patten <timvp@google.com> Reviewed-by: Geoff Lang <geofflang@chromium.org>
Geoff Lang 94e8a3d9 2020-06-22T08:52:31 Roll zlib and cpufeatures from the ndk into Android. zlib is required to compress program binaries. It also pulls in the ndk for cpufeatures. Since the ndk is so large, only pull roll in the required sub-folders. BUG=angleproject:4776 Change-Id: I4967a06fd8bfb27040ad0c2f60fec265d555488a Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2255507 Reviewed-by: Geoff Lang <geofflang@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>
Jamie Madill 9f323042 2020-05-08T14:01:29 Vulkan: Update VMA directory. Bug: chromium:1074162 Change-Id: I6aa545e20f64dda0a1716cf8d0df9ad62fc1a890 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2190624 Commit-Queue: Jamie Madill <jmadill@chromium.org> Reviewed-by: Jamie Madill <jmadill@chromium.org>
Geoff Lang 6cea4405 2020-04-17T12:29:07 Remove more bad files before rolling into AOSP. third_party/VulkanMemoryAllocator/OWNERS also includes owners that block uploading. Move the deletion of the bad files earlier in the script and rm them instead of git rm. They may or may not be committed git files but rm always works. BUG=b/150892231 Change-Id: Iee60fba504ed1c16e994ed1ba83d2b7c58c0a01c Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2154537 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: Tim Van Patten <timvp@google.com>
Geoff Lang 8116c488 2020-04-09T12:18:02 Remove the merge command from roll_aosp.sh There are two issues doing the merge in the script: - This command makes the merge specific to an AOSP branch - It uses the version of roll_aosp that is from the previous roll instead of the ToT version. BUG=b:150892231 Change-Id: I579484092ca3d8c5e0e2d4d4bd1272eaeccc9da3 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2152667 Reviewed-by: Tim Van Patten <timvp@google.com> Commit-Queue: Geoff Lang <geofflang@chromium.org>
Geoff Lang 1589de9e 2020-04-09T14:08:09 Remove some bad files when generating an ANGLE roll into Android Add a list of files that should be removed when rolling ANGLE into Android. The jsoncpp OWNERS file fails to upload to the Android gerrit because it contains owners that have never signed into the Android gerrit. BUG=b:150892231 Change-Id: I699dada53cdda2fbd012733a7a91eb8b5fb79d35 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2152668 Commit-Queue: Geoff Lang <geofflang@chromium.org> Reviewed-by: Tim Van Patten <timvp@google.com>
Geoff Lang 005793e4 2020-04-09T12:16:20 Remove --preserve-root from roll_aosp.sh This flag is not supported on mac and generates errors when trying to roll. BUG=b:150892231 Change-Id: I22d10a2b9b37610d409df4d72e0aba2672f7b192 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2152666 Reviewed-by: Tim Van Patten <timvp@google.com> Commit-Queue: Geoff Lang <geofflang@chromium.org>
Geoff Lang 6b705ae7 2020-04-09T12:15:48 Roll VulkanMemoryAllocator into Android Bug: angleproject:2162 Change-Id: I0b1fc1ba1a3de8c4c00c5f6d26f8451e3ba8627e Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2152665 Reviewed-by: Jamie Madill <jmadill@chromium.org> Commit-Queue: Geoff Lang <geofflang@chromium.org>
Geoff Lang 9e5bbb38 2020-03-06T16:15:11 Use ANGLE's vulkan-headers dep when rolling ANGLE into Android. We previously used the existing Android target for vulkan headers but it does not roll as fast as ANGLE's, possibly causing divergence in test results. BUG=angleproject:2344 BUG=b:150892231 Change-Id: Ibef33b266943c040219529f64ea8cd29c8c9bf83 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2090394 Reviewed-by: Jamie Madill <jmadill@chromium.org> Reviewed-by: Tim Van Patten <timvp@google.com> Commit-Queue: Geoff Lang <geofflang@chromium.org>
Geoff Lang 8414d962 2020-03-06T13:17:19 Improve GN args for generating Android rolls. - Disable unused backends and shader compilation targets. - Build for "arm64" to make sure ANGLE_64_BIT_CPU is defined. - Use a better merge command now that the branch histories are related BUG=angleproject:2344 Change-Id: I33949e701379caacf6a392a3bb0eb3523627be14 Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2090685 Reviewed-by: Tim Van Patten <timvp@google.com> Commit-Queue: Geoff Lang <geofflang@chromium.org>
Geoff Lang deb65a6f 2020-02-27T15:58:17 Add scripts for rolling and generating Android.bp for AOSP BUG=angleproject:2344 Change-Id: I379cc924a6126e22b16e4cb096026d881e06763d Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/2079195 Reviewed-by: Tim Van Patten <timvp@google.com> Commit-Queue: Geoff Lang <geofflang@chromium.org>
kmx.io     mail     discord kmxgit v0.4.0