Commit Graph

3921 Commits

Author SHA1 Message Date
Doug Zongker e128cbda07 check syntax of description field in logtags files
EventLog.java checks that the field descriptions are bracketed by
parens, so we should to in order to avoid a runtime error from a
logtag entry with bad syntax.

Bug: 3381309
Change-Id: I1d4cbb190da6b81ec0b1f1de9b5bc3f3394d7ec1
2011-01-23 12:57:19 -08:00
Ed Heyl 7838fa6e9c am 1d4e3fde: (-s ours) am 7e1ce27c: Merge commit \'50738779\' into gingerbread-plus-aosp
* commit '1d4e3fdeb4d31c12e0d533eb50e335691a4956dc':
  DO NOT MERGE Fix issue #3373438: Update GBMR versions
2011-01-21 17:44:01 -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
Amith Yamasani e183a52062 am 9bb0fd94: am 1fd97c38: Clean the build.prop so that default notification sound is set properly.
* commit '9bb0fd945f1de27712e540ce425fa5fd48ebf236':
  Clean the build.prop so that default notification sound is set properly.
2011-01-21 14:53:45 -08:00
Amith Yamasani 9bb0fd945f am 1fd97c38: Clean the build.prop so that default notification sound is set properly.
* commit '1fd97c38b00786c61e7befb709a008c214988023':
  Clean the build.prop so that default notification sound is set properly.
2011-01-21 14:51:41 -08:00
Eric Fischer 59ef5747bf am e6e583ff: am 7dfc1270: am 54a6b731: Merge "Flesh out the languages_full list with recently added locales." into gingerbread
* commit 'e6e583ffab4fd272ceb0c190223dd9e710336542':
  Flesh out the languages_full list with recently added locales.
2011-01-21 14:40:26 -08:00
Eric Fischer e6e583ffab am 7dfc1270: am 54a6b731: Merge "Flesh out the languages_full list with recently added locales." into gingerbread
* commit '7dfc1270967c96be6dcd58fb7770c07482a7e90d':
  Flesh out the languages_full list with recently added locales.
2011-01-21 14:37:20 -08:00
Amith Yamasani 1fd97c38b0 Clean the build.prop so that default notification sound is set properly.
Bug: 3349429
Change-Id: I44450a4cc9acdeffa42340c61088a5964fa6ee0d
2011-01-21 13:59:53 -08:00
Jean-Baptiste Queru 57411a5ef1 am 43b1bb5b: (-s ours) (Re-)Set version names for AOSP master - do not merge
* commit '43b1bb5be1e43ad8d430540e395c2216ace6c2a4':
  (Re-)Set version names for AOSP master - do not merge
2011-01-21 11:01:47 -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
Michael Chan e1e5c2fdd3 am 87762c7e: am b43ac8fc: Fix build break
* commit '87762c7e1f5473b8ff51c2cf30d3d5c47d67642a':
  Fix build break
2011-01-19 21:21:10 -08:00
Michael Chan 87762c7e1f am b43ac8fc: Fix build break
* commit 'b43ac8fc2fbb3530212a613108c2492969e33146':
  Fix build break
2011-01-19 21:19:39 -08:00
Michael Chan b43ac8fc2f Fix build break
Change-Id: Ie07f042a9f25bf3329cf2cea8fdeea3e208da775
2011-01-19 21:12:41 -08:00
Ken Sumrall 2eef425167 am 77b01a8c: am 6f2f23a4: Merge "Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer" into honeycomb
* commit '77b01a8c2230a7467979d8ab56c0a65c1d6b0640':
  Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer
2011-01-19 17:47:08 -08:00
Ken Sumrall 77b01a8c22 am 6f2f23a4: Merge "Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer" into honeycomb
* commit '6f2f23a46f077213ff2f984a6b55e9672560289f':
  Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer
2011-01-19 17:39:46 -08:00
Ken Sumrall 6f2f23a46f Merge "Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer" into honeycomb 2011-01-19 17:35:30 -08:00
Ken Sumrall a67616acfd Teach the build system to reserve the last 16 Kbytes of /data for the crypto footer
If making /data and it's an EMMC interface, reserve the last 16 Kbytes
of the partition for the crypto footer.

Change-Id: Ia2c0bb53a545f074e79fc9d6ac04faee75fb9be4
2011-01-19 17:14:51 -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
Ying Wang 611a4b25c1 am 04a4d9ad: am 04e1f31d: Move videoeditor libraries to generic_no_telephony.mk.
* commit '04a4d9ade8c3ac18476c0f5a934e4efc6365fee8':
  Move videoeditor libraries to generic_no_telephony.mk.
2011-01-19 10:35:02 -08:00
Ying Wang 04a4d9ade8 am 04e1f31d: Move videoeditor libraries to generic_no_telephony.mk.
* commit '04e1f31dfdf7511cb8f5dbdf0376651fbb783fa2':
  Move videoeditor libraries to generic_no_telephony.mk.
2011-01-19 10:33:12 -08:00
Ying Wang 04e1f31dfd Move videoeditor libraries to generic_no_telephony.mk.
Change-Id: I8ea2058b79ccfda3114ba64b4e43c175a0fe086c
2011-01-19 10:28:05 -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
Eric Fischer 7dfc127096 am 54a6b731: Merge "Flesh out the languages_full list with recently added locales." into gingerbread
* commit '54a6b731da4029237410f04c1b6cb9b64bf2783f':
  Flesh out the languages_full list with recently added locales.
2011-01-18 15:35:46 -08:00
Eric Fischer 54a6b731da Merge "Flesh out the languages_full list with recently added locales." into gingerbread 2011-01-18 15:33:39 -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
Xavier Ducrohet e9d77db619 am 155776bf: am a17fe58b: Update SDK app list.
* commit '155776bf06ece56db27abf84da9cbe5260c2cf36':
  Update SDK app list.
2011-01-18 10:22:48 -08:00
Xavier Ducrohet 155776bf06 am a17fe58b: Update SDK app list.
* commit 'a17fe58b4662a49213250aa988f3ad446b92a6d4':
  Update SDK app list.
2011-01-18 10:20:22 -08:00
Xavier Ducrohet a17fe58b46 Update SDK app list.
Change-Id: I1a99b0bd716f90688aea9b9db20e393a91ad8ad2
2011-01-18 10:10:32 -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
Xavier Ducrohet 7bfa4a352e am 0e581c25: am aafe93b1: Merge "Add librs_jni to the sdk product packages." into honeycomb
* commit '0e581c25d44afdf619e1903a5b471df7a69c073f':
  Add librs_jni to the sdk product packages.
2011-01-18 09:54:23 -08:00
Xavier Ducrohet 0e581c25d4 am aafe93b1: Merge "Add librs_jni to the sdk product packages." into honeycomb
* commit 'aafe93b14b7980c8569080f24212c252d9e74dd7':
  Add librs_jni to the sdk product packages.
2011-01-18 09:52:58 -08:00