Add Proguard option to gyp template.

Add proguard specific options to java_apk.gypi so that an apk can
specify proguard flags.

BUG=149214


Review URL: https://chromiumcodereview.appspot.com/11100002

git-svn-id: http://src.chromium.org/svn/trunk/src/build@161004 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

android/ant/chromium-apk.xml

@@ -37,6 +37,13 @@
   <property-location name="native.libs.absolute.dir" location="${out.dir}/libs"
       check-exists="false"/>
 
+  <property-value name="version.code" value="${APP_MANIFEST_VERSION_CODE}"/>
+  <property-value name="version.name" value="${APP_MANIFEST_VERSION_NAME}"/>
+
+  <property name="proguard.config" value="${PROGUARD_FLAGS}"/>
+  <property name="proguard.enabled" value="${PROGUARD_ENABLED}"/>
+  <!-- TODO(shashishekhar): Enable emma and code-coverage filters. -->
+
   <condition property="asset.absolute.dir"
       value="${out.dir}/assets"
       else="${ASSET_DIR}">
@@ -48,13 +55,13 @@
       location="${apks.dir}/${ant.project.name}-debug.apk"
       check-exists="false"/>
 
-  <path id="out.dex.jar.input.ref">
+  <!-- Classpath for javac -->
+  <path id="javac.custom.classpath">
     <filelist files="${INPUT_JARS_PATHS}"/>
   </path>
 
-  <!-- Classpath for javac -->
-  <path id="javac.custom.classpath">
-    <path refid="out.dex.jar.input.ref"/>
+  <path id="out.dex.jar.input.ref">
+    <path refid="javac.custom.classpath"/>
   </path>
 
   <import file="sdk-targets.xml"/>

java_apk.gypi

@@ -58,6 +58,10 @@
     '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': [
     {
@@ -101,6 +105,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',