diff options
| author | Sam Whited <sam@samwhited.com> | 2014-10-30 15:20:20 -0400 |
|---|---|---|
| committer | Sam Whited <sam@samwhited.com> | 2014-10-30 15:33:13 -0400 |
| commit | 46f147a82c6b161e071f717c7686f8b78a20aaf1 (patch) | |
| tree | 38ee04006e38197fd8009697b8975007ec0f45c8 /libs/openpgp-api-lib/project.properties | |
| parent | 142384e5805d93887d185c9a5b74d4850e4ec719 (diff) | |
| parent | a362bd10214b16f8939c12a1dd4376667fe0d49f (diff) | |
Merge branch 'gradle' into development
Conflicts:
.gitignore
CHANGELOG.md
README.md
libs/MemorizingTrustManager
libs/minidns
libs/openpgp-api-lib
Diffstat (limited to 'libs/openpgp-api-lib/project.properties')
| m--------- | libs/openpgp-api-lib | 6 | ||||
| -rw-r--r-- | libs/openpgp-api-lib/project.properties | 15 |
2 files changed, 15 insertions, 6 deletions
diff --git a/libs/openpgp-api-lib b/libs/openpgp-api-lib deleted file mode 160000 -Subproject 0be263d5d3effd2df5f976fa4a127017268749c diff --git a/libs/openpgp-api-lib/project.properties b/libs/openpgp-api-lib/project.properties new file mode 100644 index 00000000..91d2b024 --- /dev/null +++ b/libs/openpgp-api-lib/project.properties @@ -0,0 +1,15 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt + +# Project target. +target=android-19 +android.library=true |