|
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>
|
|
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>
|
|
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>
|
|
|
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>
|
|
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>
|
|
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>
|
|
|
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>
|
|
|
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>
|
|
|
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>
|
|
|
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>
|
|
|
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>
|
|
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>
|
|
|
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>
|
|
|
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>
|
|
|
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>
|
|
|
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>
|
|
|
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>
|
|
|
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>
|
|
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>
|
|
|
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>
|
|
|
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>
|
|
|
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>
|
|
|
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>
|
|
|
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>
|
|
|
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>
|