diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-26 04:19:34 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-05-26 04:19:34 +0000 |
| commit | c97eac015362ee16fc570d632118d9d5f1197451 (patch) | |
| tree | c638abd598ecbc167215d72d604e1caf1a771341 /build/java.gypi | |
| parent | ceb624e34de4165a75874786b34ca509fe865a43 (diff) | |
| download | chromium_src-c97eac015362ee16fc570d632118d9d5f1197451.zip chromium_src-c97eac015362ee16fc570d632118d9d5f1197451.tar.gz chromium_src-c97eac015362ee16fc570d632118d9d5f1197451.tar.bz2 | |
Remove apk-codegen.xml
process_resources.py already implements almost everything from
apk-codegen.xml so just use that instead.
BUG=359249,375324,375431
Review URL: https://codereview.chromium.org/295473002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@272783 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/java.gypi')
| -rw-r--r-- | build/java.gypi | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/build/java.gypi b/build/java.gypi index 8f61395..ce778b1 100644 --- a/build/java.gypi +++ b/build/java.gypi @@ -156,8 +156,8 @@ 'android_manifest': '<(DEPTH)/build/android/AndroidManifest.xml', # Include the dependencies' res dirs so that references to # resources in dependencies can be resolved. - 'all_res_dirs': ['<@(res_input_dirs)', - '>@(dependencies_res_input_dirs)',], + 'dependencies_res_dirs': ['<@(res_extra_dirs)', + '>@(dependencies_res_input_dirs)',], # Write the inputs list to a file, so that its mtime is updated when # the list of inputs changes. 'inputs_list_file': '>|(java_resources.<(_target_name).gypcmd >@(resource_input_paths) >@(dependencies_res_files))' @@ -177,8 +177,8 @@ '--android-sdk', '<(android_sdk)', '--android-sdk-tools', '<(android_sdk_tools)', '--R-dir', '<(R_dir)', - '--res-dirs', '>(all_res_dirs)', - '--crunch-input-dir', '>(res_dir)', + '--dependencies-res-dirs', '>(dependencies_res_dirs)', + '--resource-dir', '<(res_dir)', '--crunch-output-dir', '<(res_crunched_dir)', '--android-manifest', '<(android_manifest)', '--non-constant-id', |