commit ad1a1ae29f1da4a0cbc601fc280fcf6c473aa32b
author Tarun Nainani <tnainani@codeaurora.org> Mon Apr 27 17:21:03 2015 -0700
committer WebTech Code Review <code-review@localhost> Mon May 04 08:37:52 2015 -0700
tree 6bdb815b89ae5de96d7087f78b36e0955827ab56
parent 8bdb2110f744a0c545888a2415ee0636611376b7

Fix swe_res targets

Create generated_src folder for auto generated
NativeLibraries.java, which will be used to compile
swe_engine.jar.

Change-Id: I85e5ddce48f95c398959a2e64141c87e4c83e044

.gitignore

diff --git a/.gitignore b/.gitignore
index cea8212..b94280d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 res/values/about.xml
 android-studio
+generated_src

generated_src/src/org/chromium/base/library_loader/.gitkeep

diff --git a/generated_src/src/org/chromium/base/library_loader/.gitkeep b/generated_src/src/org/chromium/base/library_loader/.gitkeep
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/generated_src/src/org/chromium/base/library_loader/.gitkeep

swe_android_browser.gypi

diff --git a/swe_android_browser.gypi b/swe_android_browser.gypi
index 7944a45..4d3a70a 100644
--- a/swe_android_browser.gypi
+++ b/swe_android_browser.gypi
@@ -4,7 +4,7 @@
       'target_name': 'swe_android_browser_apk',
       'type': 'none',
       'dependencies': [
-        'swe_chrome_engine',
+        'swe_chrome_engine_java',
         '<@(libnetxt_dependencies)',
         '<@(libsta_dependencies)',
         '<@(libsweadrenoext_dependencies)',

swe_res.gypi

diff --git a/swe_res.gypi b/swe_res.gypi
index 37df7ab..2eeb0df 100644
--- a/swe_res.gypi
+++ b/swe_res.gypi
@@ -16,13 +16,12 @@
         ],
       },
       'copies' : [
-        #{
-          #TODO: FIX SWE_ENGINE.jar
-          #'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/jar/',
-          #'files': [
-          #  '<(PRODUCT_DIR)/lib.java/swe_engine.jar'
-          #],
-        #},
+        {
+          'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/jar/',
+          'files': [
+            '<(PRODUCT_DIR)/lib.java/swe_engine.jar'
+          ],
+        },
         {
           'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/assets',
           'files': [
@@ -36,6 +35,14 @@
             }],
           ],
         },
+        {
+          'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/assets/wml',
+          'files': [
+            '<(PRODUCT_DIR)/swe_android_browser_apk/assets/wml/swe_wml.xsl',
+            '<(PRODUCT_DIR)/swe_android_browser_apk/assets/wml/swe_wml.js',
+            '<(PRODUCT_DIR)/swe_android_browser_apk/assets/wml/swe_wml.css',
+          ],
+        },
 
         #ui res
         {
@@ -57,7 +64,7 @@
         {
           'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/swe_res/',
           'files': [
-            '<(PRODUCT_DIR)/res.java/swe_chrome_engine.zip',
+            '<(PRODUCT_DIR)/res.java/swe_chrome_engine_java.zip',
           ],
         },
         #chrome_res.
@@ -65,6 +72,7 @@
           'destination': '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/chrome_res/',
           'files': [
             '<(PRODUCT_DIR)/res.java/chrome_java.zip',
+            '<(PRODUCT_DIR)/res.java/chrome_strings_grd.zip',
           ],
         },
         #android_support_v7_res.
@@ -80,6 +88,12 @@
           'files': [
             '<(PRODUCT_DIR)/res.java/android_data_chart_java.zip',
           ],
+        },
+        {
+          'destination': '<(DEPTH)/swe/browser/generated_src/src/org/chromium/base/library_loader',
+          'files': [
+            '<(PRODUCT_DIR)/swe_android_browser_apk/native_libraries_java/NativeLibraries.java',
+          ],
         }
       ],
       'actions': [
@@ -132,7 +146,7 @@
                      ],
            'outputs': ['<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/swe_res/res/values/strings.xml'],
            'action': ['python', '<(DEPTH)/swe/tools/merge_resources.py',
-                       '<(PRODUCT_DIR)/res.java/swe_chrome_engine.zip',
+                       '<(PRODUCT_DIR)/res.java/swe_chrome_engine_java.zip',
                        '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/swe_res/res/',
                      ],
            'message': 'Merging SWE Resources'
@@ -179,8 +193,16 @@
            'inputs': ['<(DEPTH)/swe/tools/merge_resources.py',
                       '<(PRODUCT_DIR)/apks/SWE_AndroidBrowser.apk',
                      ],
-           'outputs': [
-                       '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/lib/libswev8.so',
+           'outputs': ['<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/lib/libicui18n.cr.so',
+                       '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/lib/libicuuc.cr.so',
+                       '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/lib/libstlport_sh_521.so',
+                       '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/lib/libsweskia.so',
+                       '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/lib/libsweadrenoext_22_plugin.so',
+                       '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/lib/libsweadrenoext_plugin.so',
+                       '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/lib/libsta.so',
+                       '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/lib/libchromium_client.so',
+                       '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/lib/libswe.so',
+                       '<(PRODUCT_DIR)/swe_android_browser_apk/swe_res/lib/libsweadrenoext_plugin.so',
                       ],
            'action': ['python', '<(DEPTH)/swe/tools/copy.py',
                        '<(PRODUCT_DIR)/swe_android_browser_apk/libs/<(arm_dir)',