aboutsummaryrefslogtreecommitdiff
path: root/demos/android/cube/AndroidManifest.xml
AgeCommit message (Collapse)Author
2017-10-29repo: normalize line termination across repoMike Weiblen
This is a scrub of the entire repo to normalize end-of-line termination to conform to the recently added .gitattributes file. A mismatch of line termination can cause difficult-to-resolve conflicts when rebasing or merging. The process performed is described at: https://help.github.com/articles/dealing-with-line-endings/#refreshing-a-repository-after-changing-line-endings The .gitattributes file is required because some files (*.bat and *.sh) are sensitive to line termination. The .gitattributes file is stored in the repo, and overrides settings which could be corrupted by a developer's local git configuration. The .gitattributes file was added in f077c81 This commit completes bcc9fec, which fixed a single file. Change-Id: I75d4594b61cb8aa6a09efb3ed5ace34fe8394871
2016-09-22demos: Clean up APK creation for cube and triCody Northrop
Instead of moving manifest files, run the following commands: android update project -s -p . -t "android-23" ant -buildfile cube debug ant -buildfile tri debug And the APKs can coexist: ./cube/bin/NativeActivity-debug.apk ./tri/bin/NativeActivity-debug.apk