Skip to content

  • Projects
  • Groups
  • Snippets
  • Help
  • This project
    • Loading...
  • Sign in / Register
A
angle
  • Project
    • Overview
    • Details
    • Activity
    • Cycle Analytics
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
    • Charts
  • Issues 0
    • Issues 0
    • List
    • Board
    • Labels
    • Milestones
  • Merge Requests 0
    • Merge Requests 0
  • CI / CD
    • CI / CD
    • Pipelines
    • Jobs
    • Schedules
    • Charts
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Members
    • Members
  • Collapse sidebar
  • Activity
  • Graph
  • Charts
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
  • Chen Yisong
  • angle
  • Repository

Switch branch/tag
  • angle
  • scripts
  • roll_aosp.sh
Find file
BlameHistoryPermalink
  • Tim Van Patten's avatar
    Android: Set angle_enable_commit_id=false in roll_aosp.sh · e417bfb0
    Tim Van Patten authored Sep 15, 2020
    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/+/2412790Reviewed-by: 's avatarGeoff Lang <geofflang@chromium.org>
    e417bfb0
roll_aosp.sh 3.61 KB
EditWeb IDE
×

Replace roll_aosp.sh

Attach a file by drag & drop or click to upload


Cancel
A new branch will be created in your fork and a new merge request will be started.