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
  • android
  • AndroidManifest.xml.jinja2
Find file
BlameHistoryPermalink
  • Tim Van Patten's avatar
    Reland "Create Container ANGLE APK" · ee4fa078
    Tim Van Patten authored Feb 21, 2019
    This reverts commit 902ceed3.
    
    Reason for revert:
    
    Re-landing this since the Chromium build fix has landed:
    https://bugs.chromium.org/p/chromium/issues/detail?id=933783#c29
      Comment 29 by gbeaty@chromium.org, Today (13 minutes ago)
      Tim, you should be able to re-land your change now.
    
    Original change's description:
    > Revert "Create Container ANGLE APK"
    > 
    > This reverts commit e82c857d.
    > 
    > Reason for revert:
    > This is breaking the ANGLE build in the Chromium build process:
    > 
    > https://bugs.chromium.org/p/chromium/issues/detail?id=933783#c6
    > 
    > Original change's description:
    > > Create Container ANGLE APK
    > > 
    > > The ANGLE APK needs to be reverted back to just being a container
    > > for the ANGLE shared object libraries, since the rest of the APK
    > > contents are in the Android source tree.
    > > 
    > > Bug: angleproject:3154
    > > Test: 'adb sync' the APK on to a device
    > > Change-Id: Id245f1e3d269c71054d9759e8ba8be0532afe659
    > > Reviewed-on: https://chromium-review.googlesource.com/c/1474341
    > > Commit-Queue: Tim Van Patten <timvp@google.com>
    > > Reviewed-by: Courtney Goeltzenleuchter <courtneygo@google.com>
    > 
    > TBR=ynovikov@chromium.org,jmadill@google.com,cnorthrop@google.com,courtneygo@google.com,timvp@google.com
    > 
    > Change-Id: I71a739faa2052a707a06bce616ab43a621d5a4ff
    > No-Presubmit: true
    > No-Tree-Checks: true
    > No-Try: true
    > Bug: angleproject:3154
    > Reviewed-on: https://chromium-review.googlesource.com/c/1478333
    > Reviewed-by: Tim Van Patten <timvp@google.com>
    > Commit-Queue: Tim Van Patten <timvp@google.com>
    
    TBR=ynovikov@chromium.org,jmadill@google.com,cnorthrop@google.com,courtneygo@google.com,timvp@google.com
    
    # Not skipping CQ checks because original CL landed > 1 day ago.
    
    Bug: angleproject:3154
    Change-Id: If3a9abfb1c00aab3278437a233bef29d5febe5a5
    Reviewed-on: https://chromium-review.googlesource.com/c/1480865Reviewed-by: 's avatarTim Van Patten <timvp@google.com>
    Commit-Queue: Tim Van Patten <timvp@google.com>
    ee4fa078
AndroidManifest.xml.jinja2 1.32 KB
EditWeb IDE
×

Replace AndroidManifest.xml.jinja2

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.