OSDN Git Service
Jean-Baptiste Queru [Wed, 8 Sep 2010 22:51:24 +0000 (15:51 -0700)]
am
0dda5a19: (-s ours) a few more existing user modules to be grandfathered in - DO NOT MERGE
Merge commit '
0dda5a191df021a13c91d42109d55f4434b2c5da'
* commit '
0dda5a191df021a13c91d42109d55f4434b2c5da':
a few more existing user modules to be grandfathered in - DO NOT MERGE
Jean-Baptiste Queru [Wed, 8 Sep 2010 22:45:21 +0000 (15:45 -0700)]
more modules with user tags that need to br grandfathered in
Change-Id: Iad72076094d028499bac516271fd422c4b15cb92
Jean-Baptiste Queru [Wed, 8 Sep 2010 22:45:21 +0000 (15:45 -0700)]
one more module grandfathered with a user tag
Change-Id: I22d60c33df06cfe0bfd2041a611c762e6e662c94
Jean-Baptiste Queru [Wed, 8 Sep 2010 19:18:04 +0000 (12:18 -0700)]
a few more existing user modules to be grandfathered in - DO NOT MERGE
Change-Id: Ie50faf26b5db9ac3c46f50da8c48c6132d4f2d1b
Jean-Baptiste Queru [Wed, 8 Sep 2010 21:38:06 +0000 (14:38 -0700)]
am
b81c3989: (-s ours) am
22e620c4: a few more existing user modules to be grandfathered in - DO NOT MERGE
Merge commit '
b81c3989cbb7c94e28d05434c434a62fbf029cb8'
* commit '
b81c3989cbb7c94e28d05434c434a62fbf029cb8':
a few more existing user modules to be grandfathered in - DO NOT MERGE
Dan Bornstein [Wed, 8 Sep 2010 21:38:03 +0000 (14:38 -0700)]
am
3177afa8: am
ca917dc2: Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread
Merge commit '
3177afa8177d8b31dd6bd160816a11fedeec7e07'
* commit '
3177afa8177d8b31dd6bd160816a11fedeec7e07':
Enable WITH_HOST_DALVIK for "user" builds on Linux.
Jean-Baptiste Queru [Wed, 8 Sep 2010 21:34:47 +0000 (14:34 -0700)]
am
22e620c4: a few more existing user modules to be grandfathered in - DO NOT MERGE
Merge commit '
22e620c4bed8c60361c02820cda4dfaafe83ebe5' into gingerbread-plus-aosp
* commit '
22e620c4bed8c60361c02820cda4dfaafe83ebe5':
a few more existing user modules to be grandfathered in - DO NOT MERGE
Dan Bornstein [Wed, 8 Sep 2010 21:34:21 +0000 (14:34 -0700)]
am
ca917dc2: Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread
Merge commit '
ca917dc2b2140b9fc4e331f94907cd27c8b6a91f' into gingerbread-plus-aosp
* commit '
ca917dc2b2140b9fc4e331f94907cd27c8b6a91f':
Enable WITH_HOST_DALVIK for "user" builds on Linux.
Jean-Baptiste Queru [Wed, 8 Sep 2010 19:18:04 +0000 (12:18 -0700)]
a few more existing user modules to be grandfathered in - DO NOT MERGE
Change-Id: I5f4c9f9ac948c2ba6865eae7dca2c0ed4d10702b
Jean-Baptiste Queru [Wed, 8 Sep 2010 21:08:45 +0000 (14:08 -0700)]
Merge "Warn when new modules are found that use user tags"
Jean-Baptiste Queru [Wed, 8 Sep 2010 20:14:04 +0000 (13:14 -0700)]
am
130b539b: (-s ours) am
890ef4b0: a few more existing user modules to be grandfathered in - DO NOT MERGE
Merge commit '
130b539bfdda612dd3858b407c503c3e80d9aa72'
* commit '
130b539bfdda612dd3858b407c503c3e80d9aa72':
a few more existing user modules to be grandfathered in - DO NOT MERGE
Jean-Baptiste Queru [Wed, 8 Sep 2010 20:13:58 +0000 (13:13 -0700)]
am
78a59022: (-s ours) a few more grandfathered user tags - DO NOT MERGE
Merge commit '
78a59022f89a65f5e7107d57f4995c1eb70e1fb2'
* commit '
78a59022f89a65f5e7107d57f4995c1eb70e1fb2':
a few more grandfathered user tags - DO NOT MERGE
Jean-Baptiste Queru [Fri, 3 Sep 2010 23:32:58 +0000 (16:32 -0700)]
Warn when new modules are found that use user tags
Change-Id: I49369cc1596f269e0964f0a6a88bcc7152209bde
Dan Bornstein [Wed, 8 Sep 2010 19:37:11 +0000 (12:37 -0700)]
Merge "Enable WITH_HOST_DALVIK for "user" builds on Linux." into gingerbread
Jeff Hamilton [Wed, 8 Sep 2010 19:31:10 +0000 (12:31 -0700)]
Merge "Add more cleanspecs for the property files, fixing ro.secure."
Jeff Hamilton [Wed, 8 Sep 2010 19:26:13 +0000 (14:26 -0500)]
Add more cleanspecs for the property files, fixing ro.secure.
Change-Id: Iae47959c25ca9779df7679528d1d61ebd3c48b50
Jean-Baptiste Queru [Wed, 8 Sep 2010 19:21:43 +0000 (12:21 -0700)]
am
890ef4b0: a few more existing user modules to be grandfathered in - DO NOT MERGE
Merge commit '
890ef4b0aaa602b3f7bcee87bb4d89e6aaa53b48' into gingerbread-plus-aosp
* commit '
890ef4b0aaa602b3f7bcee87bb4d89e6aaa53b48':
a few more existing user modules to be grandfathered in - DO NOT MERGE
Jean-Baptiste Queru [Wed, 8 Sep 2010 19:18:04 +0000 (12:18 -0700)]
a few more existing user modules to be grandfathered in - DO NOT MERGE
Change-Id: I7526ad40f27853a2f83bc0c4c4f80ff709fcaf40
Jean-Baptiste Queru [Wed, 8 Sep 2010 19:11:54 +0000 (12:11 -0700)]
a few more grandfathered user tags - DO NOT MERGE
Change-Id: Ia625817d3f332f8760835b3fa20e56c00c305166
Dan Bornstein [Wed, 8 Sep 2010 00:45:44 +0000 (17:45 -0700)]
Enable WITH_HOST_DALVIK for "user" builds on Linux.
Bug:
2497274
Change-Id: I636895b52c82f301f8c288ae670b34e1dbf32cc5
Jean-Baptiste Queru [Wed, 8 Sep 2010 17:38:19 +0000 (10:38 -0700)]
am
6b747cfb: (-s ours) am
a90f9d2c: Merge "Warn when new modules are found that use user tags - DO NOT MERGE" into gingerbread
Merge commit '
6b747cfb21e270598c0d1bf1923c4da768a676a8'
* commit '
6b747cfb21e270598c0d1bf1923c4da768a676a8':
Warn when new modules are found that use user tags - DO NOT MERGE
Jean-Baptiste Queru [Wed, 8 Sep 2010 17:32:52 +0000 (10:32 -0700)]
am
a90f9d2c: Merge "Warn when new modules are found that use user tags - DO NOT MERGE" into gingerbread
Merge commit '
a90f9d2c299d7833b37f8a0e244a2893054d9ea5' into gingerbread-plus-aosp
* commit '
a90f9d2c299d7833b37f8a0e244a2893054d9ea5':
Warn when new modules are found that use user tags - DO NOT MERGE
Jean-Baptiste Queru [Wed, 8 Sep 2010 17:22:48 +0000 (10:22 -0700)]
Merge "Warn when new modules are found that use user tags - DO NOT MERGE" into gingerbread
Jean-Baptiste Queru [Tue, 7 Sep 2010 18:56:45 +0000 (11:56 -0700)]
am
49da72c2: am
dff3c597: cleanspec for corrupted build.prop
Merge commit '
49da72c25abeb36fc5d9a1c786ee3f232cfc7682'
* commit '
49da72c25abeb36fc5d9a1c786ee3f232cfc7682':
cleanspec for corrupted build.prop
Jean-Baptiste Queru [Tue, 7 Sep 2010 18:21:26 +0000 (11:21 -0700)]
am
dff3c597: cleanspec for corrupted build.prop
Merge commit '
dff3c59702392c2ed37b26b115c5cd0ed0498903' into gingerbread-plus-aosp
* commit '
dff3c59702392c2ed37b26b115c5cd0ed0498903':
cleanspec for corrupted build.prop
Jean-Baptiste Queru [Tue, 7 Sep 2010 18:18:09 +0000 (11:18 -0700)]
cleanspec for corrupted build.prop
Change-Id: Ib8d6719af92759272ae25607862391647dfe408d
Jean-Baptiste Queru [Tue, 7 Sep 2010 17:56:53 +0000 (10:56 -0700)]
am
8f731bb2: am
0545c916: Revert "Allow properties with spaces in their values"
Merge commit '
8f731bb2720475f652cc8c5849d564246b234bef'
* commit '
8f731bb2720475f652cc8c5849d564246b234bef':
Revert "Allow properties with spaces in their values"
Jean-Baptiste Queru [Tue, 7 Sep 2010 17:53:46 +0000 (10:53 -0700)]
am
0545c916: Revert "Allow properties with spaces in their values"
Merge commit '
0545c9160d0d3dde4675184609cc7656de5558b0' into gingerbread-plus-aosp
* commit '
0545c9160d0d3dde4675184609cc7656de5558b0':
Revert "Allow properties with spaces in their values"
Jean-Baptiste Queru [Tue, 7 Sep 2010 17:51:12 +0000 (10:51 -0700)]
Revert "Allow properties with spaces in their values"
This reverts commit
de3bfade571033b01fbaccac2f0fdf7193e8d3ee.
Ying Wang [Tue, 7 Sep 2010 17:32:32 +0000 (10:32 -0700)]
am
30d68a3b: (-s ours) am
817f07ae: Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
Merge commit '
30d68a3b9df5657ca0eefb063551202490a836fb'
* commit '
30d68a3b9df5657ca0eefb063551202490a836fb':
Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
Ying Wang [Tue, 7 Sep 2010 17:29:34 +0000 (10:29 -0700)]
am
817f07ae: Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
Merge commit '
817f07aef008dd3f32fed3603382123917fdec64' into gingerbread-plus-aosp
* commit '
817f07aef008dd3f32fed3603382123917fdec64':
Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
Ying Wang [Tue, 7 Sep 2010 17:26:18 +0000 (10:26 -0700)]
Fix the unstripped path if LOCAL_MODULE_PATH is set. DO NOT MERGE
Cherry-pick from master.
Change-Id: I0a56e3e91efd53ad2671136b6fe00ee675f56230
Ying Wang [Tue, 7 Sep 2010 17:20:19 +0000 (10:20 -0700)]
Merge "Fix the unstripped path if LOCAL_MODULE_PATH is set."
Jean-Baptiste Queru [Fri, 3 Sep 2010 23:32:58 +0000 (16:32 -0700)]
Warn when new modules are found that use user tags - DO NOT MERGE
Change-Id: Ia563765f3d0161d7c851a0162d65c2a249b4dd38
Ying Wang [Fri, 3 Sep 2010 23:22:47 +0000 (16:22 -0700)]
Fix the unstripped path if LOCAL_MODULE_PATH is set.
Bug:
2953067
Change-Id: I12a0bdb1f3df4fa98bea70f60e0ce26bf863c924
Doug Zongker [Fri, 3 Sep 2010 21:35:49 +0000 (14:35 -0700)]
am
9314823c: am
93d574f8: Merge "return to using subprocess for running commands" into gingerbread
Merge commit '
9314823c06d4434bf18d589c2fdea490428becf8'
* commit '
9314823c06d4434bf18d589c2fdea490428becf8':
return to using subprocess for running commands
Doug Zongker [Fri, 3 Sep 2010 21:33:22 +0000 (14:33 -0700)]
am
93d574f8: Merge "return to using subprocess for running commands" into gingerbread
Merge commit '
93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9' into gingerbread-plus-aosp
* commit '
93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9':
return to using subprocess for running commands
Doug Zongker [Fri, 3 Sep 2010 21:31:03 +0000 (14:31 -0700)]
Merge "return to using subprocess for running commands" into gingerbread
Doug Zongker [Fri, 3 Sep 2010 21:15:34 +0000 (14:15 -0700)]
return to using subprocess for running commands
Reverts Ic4f1c747 and fixes the problem by splitting the extra_flags
argument (it wasn't working before because it was getting one argument
"-c 4096 -s 128" instead of four arguments "-c", "4096", "-s", "128"
and mkyaffs2image apparently just ignores that bogus argument?)
Change-Id: Ib1e08d634aa68bfab0f7e09680d407f2cee0797d
Doug Zongker [Fri, 3 Sep 2010 20:22:38 +0000 (13:22 -0700)]
resolved conflicts for merge of
a4a50996 to master
Change-Id: I52c617ff43aaf9e86b8fb7a2e9c305127566971a
Doug Zongker [Fri, 3 Sep 2010 19:39:15 +0000 (12:39 -0700)]
am
c637db16: remove remaining amend support
Merge commit '
c637db16d83b2c248b1cf0122e2ba558ed95762c' into gingerbread-plus-aosp
* commit '
c637db16d83b2c248b1cf0122e2ba558ed95762c':
remove remaining amend support
Doug Zongker [Wed, 21 Apr 2010 21:08:44 +0000 (14:08 -0700)]
remove remaining amend support
Remove the remaining (unused and untested) support for generating
amend scripts. This means that you won't be able to OTA directly from
cupcake to gingerbread.
Change-Id: Iaf5295db92a42b336960d05295f48b67cb729337
Joe Onorato [Fri, 3 Sep 2010 17:36:46 +0000 (10:36 -0700)]
am
4b1e2245: am
c5b8d4ce: Merge "The old clean target had bit rotted." into gingerbread
Merge commit '
4b1e2245857d696aa0dfcd7a163c6d04025c74f6'
* commit '
4b1e2245857d696aa0dfcd7a163c6d04025c74f6':
The old clean target had bit rotted.
Ying Wang [Fri, 3 Sep 2010 17:36:41 +0000 (10:36 -0700)]
am
a79db6e4: am
3dae0ee4: Fix inherited dependency when instrmentation.
Merge commit '
a79db6e47a378cb089021a56637a9c6925f14261'
* commit '
a79db6e47a378cb089021a56637a9c6925f14261':
Fix inherited dependency when instrmentation.
Joe Onorato [Fri, 3 Sep 2010 17:28:00 +0000 (10:28 -0700)]
am
c5b8d4ce: Merge "The old clean target had bit rotted." into gingerbread
Merge commit '
c5b8d4ceb63909e5f0811fa80dca205996fd8644' into gingerbread-plus-aosp
* commit '
c5b8d4ceb63909e5f0811fa80dca205996fd8644':
The old clean target had bit rotted.
Joe Onorato [Fri, 3 Sep 2010 17:26:04 +0000 (10:26 -0700)]
Merge "The old clean target had bit rotted." into gingerbread
Joe Onorato [Fri, 3 Sep 2010 17:25:11 +0000 (13:25 -0400)]
The old clean target had bit rotted.
Clean and clobber are now the same thing.
Change-Id: I4873d40496b16e13689e22c48cff1fecdffb8b40
Ying Wang [Fri, 3 Sep 2010 17:21:37 +0000 (10:21 -0700)]
am
3dae0ee4: Fix inherited dependency when instrmentation.
Merge commit '
3dae0ee46cf5fcde6eb424f9ab0c69f2d901a671' into gingerbread-plus-aosp
* commit '
3dae0ee46cf5fcde6eb424f9ab0c69f2d901a671':
Fix inherited dependency when instrmentation.
Ying Wang [Thu, 2 Sep 2010 22:41:01 +0000 (15:41 -0700)]
Fix inherited dependency when instrmentation.
It turns out we should also LOCAL_INSTRUMENTATION_FOR.
To disambiguate LOCAL_INSTRUMENTATION_FOR_PACKAGE_NAME is renamed to LOCAL_MANIFEST_INSTRUMENTATION_FOR.
Bug:
2902591
Change-Id: I6cb893c135736fc4170aa2259105b4c5eea798a1
Jean-Baptiste Queru [Fri, 3 Sep 2010 00:15:29 +0000 (17:15 -0700)]
am
54b8b436: am
de3bfade: Allow properties with spaces in their values
Merge commit '
54b8b436a380b053772110796642c7e5e6ba8e64'
* commit '
54b8b436a380b053772110796642c7e5e6ba8e64':
Allow properties with spaces in their values
Jean-Baptiste Queru [Fri, 3 Sep 2010 00:13:24 +0000 (17:13 -0700)]
am
de3bfade: Allow properties with spaces in their values
Merge commit '
de3bfade571033b01fbaccac2f0fdf7193e8d3ee' into gingerbread-plus-aosp
* commit '
de3bfade571033b01fbaccac2f0fdf7193e8d3ee':
Allow properties with spaces in their values
Jean-Baptiste Queru [Thu, 2 Sep 2010 21:30:56 +0000 (14:30 -0700)]
Allow properties with spaces in their values
This way, such properties can be set in product definition files
instead of having to live in system.prop, which eliminates the need
for system.prop
Change-Id: I25d9665f65436df8215940e46380deb31b8161ba
Ying Wang [Thu, 2 Sep 2010 17:52:32 +0000 (10:52 -0700)]
am
dda34f53: am
42f40659: Merge "Disable new longjmp in glibc 2.11 and later."
Merge commit '
dda34f535d01518e44564a9cde525b768042cf90'
* commit '
dda34f535d01518e44564a9cde525b768042cf90':
Disable new longjmp in glibc 2.11 and later.
Ying Wang [Thu, 2 Sep 2010 17:52:29 +0000 (10:52 -0700)]
am
2e1347c6: am
fb644881: Disable new longjmp in glibc 2.11 and later.
Merge commit '
2e1347c6a010c51c9ec80fd312465c1c23666ab2'
* commit '
2e1347c6a010c51c9ec80fd312465c1c23666ab2':
Disable new longjmp in glibc 2.11 and later.
Ying Wang [Thu, 2 Sep 2010 16:58:58 +0000 (09:58 -0700)]
am
42f40659: Merge "Disable new longjmp in glibc 2.11 and later."
Merge commit '
42f406593e7fb1124e6aa00cc060e421d5a53554' into gingerbread-plus-aosp
* commit '
42f406593e7fb1124e6aa00cc060e421d5a53554':
Disable new longjmp in glibc 2.11 and later.
Ying Wang [Thu, 2 Sep 2010 16:45:11 +0000 (09:45 -0700)]
am
fb644881: Disable new longjmp in glibc 2.11 and later.
Merge commit '
fb644881b6083aa0d9d15e7aad8bfa5a429b1c37' into gingerbread-plus-aosp
* commit '
fb644881b6083aa0d9d15e7aad8bfa5a429b1c37':
Disable new longjmp in glibc 2.11 and later.
Ying Wang [Thu, 2 Sep 2010 16:44:39 +0000 (09:44 -0700)]
Merge "Disable new longjmp in glibc 2.11 and later."
Ying Wang [Wed, 1 Sep 2010 23:56:25 +0000 (16:56 -0700)]
Disable new longjmp in glibc 2.11 and later.
Bug:
2967937
Change-Id: I7a5ef082502192f41c26a48632edfe775dea7648
Ying Wang [Wed, 1 Sep 2010 23:39:11 +0000 (16:39 -0700)]
Disable new longjmp in glibc 2.11 and later.
Bug:
2967937
Change-Id: I4e2a5f806ad45a01ca7f8c4d032cd29fce1d794d
Ying Wang [Wed, 1 Sep 2010 21:47:54 +0000 (14:47 -0700)]
Merge "Now slang supports "-I" options."
Ying Wang [Wed, 1 Sep 2010 20:28:52 +0000 (13:28 -0700)]
Now slang supports "-I" options.
Change-Id: I32aef6c913d9d30f9982a593397145f1562aecf9
Joe Onorato [Wed, 1 Sep 2010 17:39:50 +0000 (10:39 -0700)]
Make it so if you say LOCAL_UNINSTALLABLE_MODULE := true for a docs build, it won't try to dist it.
Change-Id: Iff8a7b6438d392c5b4c425337b84cfa9bc90f282
Jean-Baptiste Queru [Wed, 1 Sep 2010 13:33:19 +0000 (06:33 -0700)]
manual merge
Change-Id: Iafb6e494f28050c960185656d4d630a6c27b6efe
Jean-Baptiste Queru [Wed, 1 Sep 2010 13:23:50 +0000 (06:23 -0700)]
am
85fd5030: Revert "Fixed problem with keymap files copied to target"
Merge commit '
85fd5030b11d412f345b0ed039aa9912c7973aea' into gingerbread-plus-aosp
* commit '
85fd5030b11d412f345b0ed039aa9912c7973aea':
Revert "Fixed problem with keymap files copied to target"
Jean-Baptiste Queru [Wed, 1 Sep 2010 13:10:40 +0000 (06:10 -0700)]
Revert "Fixed problem with keymap files copied to target"
This reverts commit
c90449f2a88ceb44db5333b5442fc00fa4d0e4dd.
Dirk Dougherty [Tue, 31 Aug 2010 22:14:14 +0000 (15:14 -0700)]
Merge "Remove droiddoc/templates dir in favor of templates-sdk, move Android-specific assets to templates-sdk, add copies to templates-pdk as workaround."
Jean-Baptiste Queru [Tue, 31 Aug 2010 22:10:43 +0000 (15:10 -0700)]
am
8abb5cc1: am
a160e316: Merge "Fixed problem with keymap files copied to target"
Merge commit '
8abb5cc10f295940e6706c72e2e0c93bf0de01e8'
* commit '
8abb5cc10f295940e6706c72e2e0c93bf0de01e8':
Fixed problem with keymap files copied to target
Jean-Baptiste Queru [Tue, 31 Aug 2010 22:04:01 +0000 (15:04 -0700)]
am
a160e316: Merge "Fixed problem with keymap files copied to target"
Merge commit '
a160e3169e6624610fd05b2edd14b674ffb54e44' into gingerbread-plus-aosp
* commit '
a160e3169e6624610fd05b2edd14b674ffb54e44':
Fixed problem with keymap files copied to target
Jean-Baptiste Queru [Tue, 31 Aug 2010 21:52:54 +0000 (14:52 -0700)]
Merge "Fixed problem with keymap files copied to target"
Joe Onorato [Tue, 31 Aug 2010 20:12:56 +0000 (13:12 -0700)]
Joe Onorato [Tue, 31 Aug 2010 20:00:56 +0000 (13:00 -0700)]
am
cd7c775e: fix the build still
Merge commit '
cd7c775ece6854765ae3208818e76d9d11724713' into gingerbread-plus-aosp
* commit '
cd7c775ece6854765ae3208818e76d9d11724713':
fix the build still
Joe Onorato [Tue, 31 Aug 2010 19:56:49 +0000 (12:56 -0700)]
fix the build still
Change-Id: I2bfbcdd4b463549f3f331ac7a1c7fa89aadef1a8
Joe Onorato [Tue, 31 Aug 2010 19:16:51 +0000 (12:16 -0700)]
am
0f9a91c9: (-s ours) am
0ee89a72: DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit '
0f9a91c94fa9f3b0082744efe2457528ef19fa62'
* commit '
0f9a91c94fa9f3b0082744efe2457528ef19fa62':
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Joe Onorato [Tue, 31 Aug 2010 19:12:17 +0000 (12:12 -0700)]
am
0ee89a72: DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Merge commit '
0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb' into gingerbread-plus-aosp
* commit '
0ee89a72d50ff4bc5c7d2a285cd799d3a8b48efb':
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Joe Onorato [Tue, 31 Aug 2010 18:27:25 +0000 (11:27 -0700)]
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
Change-Id: I886448a3126b81c19342d920669e050eb5ef20eb
Dirk Dougherty [Wed, 25 Aug 2010 22:07:39 +0000 (15:07 -0700)]
Remove droiddoc/templates dir in favor of templates-sdk, move Android-specific assets to templates-sdk, add copies to templates-pdk as workaround.
Change-Id: Iad7d0f1955e5731ee9cebb8828a45bf3c297417b
Andreas Huber [Mon, 30 Aug 2010 22:36:58 +0000 (15:36 -0700)]
resolved conflicts for merge of
f739e312 to master
Change-Id: I3be6dbc299d2d761c96a6f00958d9a4c018ec290
Andreas Huber [Mon, 30 Aug 2010 22:23:51 +0000 (15:23 -0700)]
am
a3989611: Cleanspec to make sure everything works consistently after turning off OpenCore.
Merge commit '
a39896119566a952647c392872c0ab99e9de7371' into gingerbread-plus-aosp
* commit '
a39896119566a952647c392872c0ab99e9de7371':
Cleanspec to make sure everything works consistently after turning off OpenCore.
Andreas Huber [Mon, 30 Aug 2010 21:17:14 +0000 (14:17 -0700)]
Cleanspec to make sure everything works consistently after turning off OpenCore.
Change-Id: Icf3ba66b8183e36247b4cfc623643e37f78d7144
related-to-bug:
2941153
Ying Wang [Mon, 30 Aug 2010 20:30:49 +0000 (13:30 -0700)]
am
a681bae5: am
9a8732fb: Link against Mac OSX 10.5 SDK if building on 10.6.
Merge commit '
a681bae5f6d2cc84d0ff54bb117ecd025062bbce'
* commit '
a681bae5f6d2cc84d0ff54bb117ecd025062bbce':
Link against Mac OSX 10.5 SDK if building on 10.6.
Andreas Huber [Mon, 30 Aug 2010 20:30:29 +0000 (13:30 -0700)]
am
aeb2bbc1: am
200f2598: Build without OpenCore by default, remove obsolete opt-in to stagefright.
Merge commit '
aeb2bbc140acfbaa8279f704fd7fc3f4d08c9486'
* commit '
aeb2bbc140acfbaa8279f704fd7fc3f4d08c9486':
Build without OpenCore by default, remove obsolete opt-in to stagefright.
Ying Wang [Mon, 30 Aug 2010 20:20:50 +0000 (13:20 -0700)]
am
9a8732fb: Link against Mac OSX 10.5 SDK if building on 10.6.
Merge commit '
9a8732fb6c6a569495e3695fc1e2b638de209beb' into gingerbread-plus-aosp
* commit '
9a8732fb6c6a569495e3695fc1e2b638de209beb':
Link against Mac OSX 10.5 SDK if building on 10.6.
Andreas Huber [Mon, 30 Aug 2010 20:06:50 +0000 (13:06 -0700)]
am
200f2598: Build without OpenCore by default, remove obsolete opt-in to stagefright.
Merge commit '
200f25984ccc8a9e5fc13bfbcde22c17bc80d410' into gingerbread-plus-aosp
* commit '
200f25984ccc8a9e5fc13bfbcde22c17bc80d410':
Build without OpenCore by default, remove obsolete opt-in to stagefright.
Andreas Huber [Mon, 30 Aug 2010 19:48:03 +0000 (12:48 -0700)]
Build without OpenCore by default, remove obsolete opt-in to stagefright.
Change-Id: I6e08d2136147f4e279f8a5b2b3837e4317faf27c
related-to-bug:
2941153
Ying Wang [Wed, 25 Aug 2010 01:33:22 +0000 (18:33 -0700)]
Link against Mac OSX 10.5 SDK if building on 10.6.
So that tools built on Snow Leopard (10.6) can be used on Leopard (10.5).
Change-Id: I99745ecbe2ad11feaae31d5be31c34c2e0ad7cc5
Magnus Karlsson [Mon, 30 Aug 2010 14:51:28 +0000 (16:51 +0200)]
Fixed problem with keymap files copied to target
Moved Android.mk and keymap files except AVRCP.kl from sdk/emulator/keymaps
to build/target/board/generic. This causes the keymap files to copied into
the system image of generic and sdk products, but not into the system image
of HW products. Originally the qwerty.kl was copied to target no matter
if the target had a qwerty keyboard or not, which is the case for e.g.
the Nexus One.
Change-Id: I7cd80497632fb3b9e7ce2f3a7888d4924a355f52
Raphael Moll [Sun, 29 Aug 2010 00:39:23 +0000 (17:39 -0700)]
am
2a1873b0: am
6ba4b59c: SDK: add hierarchyviewer2 to windows target list.
Merge commit '
2a1873b09c73700d4339f379f4389b26beb81173'
* commit '
2a1873b09c73700d4339f379f4389b26beb81173':
SDK: add hierarchyviewer2 to windows target list.
Raphael Moll [Sun, 29 Aug 2010 00:31:31 +0000 (17:31 -0700)]
am
6ba4b59c: SDK: add hierarchyviewer2 to windows target list.
Merge commit '
6ba4b59c9067b747ab2a4c85621e656c4d4614e3' into gingerbread-plus-aosp
* commit '
6ba4b59c9067b747ab2a4c85621e656c4d4614e3':
SDK: add hierarchyviewer2 to windows target list.
Raphael Moll [Sat, 28 Aug 2010 22:03:40 +0000 (15:03 -0700)]
SDK: add hierarchyviewer2 to windows target list.
Change-Id: I282173ab10930a716861f3774804d3d8484a71f3
Ying Wang [Fri, 27 Aug 2010 23:24:23 +0000 (16:24 -0700)]
Merge "Fix bug."
Ying Wang [Fri, 27 Aug 2010 23:18:15 +0000 (16:18 -0700)]
Fix bug.
Change-Id: I8bee35b7bb3fa0926f768d44a91cb45f76f224f9
Bug:
2957295
Ying Wang [Fri, 27 Aug 2010 22:52:03 +0000 (15:52 -0700)]
Iliyan Malchev [Fri, 27 Aug 2010 22:04:39 +0000 (15:04 -0700)]
Merge "Turn on ASLR by default. The "-a" option now takes an argument (on/off)."
Ying Wang [Fri, 27 Aug 2010 19:14:58 +0000 (12:14 -0700)]
am
cef82129: am
aa6dbe21: Try to fix system.img in update zip file.
Merge commit '
cef82129e1b2a26f883c20521d79175747eac434'
* commit '
cef82129e1b2a26f883c20521d79175747eac434':
Try to fix system.img in update zip file.
Bill Napier [Fri, 27 Aug 2010 17:10:52 +0000 (10:10 -0700)]
Merge "Revert "Fix MonkeyRunner SDK documentation generation.""
Bill Napier [Fri, 27 Aug 2010 16:58:29 +0000 (09:58 -0700)]
Revert "Fix MonkeyRunner SDK documentation generation."
This reverts commit
b47386bb270ec8f8f007d4fc9f7823530b74fdac.
Hristo Bojinov [Fri, 27 Aug 2010 16:32:21 +0000 (09:32 -0700)]
Merge "Increase the Retouch buffer size from 550,000 to 600,000"
Bill Napier [Fri, 27 Aug 2010 16:10:30 +0000 (09:10 -0700)]
Merge "Fix MonkeyRunner SDK documentation generation."
Steve Block [Fri, 27 Aug 2010 12:18:46 +0000 (13:18 +0100)]
Increase the Retouch buffer size from 550,000 to 600,000
The WebKit merge to r66079 built with JSC JavaScript engine triggers the
overflow.
Change-Id: Ifcb92aa019cfb0e7a93d667e15a792554fc0f676
Ying Wang [Thu, 26 Aug 2010 23:07:12 +0000 (16:07 -0700)]
am
ae553143: Refactor a bit.
Merge commit '
ae5531434877478985186dd0fb7ffefa12a74e52' into gingerbread-plus-aosp
* commit '
ae5531434877478985186dd0fb7ffefa12a74e52':
Refactor a bit.