diff options
| author | Sven Gothel <[email protected]> | 2012-08-23 22:26:50 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-08-23 22:26:50 +0200 |
| commit | 03ddbda61938295be0cfc62501e5a6ab0daaaef6 (patch) | |
| tree | ee88efc9323b7cf661e2eb4f87d4e6893730e396 /make/jogamp-androidtasks.xml | |
| parent | 7ec3d0b6a90f2204eb3272324cf5908caa4597b4 (diff) | |
Allow the custom user gluegen property file being specified by env var GLUEGEN_PROPERTIES_FILE -> property gluegen.user.properties.file ; Use props for android keystore values
Diffstat (limited to 'make/jogamp-androidtasks.xml')
| -rw-r--r-- | make/jogamp-androidtasks.xml | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/make/jogamp-androidtasks.xml b/make/jogamp-androidtasks.xml index 3e40fe1..b86b7cc 100644 --- a/make/jogamp-androidtasks.xml +++ b/make/jogamp-androidtasks.xml @@ -45,10 +45,11 @@ <attribute name="version.code" /> <attribute name="version.name" /> <attribute name="android.abi" default="generic" /> - <attribute name="keystore.file" default="/non.existing.user.keystore.file" /> - <attribute name="keystore.alias" default="debug" /> - <attribute name="keystore.storepass" default="jogamp" /> - <attribute name="keystore.keypass" default="jogamp" /> + <attribute name="keystore.file" default="${android.keystore.file}" /> + <attribute name="keystore.alias" default="${android.keystore.alias}" /> + <attribute name="keystore.storepass" default="${android.keystore.storepass}" /> + <attribute name="keystore.keypass" default="${android.keystore.keypass}" /> + <sequential> <var name="m.aapt.android.abi.extstr" unset="true"/> <var name="m.aapt.build.apk" unset="true"/> |