Commit a1ee8d91 authored by hjd's avatar hjd Committed by Commit bot

Remove package_name from java_apk.gypi

This change completes the removal of package_name from
build/java_apk.gyp and removes it from all the places
which still refer to it.

'package_name' used to be how you specified the intermediate
directory when building an APK. Now we use the target name and
includers no longer need to set the intermediate directory
explicitly. However one use in java_apk for setting additional
resources files seems to have crept through the refactoring.

BUG=405963

Review URL: https://codereview.chromium.org/487223003

Cr-Commit-Position: refs/heads/master@{#293498}
parent d894398e
......@@ -4,7 +4,6 @@
{
'variables': {
'chromium_code': 1,
'package_name': 'multiple_proguard',
},
'targets': [
{
......
......@@ -198,7 +198,7 @@
# We generate R.java in package R_package (in addition to the package
# listed in the AndroidManifest.xml, which is unavoidable).
'additional_res_packages': ['<(R_package)'],
'additional_R_text_files': ['<(PRODUCT_DIR)/<(package_name)/R.txt'],
'additional_R_text_files': ['<(intermediate_dir)/R.txt'],
},
}],
['native_lib_target != "" and component == "shared_library"', {
......
......@@ -2845,7 +2845,6 @@
'target_name': 'chrome_java_test_support',
'type': 'none',
'variables': {
'package_name': 'chrome_java_test_support',
'java_in_dir': '../chrome/test/android/javatests',
},
'dependencies': [
......
......@@ -440,7 +440,6 @@
'target_name': 'sync_java_test_support',
'type': 'none',
'variables': {
'package_name': 'sync_java_test_support',
'java_in_dir': '../sync/test/android/javatests',
},
'dependencies': [
......
......@@ -16,7 +16,6 @@
'type': 'none',
'variables': {
'apk_name': 'MemConsumer',
'package_name': 'memconsumer',
'java_in_dir': 'java',
'resource_dir': 'java/res',
'native_lib_target': 'libmemconsumer',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment