Merge lp://staging/~berolinux/linaro-android-build-tools/Default-to-no-WITH_HOST_DALVIK into lp://staging/linaro-android-build-tools

Proposed by Bernhard Rosenkraenzer
Status: Merged
Approved by: Paul Sokolovsky
Approved revision: 309
Merged at revision: 402
Proposed branch: lp://staging/~berolinux/linaro-android-build-tools/Default-to-no-WITH_HOST_DALVIK
Merge into: lp://staging/linaro-android-build-tools
Diff against target: 28 lines (+7/-0) (has conflicts)
1 file modified
build-scripts/build-android (+7/-0)
Text conflict in build-scripts/build-android
To merge this branch: bzr merge lp://staging/~berolinux/linaro-android-build-tools/Default-to-no-WITH_HOST_DALVIK
Reviewer Review Type Date Requested Status
Paul Sokolovsky Approve
Review via email: mp+82331@code.staging.launchpad.net

Description of the change

Allow setting WITH_HOST_DALVIK, default to false

Without this, WITH_HOST_DALVIK defaults to true, resulting in a host
version of Dalvik being built and then thrown away - causing extra
build time with no gain.

To post a comment you must log in.
Revision history for this message
Paul Sokolovsky (pfalcon) wrote :

This kinda got lost, and that sucks. The patch does have merging issues though.

review: Needs Fixing
Revision history for this message
Paul Sokolovsky (pfalcon) wrote :

Let me fix this though.

Revision history for this message
Paul Sokolovsky (pfalcon) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches