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>
This commit is contained in:
Tim Van Patten 2020-09-15 14:08:36 -06:00 коммит произвёл Geoff Lang
Родитель 377e748714
Коммит e417bfb0b3
1 изменённых файлов: 2 добавлений и 0 удалений

Просмотреть файл

@ -74,6 +74,8 @@ for abi in ${abis[@]}; do
"angle_enable_essl = true" # TODO(geofflang): Disable ESSL once Andrid no longer requires it. anglebug.com/4444
"angle_enable_glsl = true" # TODO(geofflang): Disable ESSL once Andrid no longer requires it. anglebug.com/4444
"angle_enable_hlsl = false"
"angle_enable_commit_id = false"
)
gn gen ${GN_OUTPUT_DIRECTORY} --args="${gn_args[*]}"