Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(435)

Unified Diff: build/java_apk.gypi

Issue 295473002: Remove apk-codegen.xml (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix proguard.txt Created 6 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/java.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/java_apk.gypi
diff --git a/build/java_apk.gypi b/build/java_apk.gypi
index d083afc08c2065ed2e178cfc97c99e7fc5f1caf9..66bf65dc47f28847bae4064dfc55c1982fd485cc 100644
--- a/build/java_apk.gypi
+++ b/build/java_apk.gypi
@@ -59,8 +59,10 @@
'generated_src_dirs': [],
'app_manifest_version_name%': '<(android_app_version_name)',
'app_manifest_version_code%': '<(android_app_version_code)',
+ # aapt generates this proguard.txt.
+ 'generated_proguard_file': '<(intermediate_dir)/proguard.txt',
'proguard_enabled%': 'false',
- 'proguard_flags_paths%': ['<(DEPTH)/build/android/empty_proguard.flags'],
+ 'proguard_flags_paths': ['<(generated_proguard_file)'],
'jar_name': 'chromium_apk_<(_target_name).jar',
'resource_dir%':'<(DEPTH)/build/android/ant/empty/res',
'R_package%':'',
@@ -433,8 +435,13 @@
],
'actions': [
{
- 'action_name': 'ant_codegen_<(_target_name)',
- 'message': 'Generating R.java for <(_target_name)',
+ 'action_name': 'process_resources',
+ 'message': 'processing resources for <(_target_name)',
+ 'variables': {
+ # Write the inputs list to a file, so that its mtime is updated when
+ # the list of inputs changes.
+ 'inputs_list_file': '>|(apk_codegen.<(_target_name).gypcmd >@(additional_input_paths) >@(resource_input_paths))',
+ },
'conditions': [
['is_test_apk == 1', {
'variables': {
@@ -443,41 +450,37 @@
}
}],
],
- 'variables': {
- # Write the inputs list to a file, so that its mtime is updated when
- # the list of inputs changes.
- 'inputs_list_file': '>|(apk_codegen.<(_target_name).gypcmd >@(additional_input_paths) >@(resource_input_paths))'
- },
'inputs': [
- '<(DEPTH)/build/android/ant/apk-codegen.xml',
'<(DEPTH)/build/android/gyp/util/build_utils.py',
- '<(DEPTH)/build/android/gyp/ant.py',
+ '<(DEPTH)/build/android/gyp/process_resources.py',
'<(android_manifest_path)',
'>@(additional_input_paths)',
'>@(resource_input_paths)',
'>(inputs_list_file)',
],
'outputs': [
+ '<(generated_proguard_file)',
'<(codegen_stamp)',
],
'action': [
- 'python', '<(DEPTH)/build/android/gyp/ant.py',
- '-quiet',
- '-DADDITIONAL_RES_DIRS=>(additional_res_dirs)',
- '-DADDITIONAL_RES_PACKAGES=>(additional_res_packages)',
- '-DADDITIONAL_R_TEXT_FILES=>(additional_R_text_files)',
- '-DANDROID_MANIFEST=<(android_manifest_path)',
- '-DANDROID_SDK_JAR=<(android_sdk_jar)',
- '-DANDROID_SDK_ROOT=<(android_sdk_root)',
- '-DANDROID_SDK_VERSION=<(android_sdk_version)',
- '-DANDROID_SDK_TOOLS=<(android_sdk_tools)',
- '-DOUT_DIR=<(intermediate_dir)',
- '-DRESOURCE_DIR=<(resource_dir)',
+ 'python', '<(DEPTH)/build/android/gyp/process_resources.py',
+ '--android-sdk', '<(android_sdk)',
+ '--android-sdk-tools', '<(android_sdk_tools)',
- '-DSTAMP=<(codegen_stamp)',
- '-Dbasedir=.',
- '-buildfile',
- '<(DEPTH)/build/android/ant/apk-codegen.xml',
+ '--android-manifest', '<(android_manifest_path)',
+ '--dependencies-res-dirs', '>(additional_res_dirs)',
+
+ '--extra-res-packages', '>(additional_res_packages)',
+ '--extra-r-text-files', '>(additional_R_text_files)',
+
+ '--proguard-file', '<(generated_proguard_file)',
+
+ '--resource-dir', '<(resource_dir)',
+ '--crunch-output-dir', '<(intermediate_dir)/res',
+
+ '--R-dir', '<(intermediate_dir)/gen',
+
+ '--stamp', '<(codegen_stamp)',
],
},
{
« no previous file with comments | « build/java.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698