Skip to content

A
angle
Commit 57202fb0 by Tim Van Patten Committed by Commit Bot
Options

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/+/2863883Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org> Commit-Queue: Tim Van Patten <timvp@google.com>
parent 05fb2272
Showing with 6 additions and 3 deletions
BUILD.gn
...@@ -1336,7 +1336,8 @@ if (is_android && symbol_level != 0) { ...@@ -1336,7 +1336,8 @@ if (is_android && symbol_level != 0) {
} }
} }
if (is_android && current_toolchain == default_toolchain) { if ((angle_standalone || build_with_chromium) && is_android &&
current_toolchain == default_toolchain) {
apk_version_code = "0" apk_version_code = "0"
if (angle_enable_commit_id) { if (angle_enable_commit_id) {
apk_version_code = apk_version_code =
......
scripts/generate_android_bp.py
...@@ -17,7 +17,6 @@ root_targets = [ ...@@ -17,7 +17,6 @@ root_targets = [
"//:libGLESv2", "//:libGLESv2",
"//:libGLESv1_CM", "//:libGLESv1_CM",
"//:libEGL", "//:libEGL",
"//:libfeature_support",
] ]
sdk_version = '28' sdk_version = '28'
...@@ -507,7 +506,7 @@ def main(): ...@@ -507,7 +506,7 @@ def main():
# Add APKs with all of the root libraries # Add APKs with all of the root libraries
blueprint_targets.append(('filegroup', { blueprint_targets.append(('filegroup', {
'name': 'ANGLE_srcs', 'name': 'ANGLE_srcs',
'srcs': ['src/**/*.java',], 'srcs': ['src/android_system_settings/**/*.java',],
})) }))
blueprint_targets.append(( blueprint_targets.append((
......
scripts/roll_aosp.sh
...@@ -30,6 +30,9 @@ function generate_Android_bp_file() { ...@@ -30,6 +30,9 @@ function generate_Android_bp_file() {
"target_os = \"android\"" "target_os = \"android\""
"is_component_build = false" "is_component_build = false"
"is_debug = false" "is_debug = false"
"symbol_level = 0"
"angle_standalone = false"
"angle_build_all = false"
# Build for 64-bit CPUs # Build for 64-bit CPUs
"target_cpu = \"$abi\"" "target_cpu = \"$abi\""
......
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