Ying Wang
5cf0b2cf83
Merge "'make dump-products' to dump products."
2010-11-04 13:21:20 -07:00
Jean-Baptiste Queru
9e5d44b796
am 57723b52
: Merge 7b393fd1
from open-source master
...
* commit '57723b52cdb446c751ba8e65fa060e7a4faf4907':
Add version_defaults.mk to be a prerequisite of build.prop
2010-11-04 10:57:36 -07:00
Jean-Baptiste Queru
57723b52cd
Merge 7b393fd1
from open-source master
...
Change-Id: I5fee3ccbf7845d087e72848b4cec0198cd4afc26
2010-11-04 07:24:56 -07:00
Jean-Baptiste Queru
2042cabf71
am 6be29424
: am 892ea1ea
: Merge "build: Add spare size flag to mkyaffs2image"
...
* commit '6be29424c60cb5e17ce0aacb026c1cb88a62428b':
build: Add spare size flag to mkyaffs2image
2010-11-03 10:59:25 -07:00
Chih-Wei Huang
75947ef5ef
Add version_defaults.mk to be a prerequisite of build.prop
...
The version_defaults.mk defines variables that may affect
the content of build.prop.
Change-Id: Iabb82459949bb6e7a91829c5b485aad331c50b72
2010-11-03 18:33:46 +08:00
Ying Wang
cae4d12fd1
'make dump-products' to dump products.
...
Change-Id: I6a1e7ce5d54f47898199bfc9d29245c2598f733c
2010-11-02 23:04:24 -07:00
Ying Wang
462d26bd32
Only copy once even if the first matched src:dest pair appears more than once.
...
Change-Id: I9bef6172a1123518e97e04190fb857f9ee2c7582
2010-11-02 21:31:47 -07:00
Ying Wang
a5fc87a937
Integrate protocol buffer compiler into the build system.
...
Bug: 3152546
Change-Id: Ida3ca3d633ce45704dc8e80d044cdbd3ca69aca5
2010-11-02 19:25:47 -07:00
Jean-Baptiste Queru
6be29424c6
am 892ea1ea
: Merge "build: Add spare size flag to mkyaffs2image"
...
* commit '892ea1eaadfa5b57948bb66bd3432e06c58188e1':
build: Add spare size flag to mkyaffs2image
2010-11-02 14:17:54 -07:00
Naseer Ahmed
53871886bd
build: Add spare size flag to mkyaffs2image
...
Change-Id: Ib3a915ba5296d31f88cdc81e13da02f281dbdb9f
2010-11-02 08:59:39 -07:00
Daniel Sandler
49b21018a6
Merge "make help: prints a handy list of useful targets"
2010-10-28 12:43:56 -07:00
Daniel Sandler
9566122c9d
make help: prints a handy list of useful targets
...
A small step to making the platform build environment more
self-documenting.
Change-Id: I8f6cebe6cbd4cf89736da23e9d0d2a257ea422ee
2010-10-28 15:40:06 -04:00
Brett Chabot
3bab7f036c
am 6e644e14
: am ebf4b519
: cherry pick \'CTS vm-tests depend on hostestlib\' into GB.
2010-10-27 18:58:46 -07:00
Brett Chabot
6e644e14cb
am ebf4b519
: cherry pick \'CTS vm-tests depend on hostestlib\' into GB.
2010-10-27 18:56:53 -07:00
Brett Chabot
ebf4b5190a
cherry pick 'CTS vm-tests depend on hostestlib' into GB.
...
Original description:
CTS vm-tests now depend on hosttestlib.
Bug 3125713
Conflicts:
core/tasks/cts.mk
Change-Id: I9e364a9d9d2cae396691921424ca591beca05468
2010-10-27 18:49:33 -07:00
Shih-wei Liao
c656030f7d
Turn off llvm-rs-link to make launch time go faster.
...
Change-Id: Idbbb5e24a269e3c9a1911b47b4fbb1616cef5803
2010-10-23 03:07:13 -07:00
Jean-Baptiste Queru
6c75cb3752
am 0332f0ac
: Truly default to the full config.
2010-10-22 12:12:52 -07:00
Jean-Baptiste Queru
0332f0ac1e
Truly default to the full config.
...
It is much better than generic for emulator-based work.
Change-Id: I8b69b208bc4969d3f95c3467ca6737de8fd9460d
2010-10-22 10:03:49 -07:00
Ben Cheng
a1729fc593
Merge "Insert directives to work around a CPU bug."
2010-10-22 09:49:47 -07:00
Ben Cheng
efd2489b39
Insert directives to work around a CPU bug.
...
Bug: 3117632
Change-Id: I2fb58e7093984d18d2d2d21edf687206f4ddab31
2010-10-21 15:15:09 -07:00
Ying Wang
2923c45d39
am 4038bbc4
: am 09a00a67
: Don\'t build update zip package if there is no kernel, or it\'s generic device.
...
Merge commit '4038bbc426776d8adc57d7c3c8123357b50b1615'
* commit '4038bbc426776d8adc57d7c3c8123357b50b1615':
Don't build update zip package if there is no kernel, or it's generic device.
2010-10-21 13:45:14 -07:00
Dianne Hackborn
894bf9c0a4
Merge "We are API 9 compatible."
2010-10-21 10:51:08 -07:00
Jean-Baptiste Queru
2ea6527e7b
am 5a98ec04
: resolved conflicts for merge of 54ddcc27
to gingerbread-plus-aosp
...
Merge commit '5a98ec046c555b02d2f306efc117f7dafd32fc7d'
* commit '5a98ec046c555b02d2f306efc117f7dafd32fc7d':
Explicitly declare assembly only __ASSEMBLY__ macro for assembly source
2010-10-21 09:53:57 -07:00
Dianne Hackborn
311c267e15
We are API 9 compatible.
...
Change-Id: Ice1c07993fb66c12cafeaefa874a7adbb19caf21
2010-10-20 18:54:17 -07:00
Ying Wang
4038bbc426
am 09a00a67
: Don\'t build update zip package if there is no kernel, or it\'s generic device.
...
Merge commit '09a00a672bb18dccc97af6090739ea275c39d8a3' into gingerbread-plus-aosp
* commit '09a00a672bb18dccc97af6090739ea275c39d8a3':
Don't build update zip package if there is no kernel, or it's generic device.
2010-10-20 14:28:52 -07:00
Ying Wang
09a00a672b
Don't build update zip package if there is no kernel, or it's generic device.
...
Move the update package code block forward to be side by side with the ota package code,
so that they are built under the same condition.
Bug: 3116070
Change-Id: I8055909cc614bfbeee215d1b770a80f728e326ee
2010-10-20 14:12:21 -07:00
Jean-Baptiste Queru
5a98ec046c
resolved conflicts for merge of 54ddcc27
to gingerbread-plus-aosp
...
Change-Id: I336f9e6859dce3bb18224b3340837474319c809c
2010-10-19 15:19:45 -07:00
Dianne Hackborn
8cd3838371
Gingerbread becomes real.
...
Change-Id: I20668ef8a9221b802d785e9c8ea1b6b882f828ac
2010-10-18 11:46:50 -07:00
Ying Wang
9af2da0d94
Merge "Verify PRODUCT_* are not modified by Android.mks, but allow them to be read only."
2010-10-15 10:05:02 -07:00
Bruce Beare
f1582e5499
Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
...
Change-Id: I5c1010d9caaa8d9ffaf65999fa3649c3c2be8caa
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com >
2010-10-14 14:31:48 -07:00
Bruce Beare
8ee0dfdd43
Display the TARGET_ARCH_VARIANT
...
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com >
2010-10-14 12:26:31 -07:00
Jim Huang
20d1ba602b
Explicitly declare assembly only __ASSEMBLY__ macro for assembly source
...
To isolate the assembly-only macros in header files, such as
<machine/cpu-features.h>, this patch attempts to declare assembly
only __ASSEMBLY__ macro in build system.
Change-Id: I081c3e46258a9256b20995e4d0b473c64745444c
2010-10-14 16:17:31 +08:00
Doug Zongker
98582b28e8
radio files aren't modules, prebuilt or otherwise
...
Change-Id: Ic21cf9f7d9657819e40c6700c98e61971dab24b4
2010-10-13 13:39:56 -07:00
Ying Wang
4a5bd245ff
Fix typo.
...
Change-Id: Iabdc6ec1ead4f37294f01ebebc1e71e188455533
2010-10-11 16:36:02 -07:00
Ying Wang
7522f04a4b
Verify PRODUCT_* are not modified by Android.mks, but allow them to be read only.
...
Bug: 3076955
Change-Id: I7ddcc5b9d6325d3a3c63f952f97034ddf223630a
2010-10-11 16:33:37 -07:00
Ying Wang
16697b7000
Hook up the dependency.
...
Now llvm-rs-link is directly called by the build system.
Change-Id: I281cc6fd9e21ee7d120ddea390f802b57c894fd6
2010-10-11 13:44:50 -07:00
Shih-wei Liao
f7b32bfe41
Enable LLVM_RS_LINK. No longer forking an LLVM linker inside llvm-rs-cc.
...
Change-Id: I2ebc6ec759daf36d1e77fa8e30147ab8e40b44fc
2010-10-11 10:36:42 -07:00
Brian Muramatsu
0dd458e65a
am 99185c2a
: am cd7170d7
: resolved conflicts for merge of 0f8fcbe2
to gingerbread
...
Merge commit '99185c2a462d563855e4bc0c1e5649a21b2e186b'
* commit '99185c2a462d563855e4bc0c1e5649a21b2e186b':
Support Additional CTS Host Jars
2010-10-10 12:51:28 -07:00
Shih-wei Liao
c8241ca100
Merge "Make naming consistent: llvm-rs-cc and llvm-rs-link."
2010-10-10 09:58:22 -07:00
Ying Wang
0ce72c458c
am 3b008f36
: am 83f69eb5
: Prepend ccache to CC/CXX if necessary.
...
Merge commit '3b008f36956c35f58d510ad3da5090cf21a08349'
* commit '3b008f36956c35f58d510ad3da5090cf21a08349':
Prepend ccache to CC/CXX if necessary.
2010-10-10 09:10:22 -07:00
Shih-wei Liao
d01fadb6bc
Make naming consistent: llvm-rs-cc and llvm-rs-link.
...
Change-Id: I8e8ae27548131b47fbbd037d55b472d095d7bb8f
2010-10-08 17:55:26 -07:00
Joe Onorato
e814ad4950
am 5c41c178
: am 700b88e1
: Pass device characteristic information through to aapt.
...
Merge commit '5c41c17868865d1f2e9e2ff4680b528da61d16af'
* commit '5c41c17868865d1f2e9e2ff4680b528da61d16af':
Pass device characteristic information through to aapt.
2010-10-08 14:36:43 -07:00
Joe Onorato
64cf5aa667
Revert "Enforce that PRODUCT_ variables aren't modified by module makefiles"
...
This reverts commit 95e743a6c0
.
2010-10-08 17:01:50 -04:00
Ying Wang
24e1c018ba
Integrate the slang "-MD" into the build system.
...
So that the header dependency can be included.
Bug: 2932230
Change-Id: I4d69870049157206ce2ab637ec6d673467db0c64
2010-10-08 09:37:44 -07:00
Ying Wang
a5a684c32b
Merge ""Slang" no longer needs "--allow-rs-prefix" option. "Slang" now knows if a function is in a system header file. If so, the function can be prefixed by "rs". Otherwise, "rs" prefix is rightly disallowed. So, no more "allow-rs-prefix" hacking."
2010-10-08 09:36:57 -07:00
Jean-Baptiste Queru
c59777b35c
ip-up-vpn doesn't need to be grandfathered any more
...
Change-Id: I8fb7f98ec253f95d5eccb2603c4e09db19be2742
2010-10-08 07:47:45 -07:00
Shih-wei Liao
c95899f46d
"Slang" no longer needs "--allow-rs-prefix" option. "Slang" now knows if a function
...
is in a system header file. If so, the function can be prefixed by "rs". Otherwise,
"rs" prefix is rightly disallowed. So, no more "allow-rs-prefix" hacking.
Change-Id: I8d5982cd6a75d465ffa6f98ca96941ae761117a2
2010-10-08 07:14:03 -07:00
Jean-Baptiste Queru
95e743a6c0
Enforce that PRODUCT_ variables aren't modified by module makefiles
...
This eliminates one of the way a module could insert itself into
a build without going through a product definition file.
Change-Id: I1d537764d73c52ceaec96b64b6b6925e2f6a8d8e
2010-10-07 16:08:46 -07:00
Brian Muramatsu
99185c2a46
am cd7170d7
: resolved conflicts for merge of 0f8fcbe2
to gingerbread
...
Merge commit 'cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959' into gingerbread-plus-aosp
* commit 'cd7170d7ee81d1be9e5c93e9e372e2b58fe5d959':
Support Additional CTS Host Jars
2010-10-07 15:48:15 -07:00
Brian Muramatsu
cd7170d7ee
resolved conflicts for merge of 0f8fcbe2
to gingerbread
...
Change-Id: I0e1f13f957cba6dc90ba8a6aac6d3240b5be9019
2010-10-07 14:31:21 -07:00