[Android] Auto-generate only necessary v14 resources.

build/java.gypi

Index: build/java.gypi
diff --git a/build/java.gypi b/build/java.gypi
index 453c67141b8546799d0c42228d817c45d0f13286..ff25f3d18564b749f3fcec1a8b70fbcf8c66322d 100644
--- a/build/java.gypi
+++ b/build/java.gypi
@@ -83,10 +83,8 @@
       'variables': {
         'res_dir': '<(java_in_dir)/res',
         'res_crunched_dir': '<(intermediate_dir)/res_crunched',
-        'res_v14_dir': '<(intermediate_dir)/res_v14',
-        'res_v14_stamp': '<(intermediate_dir)/res_v14.stamp',
-        'res_v17_dir': '<(intermediate_dir)/res_v17',
-        'res_v17_stamp': '<(intermediate_dir)/res_v17.stamp',
+        'res_v14_overlay_stamp': '<(intermediate_dir)/res_v14.stamp',

[newt (away), 2013/05/10 17:10:01]

why add "overlay"?  I'm not saying you shouldn't, but I am curious why.

[Kibeom Kim (inactive), 2013/05/10 17:46:14]

Actually, I don't like this 'overlay' naming either. But If I keep 'res_v14/'
dir name, because now I'm copying/generating in a single directory,
'layout-v17/' will also under 'res_v14' which feels wrong.

copying and generating are now coupled so I think they deserve a single output
directory, but I couldn't come up with a good naming. Any suggestion?

On 2013/05/10 17:10:01, newt wrote:

[newt (away), 2013/05/10 18:06:27]

maybe "res_v14_compatibility" or "res_v14_support"? that's really what it is
now. if we leave out the directory, we lose v14 compatibility.

+        'res_v14_overlay_dir': '<(intermediate_dir)/res_v14_overlay',
         'res_input_dirs': ['<(res_dir)', '<@(res_extra_dirs)'],
         'resource_input_paths': ['<!@(find <(res_dir) -type f)'],
         'R_dir': '<(intermediate_dir)/java_R',
@@ -94,8 +92,7 @@
         'R_stamp': '<(intermediate_dir)/resources.stamp',
         'generated_src_dirs': ['<(R_dir)'],
         'additional_input_paths': ['<(R_stamp)',
-                                   '<(res_v14_stamp)',
-                                   '<(res_v17_stamp)',],
+                                   '<(res_v14_overlay_stamp)',],
         'additional_res_dirs': [],
         'dependencies_res_input_dirs': [],
         'dependencies_res_files': [],
@@ -107,8 +104,7 @@
           # dependencies_res_files.
           'generated_R_dirs': ['<(R_dir)'],
           'additional_input_paths': ['<(R_stamp)',
-                                     '<(res_v14_stamp)',
-                                     '<(res_v17_stamp)',],
+                                     '<(res_v14_overlay_stamp)',],
           'dependencies_res_files': ['<@(resource_input_paths)'],
 
           'dependencies_res_input_dirs': ['<@(res_input_dirs)'],
@@ -117,8 +113,7 @@
           # additional_res_dirs, additional_res_packages, and
           # additional_R_text_files.
           'additional_res_dirs': ['<(res_crunched_dir)',
-                                  '<(res_v14_dir)',
-                                  '<(res_v17_dir)',
+                                  '<(res_v14_overlay_dir)',
                                   '<@(res_input_dirs)'],
           'additional_res_packages': ['<(R_package)'],
           'additional_R_text_files': ['<(R_text_file)'],
@@ -186,42 +181,23 @@
             '--ignore=>!(echo \'>(_inputs)\' | md5sum)',
           ],
         },
-        # Copy API 17 resources.
-        {
-          'action_name': 'copy_v17_resources_<(_target_name)',
-          'message': 'Copying Android API 17 resources <(_target_name)',
-          'inputs': [
-            '<(DEPTH)/build/android/gyp/util/build_utils.py',
-            '<(DEPTH)/build/android/gyp/copy_v17_resources.py',
-            '>@(resource_input_paths)',
-          ],
-          'outputs': [
-            '<(res_v17_stamp)',
-          ],
-          'action': [
-            'python', '<(DEPTH)/build/android/gyp/copy_v17_resources.py',
-            '--res-dir=<(res_dir)',
-            '--res-v17-dir=<(res_v17_dir)',
-            '--stamp', '<(res_v17_stamp)',
-          ]
-        },
         # Generate API 14 resources.
         {
           'action_name': 'generate_api_14_resources_<(_target_name)',
           'message': 'Generating Android API 14 resources <(_target_name)',
           'inputs': [
             '<(DEPTH)/build/android/gyp/util/build_utils.py',
-            '<(DEPTH)/build/android/gyp/generate_v14_resources.py',
+            '<(DEPTH)/build/android/gyp/generate_v14_overlay_resources.py',
             '>@(resource_input_paths)',
           ],
           'outputs': [
-            '<(res_v14_stamp)',
+            '<(res_v14_overlay_stamp)',
           ],
           'action': [
-            'python', '<(DEPTH)/build/android/gyp/generate_v14_resources.py',
+            'python', '<(DEPTH)/build/android/gyp/generate_v14_overlay_resources.py',
             '--res-dir=<(res_dir)',
-            '--res-v14-dir=<(res_v14_dir)',
-            '--stamp', '<(res_v14_stamp)',
+            '--res-v14-overlay-dir=<(res_v14_overlay_dir)',
+            '--stamp', '<(res_v14_overlay_stamp)',
           ]
         },
       ],