summaryrefslogtreecommitdiffstats
path: root/BUILD.gn
diff options
context:
space:
mode:
authorcjhopman <cjhopman@chromium.org>2014-11-17 19:39:38 -0800
committerCommit bot <commit-bot@chromium.org>2014-11-18 03:40:00 +0000
commit3d85c6dd6a6540699d3baf583780577327a0cd13 (patch)
treee8cad397fdf00209ec10b3d87b041350e70621d5 /BUILD.gn
parent81d0f757450f8b652bd2f8844ec0970ab9dbb5b4 (diff)
downloadchromium_src-3d85c6dd6a6540699d3baf583780577327a0cd13.zip
chromium_src-3d85c6dd6a6540699d3baf583780577327a0cd13.tar.gz
chromium_src-3d85c6dd6a6540699d3baf583780577327a0cd13.tar.bz2
Greatly improve (non-android) java support
This change fixes java_library and java_prebuilt to actually construct a classpath based on their dependents. It adds java_binary that is similar to java_library but also creates a script in $root_build_dir/bin/ to actually run a java jar (it builds in the classpath and main class so that it can just be run like a normal executable). Adds the flags "android" and "has_android_platform" to the java_library template. An android_library can depend on a java_library only if the java_libary has "android == true". A java_library can depend on an android_library only if the java_libary has "has_android_platform == true". This merges several of the paths for compiling java between android and non-android implementations into a single one that just takes a flag controlling it's behavior (enabling/disabling dex, for example). Adds a very simple java_binary target. This can be run to ensure it works, output is printed, and exit code is propagated. TBR=brettw BUG=359249,383646,417843 Review URL: https://codereview.chromium.org/687633003 Cr-Commit-Position: refs/heads/master@{#304555}
Diffstat (limited to 'BUILD.gn')
-rw-r--r--BUILD.gn1
1 files changed, 1 insertions, 0 deletions
diff --git a/BUILD.gn b/BUILD.gn
index 77b950f..5206979 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -180,6 +180,7 @@ group("root") {
if (is_android) {
deps += [
"//base/android/linker:chromium_android_linker",
+ "//build/android/gyp/test:hello_world",
"//build/android/rezip",
"//third_party/openmax_dl/dl",
"//content/shell/android:content_shell_apk",