Ying Wang
7763d159cb
am 37ffc81d: am 79d8f41e: Merge "Fix building on modern versions of Xcode and OS X."
...
* commit '37ffc81d4d85b6ce5827c8ff46f5ba91be3bd9a0':
Fix building on modern versions of Xcode and OS X.
2014-11-20 18:11:30 +00:00
Ying Wang
f679a480c1
am 276a543e: am ea6113f0: Merge "arm: Support qemu-android on generic arm targets"
...
* commit '276a543e71e139dfc086c955df9686e53ea15c5a':
arm: Support qemu-android on generic arm targets
2014-11-20 18:11:29 +00:00
Ying Wang
37ffc81d4d
am 79d8f41e: Merge "Fix building on modern versions of Xcode and OS X."
...
* commit '79d8f41e1d5490784288e2a0737be334ef50e7f6':
Fix building on modern versions of Xcode and OS X.
2014-11-20 17:27:36 +00:00
Ying Wang
276a543e71
am ea6113f0: Merge "arm: Support qemu-android on generic arm targets"
...
* commit 'ea6113f0f1a7069f1dd16bb2c0c7c29700bfda96':
arm: Support qemu-android on generic arm targets
2014-11-20 17:27:35 +00:00
Ying Wang
79d8f41e1d
Merge "Fix building on modern versions of Xcode and OS X."
2014-11-20 17:18:37 +00:00
Ying Wang
ea6113f0f1
Merge "arm: Support qemu-android on generic arm targets"
2014-11-20 17:17:55 +00:00
Yabin Cui
2ffe892fab
am a4fa3d60: am aecf9022: Merge "kill HAVE_PREAD"
...
* commit 'a4fa3d601f24621481daf199bd895cbe8987f272':
kill HAVE_PREAD
2014-11-20 05:26:14 +00:00
Yabin Cui
a4fa3d601f
am aecf9022: Merge "kill HAVE_PREAD"
...
* commit 'aecf90220c094274d3155b02490f7a00ead72f4e':
kill HAVE_PREAD
2014-11-20 05:21:52 +00:00
Yabin Cui
aecf90220c
Merge "kill HAVE_PREAD"
2014-11-20 05:15:15 +00:00
Yabin Cui
1acc2a1877
kill HAVE_PREAD
...
Bug: 18397613
Change-Id: I0061f8080709449f13dc76ce61097a2671c799ff
2014-11-19 20:48:36 -08:00
Christoffer Dall
a60edd110f
arm: Support qemu-android on generic arm targets
...
When building a generic arm 32-bit target, we also want to include
support for the ranchu board model for the updated Android emulator
based on recent upstream QEMU.
Since the emulator.mk file is included by both the generic and
generic_arm64 targets and already defines a PRODUCT_COPY_FILES and
PRODUCT_PACKAGES, move duplicate entries from
target/board/generic*/device.mk to target/product/emulator.mk.
Signed-off-by: Christoffer Dall <christoffer.dall@linaro.org>
Change-Id: I7922ec0c4097776a185dbb245301d760ff332386
2014-11-19 12:17:59 -08:00
Ying Wang
1daf164ab1
am f1021dcb: am 6ead56be: am f3b86357: Support journal size board config variables.
...
* commit 'f1021dcb61e1c2a3604093c4aac4c1d2984cb6ac':
Support journal size board config variables.
2014-11-19 19:32:34 +00:00
Ying Wang
f1021dcb61
am 6ead56be: am f3b86357: Support journal size board config variables.
...
* commit '6ead56bed56e3927575726bdebf8511e44f6fb47':
Support journal size board config variables.
2014-11-19 19:28:23 +00:00
Ying Wang
6ead56bed5
am f3b86357: Support journal size board config variables.
...
* commit 'f3b86357e20a31ef0febe254f1f08706006f57fa':
Support journal size board config variables.
2014-11-19 19:23:41 +00:00
Ying Wang
84699355c8
am e55efcdd: am 471e60d6: Merge "Use ALL_MODULES..INSTALLED in modules-for-tag-list"
...
* commit 'e55efcdde59f9f8cfc7fb0039b427cd038559c53':
Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
2014-11-19 19:04:08 +00:00
Ying Wang
e55efcdde5
am 471e60d6: Merge "Use ALL_MODULES..INSTALLED in modules-for-tag-list"
...
* commit '471e60d6a89ada5a9ed322d200fbe14eb07764ff':
Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list
2014-11-19 19:00:32 +00:00
Ying Wang
471e60d6a8
Merge "Use ALL_MODULES.$(m).INSTALLED in modules-for-tag-list"
2014-11-19 18:53:19 +00:00
Yabin Cui
c70fd904f9
am a9653012: am 9f7c5fef: Merge "kill HAVE_MADVISE"
...
* commit 'a9653012fba44d1634c2cf85bfd3ef8559d6a6da':
kill HAVE_MADVISE
2014-11-19 04:36:22 +00:00
Yabin Cui
a9653012fb
am 9f7c5fef: Merge "kill HAVE_MADVISE"
...
* commit '9f7c5fef0e7c00d00c67242c2a360911b53374e0':
kill HAVE_MADVISE
2014-11-19 04:31:49 +00:00
Yabin Cui
9f7c5fef0e
Merge "kill HAVE_MADVISE"
2014-11-19 04:26:20 +00:00
Ying Wang
f3b86357e2
Support journal size board config variables.
...
A device can set up BOARD_SYSTEMIMAGE_JOURNAL_SIZE (number of journal blocks)
in its BoardConfig.mk.
To disable journaling, set "BOARD_SYSTEMIMAGE_JOURNAL_SIZE := 0".
BOARD_VENDORIMAGE_JOURNAL_SIZE and BOARD_OEMIMAGE_JOURNAL_SIZE work in
similar way.
Bug: 18430740
Change-Id: I0594814fe19ffc54dff41ec2464e2e3a802b9419
2014-11-18 18:19:43 -08:00
Yabin Cui
16ccc03746
kill HAVE_MADVISE
...
Bug: 18397020
Change-Id: I6b9c7d30432858131379759e738d3e04bc8d5fb5
2014-11-18 18:14:37 -08:00
Ying Wang
f9c93d7cbd
am 0217e3b2: resolved conflicts for merge of a4f415d6
to lmp-mr1-dev-plus-aosp
...
* commit '0217e3b20b6a331b0820014dc136d782070bca45':
Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIG
2014-11-19 00:33:48 +00:00
Andreas Gampe
1dbaf506f4
am 9a186a1c: am 56d5ed19: am bce1889b: am f318cc43: (-s ours) Build: Support for compiled-classes file
...
* commit '9a186a1c6dd501b1808fd3ab79317de5dec0669f':
Build: Support for compiled-classes file
2014-11-19 00:28:42 +00:00
Ying Wang
0217e3b20b
resolved conflicts for merge of a4f415d6
to lmp-mr1-dev-plus-aosp
...
Change-Id: Ibb54bce20342bd386ec85388d48c1c08e8b80197
2014-11-18 16:28:04 -08:00
Ying Wang
a4f415d65e
am ea4dfb75: Merge "Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIG" into lmp-mr1-dev
...
* commit 'ea4dfb7551e680f7496e1d35c05bdad10ca58b4a':
Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIG
2014-11-19 00:23:00 +00:00
Andreas Gampe
9a186a1c6d
am 56d5ed19: am bce1889b: am f318cc43: (-s ours) Build: Support for compiled-classes file
...
* commit '56d5ed1978309ce56256dbca0093054f17709252':
Build: Support for compiled-classes file
2014-11-19 00:20:38 +00:00
Ying Wang
ea4dfb7551
Merge "Support prebuilt apk source selection based on PRODUCT_AAPT_PREF_CONFIG" into lmp-mr1-dev
2014-11-19 00:18:54 +00:00
Andreas Gampe
534aa692f7
am 41c939a1: am 44259e4c: Merge "Build: Support for compiled-classes file"
...
* commit '41c939a18698751d963bb57f9a0bc86ce4d3ec2e':
Build: Support for compiled-classes file
2014-11-19 00:14:46 +00:00
Andreas Gampe
56d5ed1978
am bce1889b: am f318cc43: (-s ours) Build: Support for compiled-classes file
...
* commit 'bce1889b8922fbbc2695756d3723029d4fd4cf66':
Build: Support for compiled-classes file
2014-11-19 00:14:46 +00:00
Andreas Gampe
4d64b501b8
am c9669d9e: am 8bde9873: Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files"
...
* commit 'c9669d9e095c85bdcca9805d4c7589b2eb2b089c':
core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
2014-11-19 00:14:42 +00:00
Andreas Gampe
37e8c11129
am 1a524175: am b457d0ea: (-s ours) am 4fec0bb2: Build: Support for compiled-classes file
...
* commit '1a52417538e5786792b4abe3a66bbb8f830feeec':
Build: Support for compiled-classes file
2014-11-19 00:14:41 +00:00
Andreas Gampe
bce1889b89
am f318cc43: (-s ours) Build: Support for compiled-classes file
...
* commit 'f318cc436a0d7db372e03424a344c8dc9839d183':
Build: Support for compiled-classes file
2014-11-19 00:10:28 +00:00
Andreas Gampe
41c939a186
am 44259e4c: Merge "Build: Support for compiled-classes file"
...
* commit '44259e4cc64bd0382fb27f6d7540c7494db198cc':
Build: Support for compiled-classes file
2014-11-18 23:39:07 +00:00
Andreas Gampe
44259e4cc6
Merge "Build: Support for compiled-classes file"
2014-11-18 23:31:50 +00:00
Andreas Gampe
c9669d9e09
am 8bde9873: Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files"
...
* commit '8bde98733bb974253203ecbd5e62e32ef62e66ba':
core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
2014-11-18 23:13:56 +00:00
Andreas Gampe
96a522037f
Build: Support for compiled-classes file
...
Allow a compiled-classes file for pre-opting.
Bug: 18410571
(cherry picked from commit 4fec0bb265
)
Change-Id: I8c69dd0fb8c04aaae0c4f062049cc9cce7d755c7
2014-11-18 15:09:51 -08:00
Andreas Gampe
8bde98733b
Merge "core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files"
2014-11-18 23:08:17 +00:00
Andreas Gampe
1a52417538
am b457d0ea: (-s ours) am 4fec0bb2: Build: Support for compiled-classes file
...
* commit 'b457d0ea33b1e6d93bc4a09cda43d6e74b3d1687':
Build: Support for compiled-classes file
2014-11-18 23:07:08 +00:00
Elliott Hughes
ed948d0259
am e5029aa2: am 39961b92: Merge "Remove another unused definition."
...
* commit 'e5029aa295f9c56109c0930efdea93915af55bd9':
Remove another unused definition.
2014-11-18 23:06:15 +00:00
Andreas Gampe
f318cc436a
Build: Support for compiled-classes file
...
Allow a compiled-classes file for pre-opting.
Bug: 18410571
(cherry picked from commit 4fec0bb265
)
Change-Id: Id54a97af606727e354b6914e46e35fdb8952aa04
2014-11-18 15:01:21 -08:00
Andreas Gampe
b457d0ea33
am 4fec0bb2: Build: Support for compiled-classes file
...
* commit '4fec0bb265ac8cdbe883b8868abfcb56713db170':
Build: Support for compiled-classes file
2014-11-18 23:00:10 +00:00
Igor Murashkin
97f28c63d4
core: Use WITH_DEXPREOPT_PIC=true to have dex2oat build pic oat files
...
When WITH_DEXPREOPT=true is set, if we also set WITH_DEXPREOPT_PIC=true
then the build will generate position-independent OAT images.
This means that all the system applications no longer need to be
relocated into /data/dalvik-cache and this can achieve saving disk space
at the cost of slightly slower running code.
Bug: 18035729
(cherry picked from commit da9f1a7e82
)
Change-Id: Ifd517c842f48bf31568bf5ff56667298d422c2c0
2014-11-18 14:58:48 -08:00
Andreas Gampe
4fec0bb265
Build: Support for compiled-classes file
...
Allow a compiled-classes file for pre-opting.
Bug: 18410571
Change-Id: I8c69dd0fb8c04aaae0c4f062049cc9cce7d755c7
2014-11-18 14:41:26 -08:00
Elliott Hughes
e5029aa295
am 39961b92: Merge "Remove another unused definition."
...
* commit '39961b926e637fd29cc6a32d956553c59c65e37c':
Remove another unused definition.
2014-11-18 22:22:32 +00:00
Elliott Hughes
39961b926e
Merge "Remove another unused definition."
2014-11-18 22:15:26 +00:00
Elliott Hughes
354d9530eb
am 66656006: am 3c0682c6: Merge "Kill unused ARCH_* defines."
...
* commit '6665600642c6aa8ecde845685852267bed786fe6':
Kill unused ARCH_* defines.
2014-11-18 22:10:38 +00:00
Elliott Hughes
bce40c38ce
Remove another unused definition.
...
We have a lot of definitions around the tree, of which this is but one,
but we have no users.
Change-Id: Ic411505a0370be2b56150275fa9b8f5329241ce8
2014-11-18 14:10:27 -08:00
Elliott Hughes
6665600642
am 3c0682c6: Merge "Kill unused ARCH_* defines."
...
* commit '3c0682c6b52f30301a909a6f8376384a8547d376':
Kill unused ARCH_* defines.
2014-11-18 22:02:28 +00:00
Elliott Hughes
3c0682c6b5
Merge "Kill unused ARCH_* defines."
2014-11-18 21:55:13 +00:00