Use _target_name instead of package_name for java*.gypi

Use _target_name instead of package_name for java*.gypi

We were using package_name as a unique name for naming output files and
directories. package_name was typically the same as _target_name or a
variation of it (like dropping _apk). Using _target_name instead means
we need to specify one less thing and it is (maybe?) guaranteed to be
unique.

TBR=brettw,joi,jar,fischman,zea,sky
BUG=

Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=183639

[Yaron, 2012-11-08 02:43:11]

Looks like a nice clean up.

Please verify a clean build is fine. It'll lead to some bloat on bots until the
next time they clobber but our java files are so small it shouldn't matter.

http://codereview.chromium.org/11308030/diff/1/build/android/ant/chromium-apk...
File build/android/ant/chromium-apk.xml (right):

http://codereview.chromium.org/11308030/diff/1/build/android/ant/chromium-apk...
build/android/ant/chromium-apk.xml:23: <property-location
Nit: can probably collapse into a single line, right?

http://codereview.chromium.org/11308030/diff/1/build/java.gypi
File build/java.gypi (right):

http://codereview.chromium.org/11308030/diff/1/build/java.gypi#newcode19
build/java.gypi:19: #   <(PRODUCT_DIR)/lib.java/chromium_<(_target_name).jar
I didn't know _target_name existed!

http://codereview.chromium.org/11308030/diff/1/build/java.gypi#newcode79
build/java.gypi:79: '-DJAR_NAME=chromium_<(_target_name).jar',
Why do we have the "chromium_" prefix? What could we be colliding with?

http://codereview.chromium.org/11308030/diff/1/build/java.gypi#newcode80
build/java.gypi:80: '-DOUT_DIR=<(PRODUCT_DIR)/<(_target_name)',
OUT_DIR doesn't appear to be used by chromium-jars.xml. Although you could set
dest.dir to it and be more consistent with apks.

[Torne, 2012-11-08 12:41:38]

Just a quick note; gyp target names are not guaranteed to be unique (and aren't,
in practise, though duplicates are rare). They are only unique within a single
directory; different directories can contain gyp files with the same target
names in them.

This is unlikely to be a problem in reality, just wanted to make sure you knew
about it.

[cjhopman, 2012-12-05 00:51:04]

https://codereview.chromium.org/11308030/diff/1/build/android/ant/chromium-ap...
File build/android/ant/chromium-apk.xml (right):

https://codereview.chromium.org/11308030/diff/1/build/android/ant/chromium-ap...
build/android/ant/chromium-apk.xml:23: <property-location
On 2012/11/08 02:43:11, Yaron wrote:
> Nit: can probably collapse into a single line, right?

Done.

https://codereview.chromium.org/11308030/diff/1/build/java.gypi
File build/java.gypi (right):

https://codereview.chromium.org/11308030/diff/1/build/java.gypi#newcode79
build/java.gypi:79: '-DJAR_NAME=chromium_<(_target_name).jar',
On 2012/11/08 02:43:11, Yaron wrote:
> Why do we have the "chromium_" prefix? What could we be colliding with?

I've removed the prefix, there's nothing that we should be colliding with. This
change already changes the name for all the jars, so changing it more by
removing the prefix should be fine.

https://codereview.chromium.org/11308030/diff/1/build/java.gypi#newcode80
build/java.gypi:80: '-DOUT_DIR=<(PRODUCT_DIR)/<(_target_name)',
On 2012/11/08 02:43:11, Yaron wrote:
> OUT_DIR doesn't appear to be used by chromium-jars.xml. Although you could set
> dest.dir to it and be more consistent with apks.

Done. To be consistent with chromium-apks.xml and java_apk.gypi I've changed
dest.dir to out.dir in chromium-jars.xml.

[Yaron, 2012-12-05 21:58:16]

lgtm

+Peter. I don't believe this will break anything for webkit but probably worth a
heads up.

[cjhopman, 2013-02-19 23:52:55]

torne: android_webview/

yaron: take another look if you like... rebase mostly just added more *_java
targets to remove package_name from

[Torne, 2013-02-20 10:57:27]

android_webview/ LGTM

[cjhopman, 2013-02-20 17:46:04]

TBRed removals of 'package_name' variable from targets

brettw: chrome/, content/, third_party/
joi: components/
fischman: media/
jar: base/, net/
zea: sync/
sky: ui/

[commit-bot: I haz the power, 2013-02-20 17:47:02]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/cjhopman@chromium.org/11308030/57001

[commit-bot: I haz the power, 2013-02-20 17:47:13]

Failed to apply patch for android_webview/Android.mk:
While running patch -p1 --forward --force --no-backup-if-mismatch;
  patching file android_webview/Android.mk
  Hunk #1 FAILED at 65.
  1 out of 1 hunk FAILED -- saving rejects to file
android_webview/Android.mk.rej

Patch:       android_webview/Android.mk
Index: android_webview/Android.mk
diff --git a/android_webview/Android.mk b/android_webview/Android.mk
index
cc5043b0aa7c8ac1a6f09c0881d1bf6632ac63ab..bc43058c6935755c5245ccba0b5322569b32e732
100644
--- a/android_webview/Android.mk
+++ b/android_webview/Android.mk
@@ -65,14 +65,14 @@ include $(BUILD_STATIC_JAVA_LIBRARY)
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_pak
 LOCAL_MODULE_STEM := webviewchromium
-LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewchromium.pak
+LOCAL_BUILT_MODULE_STEM := android_webview_apk/assets/webviewchromium.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 # TODO(benm): remove when downstream depends on localised paks.
 include $(CLEAR_VARS)
 LOCAL_MODULE := webviewchromium_strings_pak
 LOCAL_MODULE_STEM := webviewchromium_strings
-LOCAL_BUILT_MODULE_STEM := android_webview/assets/webviewchromium_strings.pak
+LOCAL_BUILT_MODULE_STEM :=
android_webview_apk/assets/webviewchromium_strings.pak
 include $(LOCAL_PATH)/webview_pak.mk
 
 include $(CLEAR_VARS)

[Ami GONE FROM CHROMIUM, 2013-02-20 17:48:38]

lgtm

[sky, 2013-02-20 18:17:36]

LGTM

[brettw, 2013-02-20 18:24:15]

I don't understand this at all so LGTM.

[Nicolas Zea, 2013-02-20 18:25:42]

lgtm

[Yaron, 2013-02-20 18:42:01]

https://codereview.chromium.org/11308030/diff/57001/build/java.gypi
File build/java.gypi (right):

https://codereview.chromium.org/11308030/diff/57001/build/java.gypi#newcode176
build/java.gypi:176: '-DTARGET_NAME=<(_target_name)',
Where is TARGET_NAME used?

[commit-bot: I haz the power, 2013-02-20 20:38:11]

CQ is trying da patch. Follow status at
https://chromium-status.appspot.com/cq/cjhopman@chromium.org/11308030/74002

[commit-bot: I haz the power, 2013-02-20 22:39:19]

Change committed as 183639

[Jói, 2013-02-21 11:47:49]

LGTM for components/

On Wed, Feb 20, 2013 at 10:39 PM,  <commit-bot@chromium.org> wrote:
> Change committed as 183639
>
> https://chromiumcodereview.appspot.com/11308030/