David 'Digit' Turner
5ca286d58b
core/binary.mk: Add missing Objective-C objects to the build.
...
For some reason, all_objects was not listing objects generated from
objective-C sources. We need these for the emulator (which builds its
own version of SDL which uses Quartz on OS X).
+ Fix a typo in transform-host-m-to-o definition.
This also explains why https://review.source.android.com/#change,21074
had to be reverted, since it gets rid of the prebuilt SDL libraries when
building the emulator.
Change-Id: I173811cf11cdb5b045073aade59364236145bc77
2011-02-11 17:52:52 +01:00
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
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
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
Ying Wang
bf14935195
am d239c1bd
: Fix dependency of prebuilt target non-static Java libraries.
...
* commit 'd239c1bd1bef3067acebcd9d87a7be68d6eb4b98':
Fix dependency of prebuilt target non-static Java libraries.
2011-02-08 11:22:02 -08:00
Ying Wang
d239c1bd1b
Fix dependency of prebuilt target non-static Java libraries.
...
Change-Id: Ib9a01e1d0cf1eed57de0dc7706ee12125212ba67
2011-02-08 10:07:11 -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
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
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
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
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
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
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
Raphael Moll
192d1ef6d7
SDK: Enable "make sdk/common" under Windows
...
Change-Id: Id9cba159f434fb18f6e3b648954b3f8ddb580dc0
2011-02-02 15:59:46 -08:00
Raphael
3e57da17d1
am 7a6a9c35
: SDK: Strip llvm-rs-cc in SDK.
...
* commit '7a6a9c3528d997a1cb3a03eca3c0c11b14792449':
SDK: Strip llvm-rs-cc in SDK.
2011-02-02 15:52:40 -08:00
Brian Swetland
678c7ac997
am d7798a7e
: fix TINY ANDROID yet again...
...
* commit 'd7798a7e1b3241c49d7c8325cf14ac608350b719':
fix TINY ANDROID yet again...
2011-02-02 15:23:20 -08:00
Brian Swetland
d7798a7e1b
fix TINY ANDROID yet again...
...
Change-Id: If52e1387c590be5ef467280ab2d1b56b8a823cd0
2011-02-02 15:20:50 -08:00
Raphael
7a6a9c3528
SDK: Strip llvm-rs-cc in SDK.
...
SDK Bug: 3394374
Change-Id: I2b0e46d9f94d488611bd79193f4a11cc0f36be51
2011-02-02 12:05:31 -08:00
Raphael
39f4b566da
SDK: Strip llvm-rs-cc in SDK.
...
SDK Bug: 3394374
Change-Id: I728112795ad40a31a1b4c476e043ef213241c617
2011-02-02 11:31:38 -08:00
Ed Heyl
1eda86286a
set ID back to honeycomb (please do not merge)
...
Change-Id: I469ccbb2a556d3aeaedb9d0a89bda1d77aef6b90
2011-02-02 10:04:50 -08:00
Ying Wang
0864d01001
am 9bc858c4
: am 9c0f3e35
: Build only userdata.img.
...
* commit '9bc858c4fd765366a64cfe2021b8694b4aac82f8':
Build only userdata.img.
2011-02-01 16:39:03 -08:00
Ying Wang
9bc858c4fd
am 9c0f3e35
: Build only userdata.img.
...
* commit '9c0f3e355194d1c43bf70f35f953d6a2babc815a':
Build only userdata.img.
2011-02-01 16:37:30 -08:00
Doug Zongker
e82906500b
Merge "support TARGET_EXTRA_RECOVERY_KEYS"
2011-02-01 16:05:31 -08:00
Ying Wang
9c0f3e3551
Build only userdata.img.
...
Use build command like:
$make -j16 showcommands userdataimage dist TARGET_PRODUCT=trygon_with_data_preloaded TARGET_BUILD_VARIANT=user
Change-Id: I964490e03090c3696d1595c92363273e35cfaed7
2011-02-01 14:59:12 -08:00
Doug Zongker
e121d6acf4
support TARGET_EXTRA_RECOVERY_KEYS
...
Specifying one or more key files (without .x509.pem extension) as
TARGET_EXTRA_RECOVERY_KEYS causes them to be included as acceptable
keys for recovery packages. They are *not* included in otacerts.zip,
so actual downloaded over-the-air packages can't use them, but they
can be used to sign sideload-only packages.
Bug: 3413359
Change-Id: I6f248ffa35f0c6b125dd8a7517493017e236c776
2011-02-01 14:13:52 -08:00
Ying Wang
5b316b604d
Fix dependency of prebuilt target non-static Java libraries.
...
Change-Id: I498b96ce737e5fc9076de39108252284ee53218f
2011-02-01 13:07:01 -08:00
Jean-Baptiste Queru
e29ef594e6
Merge from open-source master
...
Change-Id: Id74236b5a2b2717bbe45c684573106555c7d9ad2
2011-01-31 15:14:54 -08:00
Brett Chabot
e5baeada4d
am 9f686c99
: am 2aad7a5b
: Merge "Add cts-tradefed to cts build." into honeycomb
...
* commit '9f686c996bb45f0d377342fadfd20f5ae7a640de':
Add cts-tradefed to cts build.
2011-01-31 15:00:44 -08:00
Brett Chabot
9f686c996b
am 2aad7a5b
: Merge "Add cts-tradefed to cts build." into honeycomb
...
* commit '2aad7a5beae2b308332270c27645f45674303a77':
Add cts-tradefed to cts build.
2011-01-31 13:59:58 -08:00
Brett Chabot
2aad7a5bea
Merge "Add cts-tradefed to cts build." into honeycomb
2011-01-31 13:42:11 -08:00
Jean-Baptiste Queru
83e2f942b6
partial build fix
...
Change-Id: I831c4c646eca96c6513018fbc5ad88970b942775
2011-01-31 12:59:54 -08:00
Brett Chabot
358b24700b
Add cts-tradefed to cts build.
...
Bug 3403768
Change-Id: I0ca2068f93f25b2f5f6691c5ce70573da4a12aa6
2011-01-31 12:57:56 -08:00
Jean-Baptiste Queru
bf041eb259
partial build fix
...
Change-Id: I34fe778ac366d702b9eb626feaedda05e69e8361
2011-01-31 12:35:02 -08:00
The Android Open Source Project
3b6bf4484e
Mass merge from gingerbread - do not merge
...
Change-Id: Idbfeda9c0a9720d894352747c01754ed2c90c44d
2011-01-30 12:39:46 -08:00
Jean-Baptiste Queru
e0d4dbad5a
am a4781e86
: Merge from open-source gingerbread
...
* commit 'a4781e867f2e9115ce5b8085576bebf6505bfd00':
CTS: pass vogar expectation location to CollectAllTests.
2011-01-29 09:27:39 -08:00
Ying Wang
3a7e4ccad9
Unify use of $(hide).
...
Change-Id: Ib7e17bbb4682caecce5812e63de872b676403d64
2011-01-28 14:14:47 -08:00
Ying Wang
f5653d1cee
Regularize use of PRIVATE_CXX.
...
Change-Id: Ifc628c67b5fa142cec59187f89f2d39df81160b9
2011-01-27 20:08:34 -08:00
Ying Wang
a02d3d9f74
Break down the buge shell command line preparing whole static libraries.
...
This can fix the "@: command not found" messages, which is caused by "@"
in the middle of the shell command line.
Change-Id: I444827458045efcbc70a6e1e43bf4ee040e71b79
2011-01-27 18:48:00 -08:00
Jean-Baptiste Queru
2039512c30
am 61356271
: am e388ac10
: Merge "Extra protobuf-related support"
...
* commit '6135627140bd799ee56ba894b69a9455ca0af86a':
Extra protobuf-related support
2011-01-27 14:27:32 -08:00
Jean-Baptiste Queru
c61d4c91b6
Extra protobuf-related support
...
Change-Id: I375d32f0bcb695ccb0603743133034941d584163
2011-01-27 13:49:30 -08:00