Ying Wang
4a2ecaf5dc
Fix the case image-size-from-data-size returns 0.
...
This time with correct escaping.
Change-Id: I660887ac62425e9960e266391b52979a7dff4617
2011-02-09 17:24:27 -08:00
Ying Wang
bfaf531e05
Revert "Fix the case BOARD_FLASH_BLOCK_SIZE smaller than BOARD_NAND_PAGE_SIZE, eg generic_x86"
...
This reverts commit 279f3084bb
.
Change-Id: I27069190503e586d3d77a933d92459a34eb55cb8
2011-02-09 16:15:21 -08:00
Ying Wang
9a0c36af91
Merge "Fix generic_x86 image sizes."
2011-02-09 14:48:05 -08:00
Ying Wang
389cf7ac4e
Merge "Fix the case BOARD_FLASH_BLOCK_SIZE smaller than BOARD_NAND_PAGE_SIZE, eg generic_x86"
2011-02-09 13:21:09 -08:00
Ying Wang
279f3084bb
Fix the case BOARD_FLASH_BLOCK_SIZE smaller than BOARD_NAND_PAGE_SIZE, eg generic_x86
...
Also don't build ota package for generic_x86.
Change-Id: I7606d56b312ac2e0c3514a8f250e005e0c05a3f1
2011-02-09 13:11:50 -08:00
Ying Wang
5371de12df
Fix generic_x86 image sizes.
...
The image build tools only accept decimals.
Change-Id: I4fc3d32a9528bdad4cfb9381cff344a1a1b6b6d5
2011-02-09 10:50:55 -08:00
Jeff Brown
f67684b22a
Merge "Build system tweaks for Valgrind."
2011-02-08 17:11:38 -08:00
Jeff Brown
703e7c6d50
Build system tweaks for Valgrind.
...
Added LOCAL_NO_CRT to enable building executables that do not link
to the C runtime library.
Removed support for LOCAL_MODULE_SUBDIR since it was broken
and unused. (Was going to use it but ended up using LOCAL_MODULE_PATH
instead.)
Change-Id: I3b6f5ab7e5ae6aaa7119899adccece2b4ab1cbb3
2011-02-08 16:38:56 -08:00
Glenn Kasten
e5f114b3a5
Merge "libFLAC is now a static library"
2011-02-08 11:56:22 -08:00
Kenny Root
3ff17b3bc5
Merge "Add system image size for X86"
2011-02-08 09:34:07 -08:00
Kenny Root
773f315bd8
Add system image size for X86
...
It was defaulting to 128M which was slightly too small for all the
applications. Increasing to 150M fits the resulting image.
Change-Id: I55957c54fbdb77090487c08ed3948988621978b3
2011-02-08 07:45:46 -08:00
Scott Main
706408ea9f
am 1a35a101
: am 4c8ae40a
: docs: remove preliminary watermark from docs
...
* commit '1a35a101ada24a0fa5220dc695f458cf248c814f':
docs: remove preliminary watermark from docs
2011-02-07 15:37:00 -08:00
Scott Main
1a35a101ad
am 4c8ae40a
: docs: remove preliminary watermark from docs
...
* commit '4c8ae40abba83921bd98eb6636b5e3d753bbd183':
docs: remove preliminary watermark from docs
2011-02-07 15:34:50 -08:00
Scott Main
4c8ae40abb
docs: remove preliminary watermark from docs
...
Change-Id: I452596cdc5b87effdb958ff963d9aa80ebec5d37
2011-02-07 14:26:45 -08:00
Scott Main
c4305eefe3
am 2f2a43cd
: am 61281638
: am 886e5aa7
: Merge "fix api level filtering script to compare integers, not strings" into gingerbread
...
* commit '2f2a43cd92842dd38d20f95db1998c60da0c34dd':
fix api level filtering script to compare integers, not strings
2011-02-07 13:47:26 -08:00
Raphael
038c9805e7
am 77c1e67b
: (-s ours) am 3e01b483
: (-s ours) am 843c6e25
: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
...
* commit '77c1e67b876b0d486d0056e418889117d8093093':
merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
2011-02-07 13:47:24 -08:00
Scott Main
3fbd3207f2
am 053f5491
: am 4b311bc9
: Merge "fix api level filtering script to compare integers, not strings" into honeycomb
...
* commit '053f5491340f5bacddd9943521c8f1b1d0c0bb6a':
fix api level filtering script to compare integers, not strings
2011-02-07 13:47:05 -08:00
Scott Main
6f963b3930
am c52832ad
: am 8cf6d9e3
: Merge "tweak header css for more distinction" into honeycomb
...
* commit 'c52832ad5c5ac994f6e49de14c6e9f43da997d32':
tweak header css for more distinction
2011-02-07 13:45:10 -08:00
Raphael
59f7b629bc
am 0a7ed4af
: am 30e07075
: SDK: stub the maps.jar from the google_apis addon.
...
* commit '0a7ed4af97bdd52be96d8c9db1eff3fa4d6dc843':
SDK: stub the maps.jar from the google_apis addon.
2011-02-07 13:44:26 -08:00
Scott Main
2f2a43cd92
am 61281638
: am 886e5aa7
: Merge "fix api level filtering script to compare integers, not strings" into gingerbread
...
* commit '612816385a5c6ca2bd54d027617c42c34338682f':
fix api level filtering script to compare integers, not strings
2011-02-04 15:20:42 -08:00
Raphael
77c1e67b87
am 3e01b483
: (-s ours) am 843c6e25
: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
...
* commit '3e01b483708d0fc3766fa4adff2ae8b354de75dc':
merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
2011-02-04 15:20:36 -08:00
Scott Main
053f549134
am 4b311bc9
: Merge "fix api level filtering script to compare integers, not strings" into honeycomb
...
* commit '4b311bc91a7851b204c63e678b0213504125d3aa':
fix api level filtering script to compare integers, not strings
2011-02-04 15:17:04 -08:00
Scott Main
612816385a
am 886e5aa7
: Merge "fix api level filtering script to compare integers, not strings" into gingerbread
...
* commit '886e5aa742c1667de3ca5b628bf6865948ef4513':
fix api level filtering script to compare integers, not strings
2011-02-04 15:14:57 -08:00
Scott Main
4b311bc91a
Merge "fix api level filtering script to compare integers, not strings" into honeycomb
2011-02-04 15:14:45 -08:00
Scott Main
11057f5a0a
fix api level filtering script to compare integers, not strings
...
Change-Id: I8f0e44ec2bf0833a0d547a3795ee31ee0dc69d8a
2011-02-04 15:13:04 -08:00
Scott Main
886e5aa742
Merge "fix api level filtering script to compare integers, not strings" into gingerbread
2011-02-04 15:11:59 -08:00
Scott Main
af2ba51ed5
fix api level filtering script to compare integers, not strings
...
Change-Id: I4d0d6c40dd5c1f8470567ef30f0f7500b442fbe5
2011-02-04 15:10:33 -08:00
Raphael
3e01b48370
am 843c6e25
: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
...
* commit '843c6e2530a0783ae1a5a4758cb5e76ad975ae72':
merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
2011-02-04 14:49:17 -08:00
Raphael
843c6e2530
merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
...
Depends on change 8252cdea from development to get the
verbose/quiet flag for mkstub.
Change-Id: I1ac97023570a4fc8a0b9dd50db429c55184ec88c
2011-02-04 12:34:54 -08:00
Scott Main
c52832ad5c
am 8cf6d9e3
: Merge "tweak header css for more distinction" into honeycomb
...
* commit '8cf6d9e3ae1f7a18c49121c578fe1f5f05371342':
tweak header css for more distinction
2011-02-04 11:48:59 -08:00
Scott Main
8cf6d9e3ae
Merge "tweak header css for more distinction" into honeycomb
2011-02-04 11:47:18 -08:00
Raphael
0a7ed4af97
am 30e07075
: SDK: stub the maps.jar from the google_apis addon.
...
* commit '30e0707531268343e11dfeb51f28ccdacd7f9875':
SDK: stub the maps.jar from the google_apis addon.
2011-02-04 11:12:25 -08:00
Glenn Kasten
043b9d4b3d
Merge "Bug 3366885 Remove LVMX"
2011-02-04 08:42:11 -08:00
Raphael
30e0707531
SDK: stub the maps.jar from the google_apis addon.
...
Depends on change 8252cdea from development to get the
verbose/quiet flag for mkstub.
Change-Id: I5f4e766613576828147c97be8d38e97fe1035672
2011-02-03 23:00:49 -08:00
Scott Main
a16d7d8ad3
tweak header css for more distinction
...
Change-Id: I1d63b7587917bfde3df5547b5648610d86083d6a
2011-02-03 19:30:48 -08:00
Glenn Kasten
18315876c8
Bug 3366885 Remove LVMX
...
Change-Id: If35e28c44a4ccc3e1a777e95f2551cf5d6552f12
2011-02-03 18:24:59 -08:00
Raphael Moll
16166e5727
am 5c6069d6
: am ed191898
: am a15717c9
: am 6b7b53cb
: Merge "SDK: Enable "make sdk/common" under Windows"
...
* commit '5c6069d632b3019c74de57b5d89a4e90d2b59759':
SDK: Enable "make sdk/common" under Windows
2011-02-03 18:07:50 -08:00
Raphael
6758820550
am 004f68f0
: am 79e1d2cf
: am 6b6e8114
: am 4167b2ba
: Merge "SDK: Strip llvm-rs-cc in SDK."
...
* commit '004f68f01c410f33fbeb44313597ee97b1f17a86':
SDK: Strip llvm-rs-cc in SDK.
2011-02-03 17:17:55 -08:00
Glenn Kasten
be1a946d16
libFLAC is now a static library
...
Change-Id: Iaf48e795607ddaeb3cc1da2fce068d4d985061da
2011-02-03 13:19:41 -08:00
Raphael Moll
5c6069d632
am ed191898
: am a15717c9
: am 6b7b53cb
: Merge "SDK: Enable "make sdk/common" under Windows"
...
* commit 'ed19189877a3a380074e8e76969ef23689cec8fd':
SDK: Enable "make sdk/common" under Windows
2011-02-03 11:45:21 -08:00
Raphael Moll
ed19189877
am a15717c9
: am 6b7b53cb
: Merge "SDK: Enable "make sdk/common" under Windows"
...
* commit 'a15717c9905e32f2724645e3734567c40d8d3eb0':
SDK: Enable "make sdk/common" under Windows
2011-02-03 11:42:34 -08:00
Raphael Moll
a15717c990
am 6b7b53cb
: Merge "SDK: Enable "make sdk/common" under Windows"
...
* commit '6b7b53cb36bda3b2aa1de94654cd73785d67c267':
SDK: Enable "make sdk/common" under Windows
2011-02-03 10:54:05 -08:00
Raphael Moll
6b7b53cb36
Merge "SDK: Enable "make sdk/common" under Windows"
2011-02-03 10:45:50 -08:00
Jean-Baptiste Queru
4b35d1aba0
Fix x86 build.
...
Change-Id: I22dc39a68911e1b5846c20e63c0f8c59521ea7f5
2011-02-03 09:55:47 -08:00
Raphael
004f68f01c
am 79e1d2cf
: am 6b6e8114
: am 4167b2ba
: Merge "SDK: Strip llvm-rs-cc in SDK."
...
* commit '79e1d2cf99754f81137c0f390d0e1fd898e52277':
SDK: Strip llvm-rs-cc in SDK.
2011-02-03 09:16:38 -08:00
Raphael
79e1d2cf99
am 6b6e8114
: am 4167b2ba
: Merge "SDK: Strip llvm-rs-cc in SDK."
...
* commit '6b6e8114810bb26a64e1d8d9814fdfadb90c3848':
SDK: Strip llvm-rs-cc in SDK.
2011-02-03 09:05:07 -08:00
Raphael
6b6e811481
am 4167b2ba
: Merge "SDK: Strip llvm-rs-cc in SDK."
...
* commit '4167b2bae58b445cfaf15291a7aa6b0ccd025596':
SDK: Strip llvm-rs-cc in SDK.
2011-02-03 08:56:22 -08:00
Brian Swetland
a0c5bd7b4a
am 70c822e7
: am 678c7ac9
: (-s ours) am d7798a7e
: fix TINY ANDROID yet again...
...
* commit '70c822e7106ac97a1a2b4e5d404e54efc34ad344':
fix TINY ANDROID yet again...
2011-02-02 16:25:01 -08:00
Raphael
ea55056f19
am 3e57da17
: am 7a6a9c35
: SDK: Strip llvm-rs-cc in SDK.
...
* commit '3e57da17d1bd1e61c440910fbb441ba6997314d9':
SDK: Strip llvm-rs-cc in SDK.
2011-02-02 16:20:08 -08:00
Brian Swetland
70c822e710
am 678c7ac9
: (-s ours) am d7798a7e
: fix TINY ANDROID yet again...
...
* commit '678c7ac997ba5daf09664d3e9b26f1c4a493b99e':
fix TINY ANDROID yet again...
2011-02-02 16:17:50 -08:00