diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 04:16:27 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-09-19 04:16:27 +0000 |
| commit | 0e44c301ce6cb990c5ee4d9f11e34867d373d2b9 (patch) | |
| tree | 986c3b3815b2aac40ca06a96dae9ead6fbf326c0 /content/content_shell.gypi | |
| parent | e985058189e86db1284b43d1526a95c5f8d8d61a (diff) | |
| download | chromium_src-0e44c301ce6cb990c5ee4d9f11e34867d373d2b9.zip chromium_src-0e44c301ce6cb990c5ee4d9f11e34867d373d2b9.tar.gz chromium_src-0e44c301ce6cb990c5ee4d9f11e34867d373d2b9.tar.bz2 | |
Revert 156308 - Revert 156233 - Make apks be built in a consistent way
This broke non-incremental Android builds.
In the original CL there was a discrepancy in the way that Gyp handled
paths and the way that Ant handled paths. Changed it so that
resource_dir is specified relative to java_in_dir so that Gyp and Ant
treat it the same. For http://crbug.com/145991 I will have to make
resource_dir be in a consistent location for all apk targets and at that
point it can be removed from the gyp files.
Original:https://chromiumcodereview.appspot.com/10914130
BUG=
Review URL: https://chromiumcodereview.appspot.com/10913225
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@157502 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_shell.gypi')
| -rw-r--r-- | content/content_shell.gypi | 49 |
1 files changed, 11 insertions, 38 deletions
diff --git a/content/content_shell.gypi b/content/content_shell.gypi index 2143ed2..1e77bf1 100644 --- a/content/content_shell.gypi +++ b/content/content_shell.gypi @@ -605,6 +605,16 @@ '../net/net.gyp:net_java', '../ui/ui.gyp:ui_java', ], + 'variables': { + 'package_name': 'content_shell', + 'apk_name': 'ContentShell', + 'java_in_dir': 'shell/android/java', + # TODO(cjhopman): The resource directory of all apks should be in + # <java_in_dir>/res. + 'resource_dir': '../res', + 'native_libs_paths': ['<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent_shell_content_view.so'], + 'additional_input_paths': ['<(PRODUCT_DIR)/content_shell/assets/content_shell.pak'], + }, 'actions': [ { 'action_name': 'copy_and_strip_so', @@ -618,45 +628,8 @@ '<@(_outputs)', ], }, - { - 'action_name': 'content_shell_apk', - 'inputs': [ - 'shell/android/java/content_shell_apk.xml', - 'shell/android/java/AndroidManifest.xml', - '../build/android/ant/common.xml', - '../build/android/ant/sdk-targets.xml', - '<!@(find shell/android/java -name "*.java")', - '<!@(find shell/android/res -name "*")', - '>@(input_jars_paths)', - '<(PRODUCT_DIR)/content_shell/assets/content_shell.pak', - '<(PRODUCT_DIR)/content_shell/libs/<(android_app_abi)/libcontent_shell_content_view.so', - ], - 'outputs': [ - # Awkwardly, we build a Debug APK even when gyp is in - # Release mode. I don't think it matters (e.g. we're - # probably happy to not codesign) but naming should be - # fixed. - '<(PRODUCT_DIR)/content_shell/ContentShell-debug.apk', - ], - 'action': [ - # Pass the build type to ant. Currently it only assumes - # debug mode in java. Release mode will break the current - # workflow. - 'ant', - '-DPRODUCT_DIR=<(ant_build_out)', - '-DAPP_ABI=<(android_app_abi)', - '-DANDROID_SDK=<(android_sdk)', - '-DANDROID_SDK_ROOT=<(android_sdk_root)', - '-DANDROID_SDK_TOOLS=<(android_sdk_tools)', - '-DANDROID_SDK_VERSION=<(android_sdk_version)', - '-DANDROID_GDBSERVER=<(android_gdbserver)', - '-DCONFIGURATION_NAME=<(CONFIGURATION_NAME)', - '-DINPUT_JARS_PATHS=>(input_jars_paths)', - '-buildfile', - 'shell/android/java/content_shell_apk.xml', - ], - } ], + 'includes': [ '../build/java_apk.gypi' ], }, ], }], # OS=="android" |