This fixes the component build.

Need to pass the CONFIGURATION_NAME through to the push python libs.

BUG=

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@222171 0039d316-1c4b-4281-b951-d872f2087c98

build/android/gyp/apk_install.py

@@ -21,6 +21,7 @@ from util import md5_check
 BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..')
 sys.path.append(BUILD_ANDROID_DIR)
 
+from pylib import constants
 from pylib.utils import apk_helper
 
 def GetNewMetadata(device, apk_package):
@@ -62,6 +63,8 @@ def main(argv):
       help='Path to build device configuration.')
   parser.add_option('--stamp',
       help='Path to touch on success.')
+  parser.add_option('--configuration-name',
+      help='The build CONFIGURATION_NAME')
   options, _ = parser.parse_args()
 
   device = build_device.GetBuildDeviceFromPath(
@@ -69,6 +72,8 @@ def main(argv):
   if not device:
     return
 
+  constants.SetBuildType(options.configuration_name)
+
   serial_number = device.GetSerialNumber()
   apk_package = apk_helper.GetPackageName(options.apk_path)
 

build/android/gyp/create_device_library_links.py

@@ -23,6 +23,7 @@ from util import md5_check
 BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), '..')
 sys.path.append(BUILD_ANDROID_DIR)
 
+from pylib import constants
 from pylib.utils import apk_helper
 
 def RunShellCommand(device, cmd):
@@ -93,11 +94,14 @@ def main(argv):
   parser.add_option('--stamp', help='Path to touch on success.')
   parser.add_option('--build-device-configuration',
       help='Path to build device configuration.')
+  parser.add_option('--configuration-name',
+      help='The build CONFIGURATION_NAME')
   options, _ = parser.parse_args()
 
   required_options = ['apk', 'libraries_json', 'script_host_path',
-      'script_device_path', 'target_dir']
+      'script_device_path', 'target_dir', 'configuration_name']
   build_utils.CheckOptions(options, parser, required=required_options)
+  constants.SetBuildType(options.configuration_name)
 
   CreateSymlinkScript(options)
   TriggerSymlinkScript(options)

build/android/gyp/push_libraries.py

@@ -13,6 +13,11 @@ import optparse
 import os
 import sys
 
+BUILD_ANDROID_DIR = os.path.join(os.path.dirname(__file__), os.pardir)
+sys.path.append(BUILD_ANDROID_DIR)
+
+from pylib import constants
+
 from util import build_device
 from util import build_utils
 from util import md5_check
@@ -57,10 +62,13 @@ def main(argv):
   parser.add_option('--stamp', help='Path to touch on success.')
   parser.add_option('--build-device-configuration',
       help='Path to build device configuration.')
+  parser.add_option('--configuration-name',
+      help='The build CONFIGURATION_NAME')
   options, _ = parser.parse_args()
 
   required_options = ['libraries_dir', 'device_dir', 'libraries_json']
   build_utils.CheckOptions(options, parser, required=required_options)
+  constants.SetBuildType(options.configuration_name)
 
   DoPush(options)
 

build/android/push_libraries.gypi

@@ -15,6 +15,7 @@
 #        'libraries_source_dir': 'location where stripped libraries are stored'
 #        'device_library_dir': 'location on the device where to put pushed libraries',
 #        'push_stamp': 'file to touch when the action is complete'
+#        'configuration_name': 'The build CONFIGURATION_NAME'
 #      },
 #      'includes': [ '../../build/android/push_libraries.gypi' ],
 #    ],
@@ -41,5 +42,6 @@
     '--device-dir=<(device_library_dir)',
     '--libraries-json=<(ordered_libraries_file)',
     '--stamp=<(push_stamp)',
+    '--configuration-name=<(configuration_name)',
   ],
 }

build/java_apk.gypi

@@ -247,6 +247,7 @@
             'libraries_top_dir': '<(intermediate_dir)/lib.stripped',
             'libraries_source_dir': '<(libraries_top_dir)/lib/<(android_app_abi)',
             'device_library_dir': '<(device_intermediate_dir)/lib.stripped',
+            'configuration_name': '<(CONFIGURATION_NAME)',
           },
           'dependencies': [
             '<(DEPTH)/tools/android/md5sum/md5sum.gyp:md5sum',
@@ -278,6 +279,7 @@
                 '--target-dir=<(device_library_dir)',
                 '--apk=<(incomplete_apk_path)',
                 '--stamp=<(link_stamp)',
+                '--configuration-name=<(CONFIGURATION_NAME)',
               ],
             },
           ],
@@ -371,6 +373,7 @@
             '--apk-path=<(incomplete_apk_path)',
             '--build-device-configuration=<(build_device_config_path)',
             '--install-record=<(apk_install_record)',
+            '--configuration-name=<(CONFIGURATION_NAME)',
           ],
         },
       ],