diff options
| author | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 23:23:51 +0000 |
|---|---|---|
| committer | yfriedman@chromium.org <yfriedman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-06 23:23:51 +0000 |
| commit | 300800480f12dc97c8e9d90dd101fabd29203115 (patch) | |
| tree | 21cfcb39e090675b55c3c512da10ee721bd11817 /chrome/android | |
| parent | 4f3db5b5a785511a73282af279d3f30c975944a9 (diff) | |
| download | chromium_src-300800480f12dc97c8e9d90dd101fabd29203115.zip chromium_src-300800480f12dc97c8e9d90dd101fabd29203115.tar.gz chromium_src-300800480f12dc97c8e9d90dd101fabd29203115.tar.bz2 | |
[Android] Add chrome_java target for building Java code in the chromium layer.
Also includes a refactoring of the Ant xml scripts to use a common template (contributed by shashishekhar@chromium.org). As part of this, I also continued Torne's effort of removing our reliance on environment variables. Unfortunately this currently means that you have to specify 5 gyp flags:
ANDROID_SDK, ANDROID_SDK_ROOT, ANDROID_SDK_TOOLS, ANDROID_SDK_VERSION, ANDROID_TOOLCHAIN.
This'll get better as we make further use of the checked in sdk both upstream and downstream. The problem stems from the android tree and released sdk having different configurations.
Review URL: https://chromiumcodereview.appspot.com/10830012
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@150172 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/android')
| -rw-r--r-- | chrome/android/java/chrome.xml | 19 | ||||
| -rw-r--r-- | chrome/android/java/src/org/chromium/chrome/browser/IntentHelper.java | 2 |
2 files changed, 20 insertions, 1 deletions
diff --git a/chrome/android/java/chrome.xml b/chrome/android/java/chrome.xml new file mode 100644 index 0000000..410af23 --- /dev/null +++ b/chrome/android/java/chrome.xml @@ -0,0 +1,19 @@ +<!-- + Copyright (c) 2012 The Chromium Authors. All rights reserved. + Use of this source code is governed by a BSD-style license that can be + found in the LICENSE file. +--> +<project name="Chrome" default="dist" basedir="."> + <description> + Building chrome.jar from java source code. + </description> + <import file="../../../build/android/ant/chromium-jars.xml" /> + <path id="javac.custom.classpath"> + <pathelement location="${ANDROID_SDK}/android.jar" /> + <pathelement location="${lib.dir}/chromium_content.jar" /> + <pathelement location="${lib.dir}/chromium_base.jar" /> + <pathelement location="${lib.dir}/chromium_net.jar" /> + </path> + <!-- Override javac path to include jars in lib.java directory --> + <property-value name="javac.srcdir" value="${src}" /> +</project> diff --git a/chrome/android/java/src/org/chromium/chrome/browser/IntentHelper.java b/chrome/android/java/src/org/chromium/chrome/browser/IntentHelper.java index 487d71d..ffc0695 100644 --- a/chrome/android/java/src/org/chromium/chrome/browser/IntentHelper.java +++ b/chrome/android/java/src/org/chromium/chrome/browser/IntentHelper.java @@ -61,7 +61,7 @@ public abstract class IntentHelper { send.putExtra(Intent.EXTRA_SUBJECT, subject); send.putExtra(Intent.EXTRA_TEXT, Html.fromHtml(body)); try { - Intent chooser = Intent.createChooser(send, chooserTitle)); + Intent chooser = Intent.createChooser(send, chooserTitle); // we start this activity outside the main activity. chooser.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); context.startActivity(chooser); |