tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
3270 commits 1 branch 0 tags 119 MiB
Commit graph

3270 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Jean-Baptiste Queru
70b8941f19 Merge "Add dnsproxyd to keep in sync with base init.rc" 2011-01-27 13:38:33 -08:00
Bruce Beare
d59072d4d4 Add dnsproxyd to keep in sync with base init.rc 
Change-Id: I8785cb5a5297c3cc6f3b0152fcae578a9ea89e89
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
 2011-01-27 13:32:47 -08:00
Jean-Baptiste Queru
53cebd72f7 am ad3e0072: am 39f358b7: Merge "Protobuf compiler support in the build system" 
* commit 'ad3e00724d62e5def2f2552533a62a800e9f3ee9':
  Protobuf compiler support in the build system
 2011-01-27 13:32:03 -08:00
Jean-Baptiste Queru
ad3e00724d am 39f358b7: Merge "Protobuf compiler support in the build system" 
* commit '39f358b75f1c6a9a10823bf5e400d1ece0144a05':
  Protobuf compiler support in the build system
 2011-01-27 13:30:31 -08:00
Jean-Baptiste Queru
5a50ecee40 am f273723f: am 1e0055fb: Merge "A few more grandfathered user tags" 
* commit 'f273723f7710bb127ee1026e05049e4ee5290c8a':
  A few more grandfathered user tags
 2011-01-27 13:22:36 -08:00
Jean-Baptiste Queru
f273723f77 am 1e0055fb: Merge "A few more grandfathered user tags" 
* commit '1e0055fb91f7b8582cb2979c45532ae01bf7a779':
  A few more grandfathered user tags
 2011-01-27 13:16:50 -08:00
Jean-Baptiste Queru
39f358b75f Merge "Protobuf compiler support in the build system" 2011-01-27 13:12:09 -08:00
Jean-Baptiste Queru
79ee7bf896 Protobuf compiler support in the build system 2011-01-27 12:44:30 -08:00
Jean-Baptiste Queru
1e0055fb91 Merge "A few more grandfathered user tags" 2011-01-27 12:17:52 -08:00
Jean-Baptiste Queru
2497b6109b A few more grandfathered user tags 
Change-Id: I57309b461ec2395da068961f976c904bd3474e88
 2011-01-27 12:17:00 -08:00
Jean-Baptiste Queru
020e2fc14a am 928a0304: re-merge from readonly-korg-master - do not merge 
* commit '928a03043187b7c4843b2c832b589c57b7541e4a':
  re-merge from readonly-korg-master - do not merge
 2011-01-27 09:24:43 -08:00
Jean-Baptiste Queru
928a030431 re-merge from readonly-korg-master - do not merge 
Change-Id: Ifc1e39261e1fcaefc1e314d994e71115624643a2
 2011-01-27 09:21:58 -08:00
Jean-Baptiste Queru
46b944dd76 am 1fe74722: am 4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can have user tags - do not merge" 
* commit '1fe74722b608a66381d186b32b2fb59d254194c7':
  Add a few more legacy modules that can have user tags - do not merge
 2011-01-27 08:55:43 -08:00
Jean-Baptiste Queru
1fe74722b6 am 4a91aa9b: (-s ours) Merge "Add a few more legacy modules that can have user tags - do not merge" 
* commit '4a91aa9b40d2bffdab04323d100fad3a0e3e6ecc':
  Add a few more legacy modules that can have user tags - do not merge
 2011-01-27 08:53:44 -08:00
Jean-Baptiste Queru
4a91aa9b40 Merge "Add a few more legacy modules that can have user tags - do not merge" 2011-01-27 08:26:25 -08:00
Jean-Baptiste Queru
4fd2ef057a Add a few more legacy modules that can have user tags - do not merge 
Change-Id: I198d3eb34958e46ccba145bd05452027cba5e464
 2011-01-27 08:18:41 -08:00
Scott Main
bbe78df178 am 05d14cb9: Merge "don\'t use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)" into gingerbread 
* commit '05d14cb9f03044e11f7c056dae1e576bb5cd3716':
  don't use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)
 2011-01-21 12:34:06 -08:00
Scott Main
05d14cb9f0 Merge "don't use the sdkdoc template if the index file is a preview (the features.html doc is no longer used, so removed check for that also)" into gingerbread 2011-01-21 12:00:51 -08:00
Scott Main
42d1d32aa0 don't use the sdkdoc template if the index file is a preview 
(the features.html doc is no longer used, so removed check for that also)

Change-Id: I1985b2e48060337030df53c19051ea363cb3b700
 2011-01-21 11:58:56 -08:00
Jean-Baptiste Queru
fce88928fe Revert "Merge commit '50738779' into gingerbread-plus-aosp" - do not merge 
This reverts commit 7e1ce27c08, reversing
changes made to 7dfc127096.

Change-Id: I2b4c33ad56a12612f2fc05845428409d7023f683
 2011-01-21 07:50:36 -08:00