Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(419)

Issue 12599005: Begin de-antification (Closed)

Created:
7 years, 9 months ago by cjhopman
Modified:
7 years, 9 months ago
Reviewers:
shashi, Yaron
CC:
chromium-reviews, klundberg+watch_chromium.org, frankf+watch_chromium.org, bulach+watch_chromium.org, yfriedman+watch_chromium.org, ilevy+watch_chromium.org
Base URL:
https://chromium.googlesource.com/chromium/src.git@master
Visibility:
Public.

Description

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 Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=187483

Patch Set 1 : Move Android's build.xml into our tree #

Total comments: 2

Patch Set 2 : Replace targets in apk-build.xml with overrides from sdk-targets.xml #

Patch Set 3 : Move property overrides from chromium-apk.xml to apk-build.xml #

Patch Set 4 : sdk-targets.xml is still used by native_test_apk.xml #

Patch Set 5 : Add License header #

Unified diffs Side-by-side diffs Delta from patch set Stats (+1696 lines, -66 lines) Patch
A build/android/ant/apk-build.xml View 1 2 3 4 1 chunk +1692 lines, -0 lines 0 comments Download
M build/android/ant/chromium-apk.xml View 1 2 1 chunk +3 lines, -65 lines 0 comments Download
M build/java_apk.gypi View 1 2 1 chunk +1 line, -1 line 0 comments Download

Messages

Total messages: 6 (0 generated)
cjhopman
7 years, 9 months ago (2013-03-11 21:41:21 UTC) #1
shashi
lgtm lgtm
7 years, 9 months ago (2013-03-11 21:48:14 UTC) #2
Yaron
lgtm https://codereview.chromium.org/12599005/diff/4001/build/android/ant/apk-build.xml File build/android/ant/apk-build.xml (right): https://codereview.chromium.org/12599005/diff/4001/build/android/ant/apk-build.xml#newcode701 build/android/ant/apk-build.xml:701: <target name="-pre-compile"/> We don't delete all class files ...
7 years, 9 months ago (2013-03-11 23:32:19 UTC) #3
Yaron
https://codereview.chromium.org/12599005/diff/4001/build/android/ant/apk-build.xml File build/android/ant/apk-build.xml (right): https://codereview.chromium.org/12599005/diff/4001/build/android/ant/apk-build.xml#newcode701 build/android/ant/apk-build.xml:701: <target name="-pre-compile"/> On 2013/03/11 23:32:19, Yaron wrote: > We ...
7 years, 9 months ago (2013-03-11 23:33:17 UTC) #4
commit-bot: I haz the power
CQ is trying da patch. Follow status at https://chromium-status.appspot.com/cq/cjhopman@chromium.org/12599005/27001
7 years, 9 months ago (2013-03-12 00:00:18 UTC) #5
commit-bot: I haz the power
7 years, 9 months ago (2013-03-12 03:58:09 UTC) #6
Message was sent while issue was closed.
Change committed as 187483

Powered by Google App Engine
This is Rietveld 408576698