diff options
| author | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-12 03:58:06 +0000 |
|---|---|---|
| committer | cjhopman@chromium.org <cjhopman@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-03-12 03:58:06 +0000 |
| commit | bbe44f445f89bc46d1da4c2c2951cadc9b1daa4d (patch) | |
| tree | 4a563f973bc1738f620ffdcea12cde0f79f9ba9b /build/java_apk.gypi | |
| parent | 9b6d3125e543e5aca48a83a0cafd251be1398715 (diff) | |
| download | chromium_src-bbe44f445f89bc46d1da4c2c2951cadc9b1daa4d.zip chromium_src-bbe44f445f89bc46d1da4c2c2951cadc9b1daa4d.tar.gz chromium_src-bbe44f445f89bc46d1da4c2c2951cadc9b1daa4d.tar.bz2 | |
This is the first change in simplifying our ant build scripts.
First check in a copy of
third_party/android_tools/sdk/tools/ant/build.xml as
build/android/ant/apk-build.xml
Previously we were overriding targets from this build.xml
in build/android/ant/sdk-targets.xml. Instead of doing this
override, just replace the actual targets in apk-build.xml.
Do the same for properties that we were overriding in
build/android/ant/chromium-apk.xml.
Both of these have no logical change on these build scripts.
Ant's targets and properties are immutable and so Ant was
doing this exact thing already.
BUG=158821
Review URL: https://chromiumcodereview.appspot.com/12599005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@187483 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build/java_apk.gypi')
| -rw-r--r-- | build/java_apk.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/java_apk.gypi b/build/java_apk.gypi index c960122..042bfd7 100644 --- a/build/java_apk.gypi +++ b/build/java_apk.gypi @@ -141,7 +141,7 @@ '<(java_in_dir)/AndroidManifest.xml', '<(DEPTH)/build/android/ant/chromium-apk.xml', '<(DEPTH)/build/android/ant/common.xml', - '<(DEPTH)/build/android/ant/sdk-targets.xml', + '<(DEPTH)/build/android/ant/apk-build.xml', # If there is a separate find for additional_src_dirs, it will find the # wrong .java files when additional_src_dirs is empty. '>!@(find >(java_in_dir) >(additional_src_dirs) -name "*.java")', |