Commit Graph

2718 Commits

Author SHA1 Message Date
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
Nick Kralevich
f3b02739a7 am 7653519f: Merge "[MIPS] Makes a build system use PIE flag"
* commit '7653519f4e9efaaef906d2e5d3b109909b6d45c7':
  [MIPS] Makes a build system use PIE flag
2012-10-04 17:12:46 -07:00
Nick Kralevich
7653519f4e Merge "[MIPS] Makes a build system use PIE flag" 2012-10-04 16:07:47 -07:00
Ying Wang
195b0653a2 am 25f77e39: am af4299c5: Merge "Store vendor module owner info on the build server." into jb-mr1-dev
* commit '25f77e39bc49c3598aa2bc8e27719927a522ccbd':
  Store vendor module owner info on the build server.
2012-10-04 10:05:00 -07:00
Ying Wang
fb03fb3ec0 Store vendor module owner info on the build server.
Bug: 7048854
Change-Id: I5f0653c71a77774978655f8b5570e170b4a9c4ec
2012-10-03 17:52:51 -07:00
Elliott Hughes
2d17b1aba6 resolved conflicts for merge of 01b2aaaa to jb-mr1-dev-plus-aosp
Change-Id: I66481eb8b269775716f79e42e9d89c2ebbd45288
2012-10-03 12:13:38 -07:00
Elliott Hughes
01b2aaaa89 am 69a49f75: Merge changes I21eb93f3,I0be5e272,I158b0d7e
* commit '69a49f75860b4849fd1c2fe68d97fa2243171131':
  Build only modules required by the current product.
  Load only the current product config makefile.
  Run clean steps in only given paths when using mm/mmm
2012-10-03 11:55:24 -07:00
Ying Wang
e37c3dc3f6 Build only modules required by the current product.
Don't build modules_to_check by default.
Instead add "checkbuild" to the command line as a build goal, if you
want to build everything.
We can use the "checkbuild" goal to make sure some build targets on the
build server still build everything.

(cherry-pick of 5a88269ad6ed44fb163f96847954faac21292567.)

Bug: 7253452
Change-Id: I21eb93f3cb430c9531fe41a2f5d7b445c09938b9
2012-10-03 10:27:31 -07:00
Ying Wang
0c4eb41885 Load only the current product config makefile.
To reduce the start time.
With the change and previous change of doing clean step in only given paths,
start time of mm/mmm is reduced from ~5s to about 1s;
lunch time is reduced from ~40s to 3.5s.

(cherry-pick of 157a5e1695593f935c3223430f4530e21f990378.)

Bug: 7186768,7169854
Change-Id: I0be5e2721efa66a80f112acf8f95e177ebc2f65b
2012-10-03 10:27:08 -07:00
Ying Wang
e113fb1d41 Run clean steps in only given paths when using mm/mmm
To speed up mm/mmm start time.
At the same time, we should copy over the other clean steps.

(cherry-pick of 6ea58cb3dc564ce112b28f1a7c6936317168d931.)

Bug: 7186768
Change-Id: I158b0d7e4ecaa773ec3a336cd326e27ee8c26a88
2012-10-03 10:26:36 -07:00
Conley Owens
9b962440b0 am 672b1893: am 8c37f49f: Merge "Follow symlinks when using find"
* commit '672b1893688be170fad79dd35c41236d7c0e36c0':
  Follow symlinks when using find
2012-10-02 16:27:15 -07:00
Conley Owens
672b189368 am 8c37f49f: Merge "Follow symlinks when using find"
* commit '8c37f49fd02d00b6371fb808d9a9dc836f565e02':
  Follow symlinks when using find
2012-10-02 16:24:42 -07:00
Conley Owens
f435739bac Follow symlinks when using find
This allows more flexibility with symlinking subtrees within projects.
For example, a build bot with a read-only copy of the src can copy
directories which will be affected by applied patches while symlinking
to directories that will remain untouched.

Change-Id: I9c783180f3ebdd737d8daf17550f562e4f00b200
2012-10-02 14:34:36 -07:00
Ian Rogers
76a6dc3a19 Fix common typo in comments, warning and error messages.
s/can not/cannot/g

