commit ffaa51f9b0b1e37888ad607d614e8b3106c73b42
author Tarun Nainani <tnainani@codeaurora.org> Fri Mar 06 16:36:37 2015 -0800
committer Tarun Nainani <tnainani@codeaurora.org> Mon Mar 16 09:58:48 2015 -0700
tree 7586c8b2008d2da728267999ed38daa5d7313fd1
parent ed791da741064a51080ec775001cf843ba6a3143

Add 'merge_android_data_usage' to swe_res

Change-Id: If52741ad5e34241aa9f928244942a33a91610e13

swe_res.gypi

diff --git a/swe_res.gypi b/swe_res.gypi
index ce6e6ee..38231c8 100644
--- a/swe_res.gypi
+++ b/swe_res.gypi
@@ -74,6 +74,13 @@
             '<(PRODUCT_DIR)/res.java/android_support_v7_appcompat_javalib.zip',
           ],
         },
+        #android_data_chart_res
+        {
+          'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/android_data_chart_res/',
+          'files': [
+            '<(PRODUCT_DIR)/res.java/android_data_chart_java.zip',
+          ],
+        }
       ],
       'actions': [
         {
@@ -156,6 +163,18 @@
            'message': 'Merging SWE Resources'
         },
         {
+           'action_name': 'merge_android_data_usage',
+           'inputs': ['<(DEPTH)/swe/tools/merge_resources.py',
+                      '<(PRODUCT_DIR)/apks/SWE_AndroidBrowser.apk',
+                     ],
+           'outputs': ['<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/android_support_res/res/values/strings.xml'],
+           'action': ['python', '<(DEPTH)/swe/tools/merge_resources.py',
+                       '<(PRODUCT_DIR)/res.java/android_data_chart_java.zip',
+                       '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/android_data_chart_res/res/',
+                     ],
+           'message': 'Merging SWE Resources'
+        },
+        {
            'action_name': 'merge_swe_libs',
            'inputs': ['<(DEPTH)/swe/tools/merge_resources.py',
                       '<(PRODUCT_DIR)/apks/SWE_AndroidBrowser.apk',
@@ -172,4 +191,4 @@
       ],
     }
   ]
-}
\ No newline at end of file
+}