diff options
| author | newt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 02:17:23 +0000 |
|---|---|---|
| committer | newt@chromium.org <newt@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-20 02:17:23 +0000 |
| commit | e8a0dda4df26eb878290dfdaaa610f1c1fabae3e (patch) | |
| tree | ae566bac2b448fe60c84db7ecf05dfc49fdf321f /build | |
| parent | 5759a8539422fa7d75f6595fc562cb6cacd4585e (diff) | |
| download | chromium_src-e8a0dda4df26eb878290dfdaaa610f1c1fabae3e.zip chromium_src-e8a0dda4df26eb878290dfdaaa610f1c1fabae3e.tar.gz chromium_src-e8a0dda4df26eb878290dfdaaa610f1c1fabae3e.tar.bz2 | |
Enable Android APKs to be build with R.java in a custom package.
BUG=158558
Review URL: https://chromiumcodereview.appspot.com/11411049
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168704 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
| -rw-r--r-- | build/android/ant/empty/res/.keep | 2 | ||||
| -rw-r--r-- | build/java_apk.gypi | 16 |
2 files changed, 16 insertions, 2 deletions
diff --git a/build/android/ant/empty/res/.keep b/build/android/ant/empty/res/.keep new file mode 100644 index 0000000..1fd038b --- /dev/null +++ b/build/android/ant/empty/res/.keep @@ -0,0 +1,2 @@ +# This empty res folder can be passed to aapt while building Java libraries or +# APKs that don't have any resources. diff --git a/build/java_apk.gypi b/build/java_apk.gypi index 7aa0738..5cf9857 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -57,6 +57,8 @@ # unstripped copy will be added to <(android_product_out) to enable native # debugging. # resource_dir - The directory for resources. +# R_package - A custom Java package to generate the resource file R.java in. +# By default, the package given in AndroidManifest.xml will be used. { 'variables': { @@ -70,9 +72,9 @@ 'proguard_enabled%': 'false', 'proguard_flags%': '', 'native_libs_paths': [], - 'manifest_package_name%': 'unknown.package.name', - 'resource_dir%':'', 'jar_name%': 'chromium_apk_<(package_name).jar', + 'resource_dir%':'', + 'R_package%':'', 'additional_res_dirs': [], 'additional_res_packages': [], 'is_test_apk%': 0, @@ -177,4 +179,14 @@ ] }, ], + 'conditions': [ + ['R_package != ""', { + 'variables': { + # We generate R.java in package R_package (in addition to the package + # listed in the AndroidManifest.xml, which is unavoidable). + 'additional_res_dirs': ['<(DEPTH)/build/android/ant/empty/res'], + 'additional_res_packages': ['<(R_package)'], + }, + }], + ], } |