Make resource directory option in gyp template optional.

Make resource directory option in gyp template optional.

Resource directory may not always be defined for an apk, make it optional.

BUG=156061
Committed: http://src.chromium.org/viewvc/chrome?view=rev&revision=162477

[cjhopman, 2012-10-16 20:27:12]

Maybe also delete android_webview/res and change those targets to not specify a
resources directory so we know that this works.

https://chromiumcodereview.appspot.com/11189010/diff/2001/build/java_apk.gypi
File build/java_apk.gypi (right):

https://chromiumcodereview.appspot.com/11189010/diff/2001/build/java_apk.gypi...
build/java_apk.gypi:36: #  resource_dir - The directory for resources.
Update this, resource_dir is no longer required.

https://chromiumcodereview.appspot.com/11189010/diff/2001/build/java_apk.gypi...
build/java_apk.gypi:116: 'inputs': ['<!@(find <(java_in_dir)/<(resource_dir)
-name "*")']
Nit: indentation

[Yaron, 2012-10-16 21:41:03]

lgtm when Chris is happy

[cjhopman, 2012-10-16 22:31:12]

http://codereview.chromium.org/11189010/diff/9001/build/java_apk.gypi
File build/java_apk.gypi (right):

http://codereview.chromium.org/11189010/diff/9001/build/java_apk.gypi#newcode115
build/java_apk.gypi:115: ['"<(resource_dir)"!=""', {
I think this can be changed to:

['resource_dir!=""', {

[shashi, 2012-10-16 22:38:51]

https://chromiumcodereview.appspot.com/11189010/diff/9001/build/java_apk.gypi
File build/java_apk.gypi (right):

https://chromiumcodereview.appspot.com/11189010/diff/9001/build/java_apk.gypi...
build/java_apk.gypi:115: ['"<(resource_dir)"!=""', {
Thanks, much better.
On 2012/10/16 22:31:12, cjhopman wrote:
> I think this can be changed to:
> 
> ['resource_dir!=""', {

[cjhopman, 2012-10-16 23:33:49]

https://chromiumcodereview.appspot.com/11189010/diff/6002/android_webview/and...
File android_webview/android_webview.gyp (left):

https://chromiumcodereview.appspot.com/11189010/diff/6002/android_webview/and...
android_webview/android_webview.gyp:103: 'package_name': 'android_webview',
I think the android_webview_test_apk also uses the fake resource_dir.

[shashi, 2012-10-16 23:43:04]

https://chromiumcodereview.appspot.com/11189010/diff/6002/android_webview/and...
File android_webview/android_webview.gyp (left):

https://chromiumcodereview.appspot.com/11189010/diff/6002/android_webview/and...
android_webview/android_webview.gyp:103: 'package_name': 'android_webview',
There are actual files in there :).
On 2012/10/16 23:33:49, cjhopman wrote:
> I think the android_webview_test_apk also uses the fake resource_dir.

[cjhopman, 2012-10-16 23:50:59]

lgtm

[commit-bot: I haz the power, 2012-10-16 23:51:45]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/shashishekhar@chromium.org/11189010/6002

[commit-bot: I haz the power, 2012-10-16 23:51:49]

Presubmit check for 11189010-6002 failed and returned exit status 1.


Running presubmit commit checks ...

** Presubmit ERRORS **
Missing LGTM from an OWNER for files in these directories:
    android_webview

Presubmit checks took 1.0s to calculate.

[shashi, 2012-10-16 23:52:52]

+mkosiba: owners approval.

[mkosiba (inactive), 2012-10-17 09:03:53]

lgtm

[commit-bot: I haz the power, 2012-10-17 16:55:14]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/shashishekhar@chromium.org/11189010/6002

[commit-bot: I haz the power, 2012-10-17 19:07:15]

Change committed as 162477