Commit graph

1445 commits

Author SHA1 Message Date
Brian Carlstrom
a74f42001a am 56c35da7: am bb219fc3: Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
* commit '56c35da7fbc21acbf7297ffff3b7e474c4ac4198':
  Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
2011-01-26 15:34:10 -08:00
Brian Carlstrom
56c35da7fb am bb219fc3: Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
* commit 'bb219fc3dc29e832f3cd8e435c94a894ef2ee87f':
  Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
2011-01-26 15:32:03 -08:00
Brian Carlstrom
bb219fc3dc Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
Bug: 3086427
Change-Id: Ibe73dfa70d4c3d82968c43e74ced38cd74f60e0f
2011-01-26 15:13:42 -08:00
Ying Wang
80e6cce93e Correct misuse of target/host vars.
Change-Id: Ide41aeddc44ca05d85a36035c2d55ea453cfd216
2011-01-24 23:25:36 -08:00
Ying Wang
3d85bbd288 Merge "Add modifier goal incrementaljavac" 2011-01-24 10:59:15 -08:00
The Android Automerger
97f3f08622 resolved conflicts for merge of b5952289 to master
Change-Id: I792d34aed36200b85512aadc212503a3c1da140f
2011-01-23 23:34:23 -08:00
The Android Automerger
b5952289e2 resolved conflicts for merge of 733ce0d0 to honeycomb-plus-aosp
Change-Id: Ic962c4e2611c31af1da96269d70216b27aa3a18d
2011-01-23 23:25:47 -08:00
Brian Swetland
7cc2440994 make TINY_ANDROID build without the presence of frameworks/* and development/*
Change-Id: I795e27a9ce837b193c6d8d0516e2f523c17214e2
2011-01-23 18:56:08 -08:00
Brian Swetland
72bf09d333 tiny android: include su
Change-Id: Ib8162c0f8171114ffafcac48d482fd3acd5d5956
2011-01-23 17:06:58 -08:00
Dianne Hackborn
733ce0d0cc DO NOT MERGE. Hello, Android 3.0 API 11.
Change-Id: Id859b752fc87fd050005c32665f2f019e177cf95
2011-01-23 14:49:02 -08:00
Ying Wang
015edd2c1b Add modifier goal incrementaljavac
With "incrementaljavac" on your make command line, you will recompile
only Java source files that have been changed since last build.
Nothing is changed if "incrementaljavac" is not among your make goals.

Change-Id: Iae591459827df81ac91e95292464db5e9828343a
2011-01-21 17:49:30 -08:00
Ed Heyl
1d4e3fdeb4 am 7e1ce27c: Merge commit \'50738779\' into gingerbread-plus-aosp
* commit '7e1ce27c08ec57032520613488ec2fe5b3795126':
  DO NOT MERGE Fix issue #3373438: Update GBMR versions
2011-01-21 17:41:23 -08:00
Jean-Baptiste Queru
43b1bb5be1 (Re-)Set version names for AOSP master - do not merge
Change-Id: I0973090ebf00a9e0deb8ec2beb0f39fa93bc03c1
2011-01-21 07:59:40 -08:00
Ed Heyl
7e1ce27c08 Merge commit '50738779' into gingerbread-plus-aosp
Conflicts:
	core/version_defaults.mk

Change-Id: I69ae9d5b3e0532c67c401a8320e69aab5ee66b0f
2011-01-20 18:08:34 -08:00
Brian Swetland
4d9fee9e9c am cb6fbf88: am a7600364: fix tiny android build
* commit 'cb6fbf88db9e29f761045dbe9ece975f178ff71e':
  fix tiny android build
2011-01-20 17:12:33 -08:00
Brian Swetland
cb6fbf88db am a7600364: fix tiny android build
* commit 'a7600364feb0eff313374e9dd0502ea7e15085f6':
  fix tiny android build
2011-01-20 17:07:27 -08:00
Brian Swetland
a7600364fe fix tiny android build
Change-Id: Ifa6cda67f54969588b5c4e9f900ac2d4ba607e71
Signed-off-by: Brian Swetland <swetland@google.com>
2011-01-20 15:34:39 -08:00
Dianne Hackborn
50738779d9 DO NOT MERGE Fix issue #3373438: Update GBMR versions
Change-Id: Ia334babece0d3cecb19da8ddd240ee300d0ac3ac
2011-01-20 12:17:41 -08:00
Ying Wang
ea482c78e3 am 4d3ac24d: am 84ed6fa2: Disable "-t" for acp.
* commit '4d3ac24dafab161a44fddb1039159b1b484f5841':
  Disable "-t" for acp.
2011-01-19 14:41:25 -08:00
Ying Wang
4d3ac24daf am 84ed6fa2: Disable "-t" for acp.
* commit '84ed6fa27b883de8ba7b41ddecaa2179e7f4b321':
  Disable "-t" for acp.
2011-01-19 14:38:00 -08:00
Ying Wang
84ed6fa27b Disable "-t" for acp.
Acp can not handle high resolution file timestamp on ext4.
We need this to fix incremental build on ext4.

Change-Id: I54e45c73ffa44c4253c7a431375d419fa4dccfd9
2011-01-19 12:15:38 -08:00
Ying Wang
49086372f7 am df3a8ab5: am 85aa5ded: Add external/clang/lib/Headers as llvm-rs-cc\'s system header search path
* commit 'df3a8ab5aa32ca470774939b0fde5111faf5320b':
  Add external/clang/lib/Headers as llvm-rs-cc's system header search path
2011-01-19 12:05:32 -08:00
Ying Wang
df3a8ab5aa am 85aa5ded: Add external/clang/lib/Headers as llvm-rs-cc\'s system header search path
* commit '85aa5ded4ca0338f7c0c8d4256143364ca2cea38':
  Add external/clang/lib/Headers as llvm-rs-cc's system header search path
2011-01-19 12:03:22 -08:00
Ying Wang
85aa5ded4c Add external/clang/lib/Headers as llvm-rs-cc's system header search path
Change-Id: I30257631d484491d9a8346205e411013c76c5a91
Bug: 2943524
2011-01-19 11:50:09 -08:00
Kristian Monsen
b3acbc3195 am def863f7: am da7575bc: Making more space for libwebcore.so
* commit 'def863f719be1a6a1f4725b77f64df2f2526584b':
  Making more space for libwebcore.so
2011-01-19 03:24:54 -08:00
Kristian Monsen
def863f719 am da7575bc: Making more space for libwebcore.so
* commit 'da7575bc70ace95aba75f40f79ed46b4ab1a9913':
  Making more space for libwebcore.so
2011-01-19 03:22:36 -08:00
Rebecca Schultz Zavin
88005e9746 am 1ec15e1e: am d64f0edd: Merge "Include batch in legacy prebuilts with tcmd and ftmipcd." into honeycomb
* commit '1ec15e1e837212f1e90e0b1b52b05f35a8024c94':
  Include batch in legacy prebuilts with tcmd and ftmipcd.
2011-01-18 21:52:44 -08:00
Kristian Monsen
da7575bc70 Making more space for libwebcore.so
Taking half the space of libexpat.so and libbinder.so so there
is still room to grow (webkit mergers tend to make libwebcore
larger)

Change-Id: I6d5bf385221c8e199e587c3a7c8c9425a15a5bb6
2011-01-18 22:02:11 +00:00
Rebecca Schultz Zavin
1ec15e1e83 am d64f0edd: Merge "Include batch in legacy prebuilts with tcmd and ftmipcd." into honeycomb
* commit 'd64f0edd649880cb7de769f0f373ddf520dd22d3':
  Include batch in legacy prebuilts with tcmd and ftmipcd.
2011-01-18 13:48:42 -08:00
Rebecca Schultz Zavin
d64f0edd64 Merge "Include batch in legacy prebuilts with tcmd and ftmipcd." into honeycomb 2011-01-18 13:46:47 -08:00
James Wilson
4e74e30a6a Include batch in legacy prebuilts with tcmd and ftmipcd.
Change-Id: Iad6d7974bfadd3467270033f982de0642657d472
Signed-off-by: James Wilson <james.wilson@motorola.com>
2011-01-18 13:40:05 -08:00
Shih-wei Liao
3ed1dd8af0 am 500c0537: am 10aab0ef: Merge "Remove libbcc and libLLVM* from the grand-fathered modules." into honeycomb
* commit '500c053777494927929999d48df6aa5b01847ec8':
  Remove libbcc and libLLVM* from the grand-fathered modules.
2011-01-18 11:18:27 -08:00
Shih-wei Liao
500c053777 am 10aab0ef: Merge "Remove libbcc and libLLVM* from the grand-fathered modules." into honeycomb
* commit '10aab0ef97efc626c5bb2b239061a38924fc6a13':
  Remove libbcc and libLLVM* from the grand-fathered modules.
2011-01-18 11:15:36 -08:00
Shih-wei Liao
10aab0ef97 Merge "Remove libbcc and libLLVM* from the grand-fathered modules." into honeycomb 2011-01-18 11:04:00 -08:00
Ying Wang
b346a7e4fd am fa2aca54: am 4162f45c: Merge "Don\'t increase image sizes for the release tools." into honeycomb
* commit 'fa2aca54b215c51e4d5cf21f1e16b26adbbe57d2':
  Don't increase image sizes for the release tools.
2011-01-18 09:56:20 -08:00
Ying Wang
fa2aca54b2 am 4162f45c: Merge "Don\'t increase image sizes for the release tools." into honeycomb
* commit '4162f45c90c083b55b8c8d134faad6e1817ea960':
  Don't increase image sizes for the release tools.
2011-01-18 09:54:53 -08:00
Ying Wang
4162f45c90 Merge "Don't increase image sizes for the release tools." into honeycomb 2011-01-18 09:52:07 -08:00
Shih-wei Liao
0c71bf7ac6 Remove libbcc and libLLVM* from the grand-fathered modules.
Change-Id: I7030cdbe6e51c42a4053d7ab8a47a705bff72be7
2011-01-17 01:13:42 -08:00
Dianne Hackborn
1ff250d486 am a24ed68e: am 68404ba4: Bump API version up to 10, thus resource version up to 11.
* commit 'a24ed68eee3465565a8d1251e7339eadecc2969a':
  Bump API version up to 10, thus resource version up to 11.
2011-01-16 22:59:26 -08:00
Dianne Hackborn
a24ed68eee am 68404ba4: Bump API version up to 10, thus resource version up to 11.
* commit '68404ba40ef52b7c5da5425fd51f99ae3434bfa0':
  Bump API version up to 10, thus resource version up to 11.
2011-01-16 12:46:03 -08:00
Dianne Hackborn
68404ba40e Bump API version up to 10, thus resource version up to 11.
Change-Id: I305999c2ff71cc5985d0fc50e496c40e789d3af0
2011-01-16 11:07:28 -08:00
Jesse Wilson
aea85c1f9b Merge "Move apache-xml to external. (project 3 of 4)" 2011-01-14 16:22:26 -08:00
Jean-Baptiste Queru
163c718228 am 4125d8ee: am a4781e86: Merge from open-source gingerbread
* commit '4125d8ee68bec37fe471faeca7dfade73a7a1592':
  CTS: pass vogar expectation location to CollectAllTests.
2011-01-14 13:44:17 -08:00
Jean-Baptiste Queru
4125d8ee68 am a4781e86: Merge from open-source gingerbread
* commit 'a4781e867f2e9115ce5b8085576bebf6505bfd00':
  CTS: pass vogar expectation location to CollectAllTests.
2011-01-14 13:43:02 -08:00
Jean-Baptiste Queru
a4781e867f Merge from open-source gingerbread
Change-Id: I7dce3075bab5831b48a66ef43a32a2be82eda19a
2011-01-14 13:27:48 -08:00
Ying Wang
008367111e Don't increase image sizes for the release tools.
So it keeps consistent with the command run in the makefile.

Change-Id: Id26fa3387aa9bbab88c4ef3fbd26aff0d039c2e1
2011-01-14 11:30:56 -08:00
Jesse Wilson
7eff81df2a Move apache-xml to external. (project 3 of 4)
Change-Id: Ib65348e4203e6ac653e9fe81369b21dad06b5b58
http://b/3351604
2011-01-13 17:21:58 -08:00
Raphael
d3e6fcbe6c Add llvm-rs-cc to the tools buildable under Windows.
To be able to "make llvm-rs-cc" as a Windows SDK tool, we
first need to let the build system know which folders can be
built.

Once this is done, building can be done using the mingw32
package to do cross-compiling under Linux:
  $ USE_MINGW=1 make llvm-rs-cc

Change-Id: I5538f4c52c74dad18dd50b59c9bdbcd6de3fd191
2011-01-12 13:33:04 -08:00
Ying Wang
94978cf495 Disable dexpreopt for unbundled build.
Change-Id: Iad0cc41cfad2533703a0dddad743720c43ddb667
2011-01-12 11:12:06 -08:00
Brett Chabot
fdb400cf20 CTS: pass vogar expectation location to CollectAllTests.
Bug 3181338

Change-Id: I740ab73bee39975ad859b5e11b987ca74fd42658
2011-01-07 16:19:02 -08:00