Andrew Hsieh
fc76f0eb17
am 2ea957a3
: Merge "Revise checks for MacOSX to build emulator"
...
* commit '2ea957a373018ba6773c621065164256f0d84078':
Revise checks for MacOSX to build emulator
2012-11-09 10:28:36 -08:00
Jean-Baptiste Queru
dde4fc127c
Version number for AOSP master - do not merge
...
Change-Id: I67dab0de027ab458de326375a3f8077594f702cb
2012-11-09 07:46:14 -08:00
Andrew Hsieh
1dcca61869
Revise checks for MacOSX to build emulator
...
1. Check $(HOST_CC) instead of gcc for llvm-gcc.
2. Remvoe Mac SDK 10.4 check because emulator uses
the same SDK version as the rest of framework
Change-Id: I4071fd45dc09a18c5341ad79e6a85e61df060fb4
2012-11-09 02:06:33 -08:00
Ying Wang
989d211b68
am f99f5e89
: am d0b1977f
: am 0138951e
: Collapse multiple --extra-packages into one.
...
* commit 'f99f5e89a15cada28dc692a5a7ce3413bdd965b4':
Collapse multiple --extra-packages into one.
2012-11-08 15:43:13 -08:00
Elliott Hughes
d125adca42
am ef9744f7
: Merge "Remove manual WITH_JIT setting from build/."
...
* commit 'ef9744f7ee4fd2315f41c58ba48906d9d79363dd':
Remove manual WITH_JIT setting from build/.
2012-11-07 18:31:35 -08:00
Ying Wang
f99f5e89a1
am d0b1977f
: am 0138951e
: Collapse multiple --extra-packages into one.
...
* commit 'd0b1977f7d12736a99a99893061948c622b5d8f3':
Collapse multiple --extra-packages into one.
2012-11-07 16:33:08 -08:00
Ying Wang
0138951eaf
Collapse multiple --extra-packages into one.
...
Change-Id: Icbdd56fa104c03e0a6cc58e441e60286a7f25bb2
2012-11-07 14:07:34 -08:00
Elliott Hughes
07a6db8733
Remove manual WITH_JIT setting from build/.
...
This is now done automatically by dalvik/, since
patch 272a54f8553e13b87bf819542ddc6701fc1232cc.
Change-Id: I57709538f20188417c014630442e897401d7ace0
2012-11-06 16:41:52 -08:00
Nick Sanders
278dbf3c6b
am 9af26ddd
: Merge "Disable factory build under PDK" into jb-mr1-aah-dev
...
* commit '9af26dddb39e5d87c8a455eb462eb3039e45ad69':
Disable factory build under PDK
2012-11-02 18:48:59 -07:00
Nick Sanders
a1712eea02
Disable factory build under PDK
...
Phantasm PDK support doesn't work with the factory build.
It's not needed for eng support so we'll disable it.
Change-Id: I9b65cdbb20bbcff601600d6b0cac7cc98f6f614c
Signed-off-by: Nick Sanders <nsanders@google.com>
2012-11-02 12:55:56 -07:00
Joe Onorato
c9b12129b4
am 9a6a326c
: Fix broken dependencies with the layers.txt files.
...
* commit '9a6a326ccd975af6aa27f5d4043dfd04d85f9c16':
Fix broken dependencies with the layers.txt files.
2012-10-26 18:16:39 -07:00
Joe Onorato
9a6a326ccd
Fix broken dependencies with the layers.txt files.
...
When a device java module was using the layers.txt files, and that device java module depenended on
a host java module, when building the host java module, the layer checker tried to run and would
fail, complaining about the host module.
The problem was that since the value wasn't set for the host module, it would be inherited from its
dependent module (a make "feature") and would cause the layer checker to run. So this change makes
it explicitly set PRIVATE_JAVA_LAYERS_FILE for host java modules too.
Change-Id: Ifbc085295d0995a2da5d6d63d8cb379ef2631cc4
2012-10-26 16:38:14 -07:00
Ying Wang
84da5c55dd
Filter out the overridden packages before doing required module expansion.
...
Bug: 6900954
Change-Id: Ib0f57dc4bfc341ec7166429a5bb71bfc5e28d271
2012-10-26 14:17:06 -07:00
Ying Wang
4182482522
am 0d211eb9
: Merge "Split to multiple bash commands."
...
* commit '0d211eb9f4a2bb508f7c0cc649faf99b4815bfc7':
Split to multiple bash commands.
2012-10-26 10:54:52 -07:00
Ying Wang
d9a88d585f
Split to multiple bash commands.
...
This can fix the error "/bin/bash: Argument list too long", if we get a
really long apk list.
Bug tracker Link: http://code.google.com/p/android/issues/detail?id=38937
Change-Id: I72258125c4297dfd9f8f502a96dbfa5a08f3cc50
2012-10-26 09:40:07 -07:00
Mike Lockwood
86e2fd9215
am daf5e22d
: Add new embedded target for a super minimal android build
...
* commit 'daf5e22dbac03e174e22c8209ed97c44c3a2a2c9':
Add new embedded target for a super minimal android build
2012-10-26 08:45:36 -07:00
Mike Lockwood
daf5e22dba
Add new embedded target for a super minimal android build
...
Remove obsolete BUILD_TINY_ANDROID
Change-Id: Ic0f3a5b3250ea80529f5099653068f118a13b12e
2012-10-25 15:28:37 -07:00
Andrew Hsieh
267b07b2aa
am 7176e801
: Merge "Add TARGET_GCC_VERSION"
...
* commit '7176e8013bb2e563c3e3e56af4c04c50de3a7f37':
Add TARGET_GCC_VERSION
2012-10-23 17:15:01 -07:00
Andrew Hsieh
06b63baedc
Add TARGET_GCC_VERSION
...
Default to 4.6, but can overwritten to something else in
prebuilts/gcc/$os/$arch/$arch-linux-android*-$ver
Change-Id: I16f99d642b8ff8e831d392261a0c536041107051
2012-10-23 12:06:01 +08:00
Nick Kralevich
7c56556d18
am d883749e
: Merge "x86: add --warn-shared-textrel"
...
* commit 'd883749e600a34b5eb4db542d24946b25aa5c9fb':
x86: add --warn-shared-textrel
2012-10-22 11:04:24 -07:00
Joe Onorato
0cf8969beb
am 2e5d317c
: make packages respect LOCAL_ADDITIONAL_DEPENDENCIES
...
* commit '2e5d317c3ba36a7184b95cc77c87e116210ddc07':
make packages respect LOCAL_ADDITIONAL_DEPENDENCIES
2012-10-20 19:00:08 -07:00
Joe Onorato
50462d67e9
am 8858d2a7
: Add a tool to let you enforce layering between packages in a java module.
...
* commit '8858d2a731f432786b7548b5f63ac93be81eb986':
Add a tool to let you enforce layering between packages in a java module.
2012-10-20 18:15:18 -07:00
Joe Onorato
2e5d317c3b
make packages respect LOCAL_ADDITIONAL_DEPENDENCIES
...
Change-Id: I2595040f77f8ebb4d7c89140394a6060f167aee5
2012-10-20 18:13:57 -07:00
Joe Onorato
8858d2a731
Add a tool to let you enforce layering between packages in a java module.
...
And build system support for it too.
Change-Id: I4dd5ed0b9edab6e8884b0d00cfeeae5fa38d967a
2012-10-20 17:25:55 -07:00
Nick Kralevich
4f2f16da14
x86: add --warn-shared-textrel
...
Emit a warning when the static linker detects a shared library
has text relocations. Text relocations make it harder to
share pages across processes, and make it harder to use
certain memory protection features in, for example, SELinux.
This warning will turn into an error in a future change
(via --fatal-warnings)
Change-Id: I2d169c7ce3600d02e25591f3ec15aba363730298
References: http://www.akkadia.org/drepper/textrelocs.html
2012-10-19 13:36:49 -07:00
Kenny Root
37868329b2
am 2e0d1af7
: Merge changes I58d43128,Ie34c958f
...
* commit '2e0d1af767f64996f47de2a84b685ddcfa02e686':
Remove HAVE_SELINUX guards, part 2
Remove HAVE_SELINUX guard
2012-10-16 17:34:42 -07:00
Kenny Root
92ca0197ed
Remove HAVE_SELINUX guards, part 2
...
Change-Id: I58d43128447ef3be0f70ff2479af2e61fe4c5849
2012-10-16 13:43:08 -07:00
Guang Zhu
ea718cdb78
am 0f23979f
: am 18daa175
: Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
...
* commit '0f23979f29db6b46978b78da4db90df862ffb925':
DO NOT MERGE: better late than never: fix build id for JB MR1
2012-10-12 17:08:39 -07:00
Guang Zhu
0f23979f29
am 18daa175
: Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
...
* commit '18daa1750ba31b510d07d0f65e8e8007ed90b902':
DO NOT MERGE: better late than never: fix build id for JB MR1
2012-10-12 17:06:21 -07:00
Guang Zhu
18daa1750b
Merge "DO NOT MERGE: better late than never: fix build id for JB MR1" into jb-mr1-dev
2012-10-12 17:04:58 -07:00
Ying Wang
57dfd515c3
am 6a44471c
: am abc9d6f2
: Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
...
* commit '6a44471c3b295190125a8ba33a02ec8db3a6aba9':
Delete the unused LOCAL_POST_PROCESS_COMMAND.
2012-10-12 11:03:07 -07:00
Joe Onorato
bd31f17333
am f9f6084a
: Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
...
* commit 'f9f6084aab34daf4ea7ddb697d84a8b147523763':
Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
2012-10-12 11:02:53 -07:00
Stephen Hines
d263757339
resolved conflicts for merge of ed38fe6f
to jb-mr1-dev-plus-aosp
...
Change-Id: If699b3ccf1f3befd4df881e3eef6b90dd7c505bf
2012-10-11 22:08:57 -07:00
Ying Wang
6a44471c3b
am abc9d6f2
: Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
...
* commit 'abc9d6f2beca88dbd0ec021d343c68f4b617216d':
Delete the unused LOCAL_POST_PROCESS_COMMAND.
2012-10-11 18:03:22 -07:00
Ying Wang
abc9d6f2be
Merge "Delete the unused LOCAL_POST_PROCESS_COMMAND." into jb-mr1-dev
2012-10-11 18:01:17 -07:00
Joe Onorato
f9f6084aab
Respect LOCAL_ADDITIONAL_DEPENDENCIES for host java libraries.
...
(makes generating code easier)
Change-Id: I1e2e882f7805dbfe4b726955eddc5ff8bc3e0005
2012-10-11 17:32:44 -07:00
Ying Wang
c58b194e78
Delete the unused LOCAL_POST_PROCESS_COMMAND.
...
Change-Id: I77785dff6c7b2236880232522d6ed5bc01d5f0ce
2012-10-11 17:26:07 -07:00
Stephen Hines
0a0cfe95ac
Merge "Add support for building Filterscript files." into jb-mr1-dev
2012-10-11 17:25:21 -07:00
Ying Wang
97b56bb181
am 95d861ed
: am 72405497
: Convert to relative path for CleanSpec.mk
...
* commit '95d861ed9beff9e55c3283c1fa47c84ac61fa546':
Convert to relative path for CleanSpec.mk
2012-10-11 17:12:05 -07:00
Stephen Hines
0ab6e3e6e6
Add support for building Filterscript files.
...
This change piggybacks Filterscript rules onto the existing Renderscript
rules. There is no real difference other than the file extension (which
llvm-rs-cc uses to apply a more stringent set of warnings/errors).
Bug: 7166741
Change-Id: I27175ff1c16c27129cafa92b4e8caabf2e5f4150
2012-10-11 15:29:10 -07:00
Ying Wang
7240549748
Convert to relative path for CleanSpec.mk
...
When using mm, which passes in absolute path, while in full build relative
paths are used to encode clean steps.
Change-Id: I3e39ce3125194589f9a464f27eef4a9c96fa06c1
2012-10-11 12:45:30 -07:00
Ying Wang
57ddcb1bbc
Support to build executables against the NDK
...
Use "LOCAL_SDK_VERSION := <number>" to build against the NDK when you
include $(BUILD_EXECUTABLE).
Cherry-picked from master.
Bug: 7170098
Change-Id: Ib35a294bd6aa4e969d46ecd8ebab8ca5d843e24b
2012-10-10 10:24:26 -07:00
Guang Zhu
9d37c68ead
DO NOT MERGE: better late than never: fix build id for JB MR1
...
Change-Id: Iaad3002693af683f719832d3c082e7e4dcbf8d29
2012-10-09 18:45:31 -07:00
Ying Wang
15f116b2bb
am 91fd1231
: Support to build executables against the NDK
...
* commit '91fd1231c3254bc9d0642e5a646b5657bdaedffa':
Support to build executables against the NDK
2012-10-08 14:21:37 -07:00
Ying Wang
91fd1231c3
Support to build executables against the NDK
...
Use "LOCAL_SDK_VERSION := <number>" to build against the NDK when you
include $(BUILD_EXECUTABLE).
Bug: 7170098
Change-Id: I4cebeae3355e79a4d2f2f5549ef0613ced77e3f0
2012-10-08 14:12:41 -07:00
Keun young Park
9dd65d3381
am 0b82ffeb
: am f6e6bf7e
: add mip32 stuffs to clang\'s unknown flag list
...
* commit '0b82ffeb964bb4da7c7928d5b61c72579b6588b5':
add mip32 stuffs to clang's unknown flag list
2012-10-05 14:29:59 -07:00
Jean-Baptiste Queru
4bf886adbe
am b8c037ba
: Merge "Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building"
...
* commit 'b8c037ba5f38fd734d89164c9583538104be1ecc':
Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building
2012-10-05 13:34:34 -07:00
Jean-Baptiste Queru
b8c037ba5f
Merge "Add BOARD_CUSTOM_BOOTIMG_MK for custom bootimg building"
2012-10-05 13:32:11 -07:00
Keun young Park
f6e6bf7edf
add mip32 stuffs to clang's unknown flag list
...
- mini_mips changed to mips32-fp to accomodate all mips variants
Bug: 7294949
Change-Id: Iae759e10e3f5d255e27b688042477263438bb7a7
2012-10-05 13:26:19 -07:00
Nick Kralevich
23025ecdc0
am f3b02739
: am 7653519f
: Merge "[MIPS] Makes a build system use PIE flag"
...
* commit 'f3b02739a7abba7c8f4884d49553f8a9f3fcfaf8':
[MIPS] Makes a build system use PIE flag
2012-10-04 17:14:17 -07:00