Index: build/java_apk.gypi |
diff --git a/build/java_apk.gypi b/build/java_apk.gypi |
index 4aa6ea8da635644a573400a5362ddf0a6470ab41..f8557ed84abdcdcd0643f44ed501ab2a1f679256 100644 |
--- a/build/java_apk.gypi |
+++ b/build/java_apk.gypi |
@@ -52,12 +52,16 @@ |
{ |
'variables': { |
- 'asset_location': '', |
+ 'asset_location%': '', |
Yaron
2012/10/09 20:43:12
I guess we're racing to make this change :)
|
'additional_input_paths': [], |
'input_jars_paths': [], |
'native_libs_paths': [], |
'additional_src_dirs': [], |
'generated_src_dirs': [], |
+ 'app_manifest_version_name%': '<(android_app_version_name)', |
+ 'app_manifest_version_code%': '<(android_app_version_code)', |
+ 'proguard_enabled%': 'false', |
+ 'proguard_flags%': '' |
}, |
'actions': [ |
{ |
@@ -99,6 +103,10 @@ |
'-DINPUT_JARS_PATHS=>(input_jars_paths)', |
'-DPACKAGE_NAME=<(package_name)', |
'-DRESOURCE_DIR=<(resource_dir)', |
+ '-DAPP_MANIFEST_VERSION_NAME=<(app_manifest_version_name)', |
+ '-DAPP_MANIFEST_VERSION_CODE=<(app_manifest_version_code)', |
+ '-DPROGUARD_FLAGS=>(proguard_flags)', |
+ '-DPROGUARD_ENABLED=>(proguard_enabled)', |
'-Dbasedir=<(java_in_dir)', |
'-buildfile', |