Change-Id: I1bac31157732666deb46f6f20389ff539977ffb9
2012-10-01 16:36:23 -07:00
Ying Wang
54fa8c3ff9 Load only the current product config makefile.
To reduce the start time.
With the change and previous change of doing clean step in only given paths,
start time of mm/mmm is reduced from ~5s to about 1s;
lunch time is reduced from ~40s to 3.5s.

Bug: 7186768,7169854
Change-Id: Ifd72ba1c6362a5e1125a23c505fd47947ab56675
2012-09-28 15:08:12 -07:00
Ying Wang
f7592d987d Merge "Run clean steps in only given paths when using mm/mmm" into jb-mr1-dev 2012-09-28 10:24:41 -07:00
Ying Wang
9cb3731a77 Run clean steps in only given paths when using mm/mmm
To speed up mm/mmm start time.
At the same time, we should copy over the other clean steps.

Bug: 7186768
Change-Id: I250e64256343afe788d79817af36eafaadb47028
2012-09-28 10:23:52 -07:00
Dianne Hackborn
0bc0394688 Look, up in the sky! It's a bird! It's a plane! It's Android 4.2 API 17!
Change-Id: I577aa38525b23f297e3e2c4a745819ac87b24f6d
2012-09-27 15:11:47 -07:00
Miroslav Ignjatovic
f1e4df7265 [MIPS] Makes a build system use PIE flag
Change-Id: I07be4e8ae559dca615b0c59a71d7363adab4f49b
2012-09-27 13:59:15 -07:00
Ying Wang
f8f2b022e9 Ignore support library Proguard warning
The support library contains references to newer platform versions.
Don't warn about those in case this app is linking against an older
platform version.  We know about them, and they are safe.

Change-Id: Ia2a90398b1db1858d005ec09ded56751cc6ffb00
2012-09-23 13:46:58 -07:00
Ying Wang
20a7c2c10d Merge "Allow to tag owner to PRODUCT_COPY_FILES" into jb-mr1-dev 2012-09-20 17:12:01 -07:00
Zhihai Xu
d81b9d220e Merge "ISSUE 6849488 Bluedroid stack, remove system/bluetooth." into jb-mr1-dev 2012-09-20 16:42:47 -07:00
Ying Wang
4b0486b4a6 Allow to tag owner to PRODUCT_COPY_FILES
PRODUCT_COPY_FILES now is a list of words like <source
path>:<destination path>[:<owner>].
The optional :<owner> is used to indicate the owner of a vendor file.

Bug: 7048854
Change-Id: I435d1e18b7a091fb62513062cfc2e420e51557ec
2012-09-20 16:37:55 -07:00
Zhihai Xu
3849760809 ISSUE 6849488 Bluedroid stack, remove system/bluetooth.
remove system/bluetooth stuff.

bug 6849488
Change-Id: I8eb85c6da0aa34aefda2916f2c74e5eae51da27e
2012-09-20 10:50:56 -07:00
Ying Wang
5bdf305bbe Move AndroidConfig.h from system/core to the build project.
So unbundled branches don't need to include the system/core project.

Change-Id: Ic4ef62ee6df069b9b2dd123aed95a3e7fcdfc146
2012-09-20 10:33:20 -07:00
Jean-Baptiste Queru
a068907570 Update version number for AOSP master
Change-Id: I5bc11420932d62a2f6bc12410fe7c8ac2dca069b
2012-09-14 07:43:41 -07:00
Andrew Hsieh
5630521aba resolved conflicts for merge of 3e91f5ad to jb-mr1-dev
Change-Id: I9b587bc6086e1edacc98879e43668001bf72f7db
2012-09-12 15:27:59 -07:00
Andrew Hsieh
0f47a94d2e am 7e300d60: Merge "Enable stack-protector for x86"
* commit '7e300d60bfc325e3cbf3e7656297c14109e513b8':
  Enable stack-protector for x86
2012-09-12 14:20:11 -07:00
Andrew Hsieh
7e300d60bf Merge "Enable stack-protector for x86" 2012-09-12 13:44:01 -07:00
Benoit Goby
bc2406e64c Add openssl to TINY_ANDROID build
adb depends on it

Change-Id: I79f23315142b45bc7f9a2685fa2b9865b22396ad
2012-09-11 17:25:05 -07:00