Commit Graph

3291 Commits

Author SHA1 Message Date
David Turner
51de64377b am 9edd4fa0: Merge "x86: sdk_x86 build target"
* commit '9edd4fa0a629e178382bacf11bd8875ae826d651':
  x86: sdk_x86 build target
2011-03-04 12:39:52 -08:00
David Turner
9edd4fa0a6 Merge "x86: sdk_x86 build target" 2011-03-04 12:25:47 -08:00
David Turner
dfa82c438f am faa68200: Merge "x86: Add in the VirtualBox emulator as a separate build target"
* commit 'faa68200661eea15f5b3962386d325609e1f90a8':
  x86: Add in the VirtualBox emulator as a separate build target
2011-03-04 11:46:14 -08:00
David Turner
faa6820066 Merge "x86: Add in the VirtualBox emulator as a separate build target" 2011-03-04 11:41:02 -08:00
Wink Saville
243d9ae28c am 4d67e916: am d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"
* commit '4d67e91644ea78b5209de50355ba812a73b519f8':
  WAPPushManager, WAP Push over SMS message handler
2011-03-01 13:16:09 -08:00
Bruce Beare
5636301f78 x86: sdk_x86 build target
Change-Id: I3876246ddf884ffd09ff0f8e3e300dffb4a332f0
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-03-01 13:04:23 -08:00
Bruce Beare
ba366c4fb3 x86: Add in the VirtualBox emulator as a separate build target
Change-Id: Icff81a757952b7652d171bc95773e177c4fd7772
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2011-03-01 13:04:21 -08:00
Wink Saville
4d67e91644 am d09b2e55: Merge "WAPPushManager, WAP Push over SMS message handler"
* commit 'd09b2e552788cc90813e930e3912651e053c657c':
  WAPPushManager, WAP Push over SMS message handler
2011-03-01 12:39:42 -08:00
Wink Saville
d09b2e5527 Merge "WAPPushManager, WAP Push over SMS message handler" 2011-02-23 18:23:21 -08:00
Doug Zongker
eaa464e6c4 am a34fa95c: force inclusion of system log tags in the event-log-tags file
* commit 'a34fa95c164a9388ed0b84b17a63241bffd4132a':
  force inclusion of system log tags in the event-log-tags file
2011-02-23 13:25:45 -08:00
Doug Zongker
a34fa95c16 force inclusion of system log tags in the event-log-tags file
Change-Id: I59066ff151b6cb74a70bd8a900d473a533c84de3
2011-02-23 12:17:29 -08:00
Kenny Root
747a9780a8 am 951a3e5f: Merge "Build system tweaks for Valgrind."
* commit '951a3e5f416d9ebe84e922132c85c8696d5d74a0':
  Build system tweaks for Valgrind.
2011-02-17 11:38:51 -08:00
Kenny Root
951a3e5f41 Merge "Build system tweaks for Valgrind." 2011-02-16 15:27:16 -08:00
Jeff Brown
bd528a82a2 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: Ifed4ffe17003d90370c711ea6606e2b75e841dee
2011-02-16 15:06:30 -08:00
David 'Digit' Turner
b3f59bde44 am 86a90364: Merge "core/binary.mk: Add missing Objective-C objects to the build."
* commit '86a903647f3f3df4484396ec58ba5b0454abd36e':
  core/binary.mk: Add missing Objective-C objects to the build.
2011-02-15 10:10:45 -08:00
David 'Digit' Turner
86a903647f Merge "core/binary.mk: Add missing Objective-C objects to the build." 2011-02-14 15:07:00 -08:00
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
Jean-Baptiste Queru
c7797bb334 am 8f9849a0: Merge "no-op"
* commit '8f9849a037c901ea3b1e7a1d7d43f56728abea40':
  no-op
2011-02-10 13:22:01 -08:00
Jean-Baptiste Queru
8f9849a037 Merge "no-op" 2011-02-10 12:58:01 -08:00
Jean-Baptiste Queru
c13cf1919f no-op
Change-Id: Ifd90e66fe63d429f9998a36f72553e2aacf3fc7c
2011-02-10 12:57:31 -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
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
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
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
Raphael Moll
192d1ef6d7 SDK: Enable "make sdk/common" under Windows
Change-Id: Id9cba159f434fb18f6e3b648954b3f8ddb580dc0
2011-02-02 15:59:46 -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
4167b2bae5 Merge "SDK: Strip llvm-rs-cc in SDK." 2011-02-02 13:41:14 -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
Scott Main
463694a4f5 am 0fe9974c: cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
* commit '0fe9974c38e41a2aa386d5744d1a75d8bd26b1bc':
  cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3 backport some style changes for notes from master to gb
2011-02-01 20:52:23 -08:00
Scott Main
0fe9974c38 cherrypick Change-Id: Ib8a7ae66f0dc6db6a2c8f2a79238d95e67c627f3
backport some style changes for notes from master to gb

Change-Id: I4a7c6cfcadade5d90069ecab1edc694cb333430e
2011-02-01 20:37:20 -08:00
Jean-Baptiste Queru
e29ef594e6 Merge from open-source master
Change-Id: Id74236b5a2b2717bbe45c684573106555c7d9ad2
2011-01-31 15:14:54 -08:00
Jean-Baptiste Queru
00aef60ada am 2d946f7a: Merge "partial build fix"
* commit '2d946f7ac9a74870271179d5d7a16a5f9ed61641':
  partial build fix
2011-01-31 13:50:10 -08:00
Jean-Baptiste Queru
2a65eda5b6 am de50cfb5: Merge "partial build fix"
* commit 'de50cfb5f961a1ad4ceeeec2108147555fea0e22':
  partial build fix
2011-01-31 13:50:07 -08:00
Jean-Baptiste Queru
2d946f7ac9 Merge "partial build fix" 2011-01-31 13:00:23 -08:00
Jean-Baptiste Queru
83e2f942b6 partial build fix
Change-Id: I831c4c646eca96c6513018fbc5ad88970b942775
2011-01-31 12:59:54 -08:00
Jean-Baptiste Queru
de50cfb5f9 Merge "partial build fix" 2011-01-31 12:36:05 -08:00
Jean-Baptiste Queru
bf041eb259 partial build fix
Change-Id: I34fe778ac366d702b9eb626feaedda05e69e8361
2011-01-31 12:35:02 -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
6135627140 am e388ac10: Merge "Extra protobuf-related support"
* commit 'e388ac10b9dfc39f7578b6d222652926265dcffd':
  Extra protobuf-related support
2011-01-27 14:25:30 -08:00
Jean-Baptiste Queru
e388ac10b9 Merge "Extra protobuf-related support" 2011-01-27 14:19:04 -08:00
Jean-Baptiste Queru
d39664126e am ab81ffe2: am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc"
* commit 'ab81ffe2defa3294e09b70372e2179db2377c894':
  Add dnsproxyd to keep in sync with base init.rc
2011-01-27 13:57:47 -08:00
Jean-Baptiste Queru
ab81ffe2de am 70b8941f: Merge "Add dnsproxyd to keep in sync with base init.rc"
* commit '70b8941f19440592938bdb5c453b16be4d1d8c31':
  Add dnsproxyd to keep in sync with base init.rc
2011-01-27 13:55:02 -08:00
Jean-Baptiste Queru
c61d4c91b6 Extra protobuf-related support
Change-Id: I375d32f0bcb695ccb0603743133034941d584163
2011-01-27 13:49:30 -08:00