Skip to content

Commit

Permalink
Merge changes I3bf712e6,Ibed7ec45
Browse files Browse the repository at this point in the history
* changes:
  Change ndk-version.h to use 0 for a local build.
  Fix top level .gitignore.
  • Loading branch information
Treehugger Robot authored and Gerrit Code Review committed Jan 16, 2018
2 parents 3ec29b1 + 1cf2154 commit addc157
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ __pycache__/

# Distribution / packaging
.Python
build/
/build/
develop-eggs/
dist/
downloads/
Expand Down
2 changes: 1 addition & 1 deletion checkbuild.py
Original file line number Diff line number Diff line change
Expand Up @@ -1126,7 +1126,7 @@ def build(self, _out_dir, dist_dir, args):
canary = '1' if ndk.config.canary else '0'
build = args.build_number
if build == 'dev':
build = '-1'
build = '0'

ndk_version_h.write(textwrap.dedent("""\
#ifndef ANDROID_NDK_VERSION_H
Expand Down

0 comments on commit addc157

Please sign in to comment.