Doug Zongker
93d574f8c5
Merge "return to using subprocess for running commands" into gingerbread
2010-09-03 14:31:03 -07:00
Doug Zongker
39a984550f
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
2010-09-03 14:15:34 -07:00
Doug Zongker
c637db16d8
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
2010-09-03 11:58:31 -07:00
Joe Onorato
c5b8d4ceb6
Merge "The old clean target had bit rotted." into gingerbread
2010-09-03 10:26:04 -07:00
Joe Onorato
dfc5e0cb7b
The old clean target had bit rotted.
...
Clean and clobber are now the same thing.
Change-Id: I4873d40496b16e13689e22c48cff1fecdffb8b40
2010-09-03 13:25:11 -04:00
Ying Wang
3dae0ee46c
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
2010-09-03 10:05:39 -07:00
Jean-Baptiste Queru
de3bfade57
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
2010-09-02 14:30:56 -07:00
Ying Wang
fb644881b6
Disable new longjmp in glibc 2.11 and later.
...
Bug: 2967937
Change-Id: I4e2a5f806ad45a01ca7f8c4d032cd29fce1d794d
2010-09-01 16:39:11 -07:00
Joe Onorato
cd7c775ece
fix the build still
...
Change-Id: I2bfbcdd4b463549f3f331ac7a1c7fa89aadef1a8
2010-08-31 12:56:49 -07:00
Joe Onorato
0ee89a72d5
DO NOT MERGE - Back port change from master that enforces correctness in the javadoc comments.
...
Change-Id: I886448a3126b81c19342d920669e050eb5ef20eb
2010-08-31 12:00:44 -07:00
Andreas Huber
a398961195
Cleanspec to make sure everything works consistently after turning off OpenCore.
...
Change-Id: Icf3ba66b8183e36247b4cfc623643e37f78d7144
related-to-bug: 2941153
2010-08-30 14:17:14 -07:00
Andreas Huber
200f25984c
Build without OpenCore by default, remove obsolete opt-in to stagefright.
...
Change-Id: I6e08d2136147f4e279f8a5b2b3837e4317faf27c
related-to-bug: 2941153
2010-08-30 12:48:03 -07:00
Ying Wang
ae55314348
Refactor a bit.
...
Change-Id: I4573e7a5239536f49571d9222865e2526da573c8
2010-08-26 16:04:09 -07:00
Ying Wang
aa6dbe2144
Try to fix system.img in update zip file.
...
Change-Id: Ic4f1c7478a22b1f8134ac768904e437fcfea700a
2010-08-26 15:16:22 -07:00
Ying Wang
d421f57d22
Fix mkyaffs2image extra flags in the release tools.
...
Change-Id: I806e3e85ef89941edf04352331e25730c491c470
2010-08-25 20:39:41 -07:00
Ying Wang
fb0a347b74
Disable building OTA package if there is no kernel.
...
Change-Id: I9a10cba92dd7f9cccd8cca58a5fa2d3a8b4620eb
2010-08-25 16:06:06 -07:00
Ying Wang
68bb65177c
Show command lines run by releasetools.
...
Change-Id: Ic204e6738781c191cd6cefefdb351f8a156b2309
2010-08-25 15:23:21 -07:00
Ying Wang
4de6b5bfc8
Fix mkbootimg parameters for releasetools.
...
Change-Id: I6192743e9db415f5fe7f3b82081f8a82061254b3
2010-08-25 14:30:17 -07:00
Bill Napier
0962b71980
Merge "DO NOT MERGE: Fix the build by ignoring directories that don't exist." into gingerbread
2010-08-25 10:00:59 -07:00
Bill Napier
10cd7f9969
DO NOT MERGE: Fix the build by ignoring directories that don't exist.
...
Change-Id: I97ba9eca73f020eae0fa36ae94db35e70c9985d3
2010-08-25 10:00:20 -07:00
Ying Wang
7eaa4dc2fb
Merge "Link against Mac OSX 10.5 SDK if building on 10.6." into gingerbread
2010-08-25 09:32:00 -07:00
Rohit Mungee
cb92616f11
Merge "Add support for multiple html directories to droiddoc." into gingerbread
2010-08-24 22:58:30 -07:00
Bill Napier
0e143c0ed9
Add support for multiple html directories to droiddoc.
...
The goal for adding this support is to allow droiddoc to pull html
files both from the static content and from content generated at
build time.
Change-Id: I5d4b2432aa78b0b3559daacedfb7a29675701f33
2010-08-24 22:16:01 -07:00
Ying Wang
d6683f08c9
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
2010-08-24 18:34:44 -07:00
Ying Wang
ee4bad51bc
Disable CheckSize on ext partitions to fix build [DO NOT MERGE]
...
Original CL: 59920
Change-Id: I81437996670a61e10284293d25a08da8907ad296
2010-08-24 11:18:07 -07:00
Jean-Baptiste Queru
34acfcf685
merge -s ours from froyo-release so that upgrading to gingerbread is a git fast-forward
...
Change-Id: Ic1040aa7e00cdc01af2f2cb4c741bafe4936904c
2010-08-23 19:07:41 -07:00
Ying Wang
ffff0028ae
Pass pagesize to makebootimage.
...
Change-Id: I719d765245469921de105430fdd92d478ea48e82
2010-08-23 12:56:25 -07:00
Ying Wang
065521be4f
Backport ext4 support from master [DO NOT MERGE]
...
ext4 support is needed by crespo.
Change-Id: I604cb9ada526ce8ba6b3648171ac1d614a5519a9
2010-08-23 11:34:40 -07:00
Ying Wang
ad3cf5f868
Restore OTA for crespo. [DO NOT MERGE]
...
Change-Id: I2472942741bdb2e4fa5037883f6acbe6c4ca36c3
2010-08-21 16:58:06 -07:00
Jean-Baptiste Queru
60d1ee3e53
Better way to disable OTAs for crespo - DO NOT MERGE
...
OTAs need to be disabled for all products using crespo
hardware, not just a single one.
Change-Id: I961462e5e87bec8c59dafa13dbf0fdc96bab29ab
2010-08-20 19:19:55 -07:00
Ying Wang
7daa913231
Disable OTA for crespo [DO NOT MERGE]
...
Change-Id: I22c29226bb783fed34766e91d43edcf6e61a837f
2010-08-20 16:45:19 -07:00
android-build SharedAccount
477ddfcaab
FRG51
...
Change-Id: Ifa272e3b63d85a5b25a43e3869fea4e62ea0d037
2010-08-20 09:21:16 -07:00
android-build SharedAccount
57b1c1cd33
FRG49
...
Change-Id: Ibf2fb1a5f077bda95006ffcccf3208ac53a4835d
2010-08-18 14:38:05 -07:00
android-build SharedAccount
c434bbbb2c
am 817a8ac9: (-s ours) bump version from 2.2 to 2.2.1 for next froyo release
...
Merge commit '817a8ac99392228f894d18ea40b0fb4c1b6ca8fe' into gingerbread
* commit '817a8ac99392228f894d18ea40b0fb4c1b6ca8fe':
bump version from 2.2 to 2.2.1 for next froyo release
2010-08-18 08:45:04 -07:00
android-build SharedAccount
5fad3f5e45
bump version from 2.2 to 2.2.1 for next froyo release
...
Change-Id: Ic636f111d4a7a69954539bbd480b7119bf0d730f
2010-08-17 22:58:21 -07:00
android-build SharedAccount
817a8ac993
bump version from 2.2 to 2.2.1 for next froyo release
...
Change-Id: Ic636f111d4a7a69954539bbd480b7119bf0d730f
2010-08-17 22:44:17 -07:00
android-build SharedAccount
059815f328
FRG22D
...
Change-Id: Ia5abcd21305a9ee7f646023401e59cb5bb35c700
2010-08-13 11:49:07 -07:00
android-build SharedAccount
93a2bf55f9
FRG22C
...
Change-Id: I222497bad7b4eff02a05393678b2e07fc260c55a
2010-08-11 12:23:53 -07:00
android-build SharedAccount
1c117bd67e
FRG22B
...
Change-Id: I0e01dccb378cec768ea51e1454b1c50c8a1a7b75
2010-08-10 22:04:39 -07:00
Hung-ying Tyan
ddefdef5bc
Make ProGuard keep necessary members for serializable classes
...
Change-Id: I845eb8280d0cab7e426b17c94d74bc409e66c193
2010-08-11 08:24:46 +08:00
Chung-yih Wang
1a2649f0da
Merge "Add voip(SIP related codes) into framework." into gingerbread
2010-08-05 19:35:35 -07:00
Scott Main
6eea9363f4
am 4f2436dc: update carousel icon for nexus one dev phone
...
Merge commit '4f2436dc3513f671935811bfa0c7e6c2c15505be' into gingerbread
* commit '4f2436dc3513f671935811bfa0c7e6c2c15505be':
update carousel icon for nexus one dev phone
2010-08-05 15:10:05 -07:00
Scott Main
be4696e073
am 7589398c: Merge "Doc change: Add nexus one to dev phones image." into froyo
...
Merge commit '7589398cf9127987a768ccfb3dbb9cde54d00f02' into gingerbread
* commit '7589398cf9127987a768ccfb3dbb9cde54d00f02':
Doc change: Add nexus one to dev phones image.
2010-08-05 15:10:03 -07:00
Scott Main
4f2436dc35
update carousel icon for nexus one dev phone
...
Change-Id: I7f92063a7dc6b49dd6bb044b79931dbc9268ebd6
2010-08-05 09:44:47 -07:00
Scott Main
7589398cf9
Merge "Doc change: Add nexus one to dev phones image." into froyo
2010-08-05 08:05:37 -07:00
Brian Carlstrom
7dc35a3b9c
Tracking merge of dalvik-dev to gingerbread
...
git cherry-pick --no-commit f2f3e4b2
git cherry-pick --no-commit b6a08f0cd3
git cherry-pick --no-commit d05d74b2d6
git cherry-pick --no-commit 5479d77e32
Change-Id: I6f339aa73823e053146719b3af7af91d5375df1c
2010-08-04 23:17:47 -07:00
Chung-yih Wang
ab8ed58c63
Add voip(SIP related codes) into framework.
...
Change-Id: I12bbeb3dacd51b0234872529479e61bdd8536629
2010-08-05 11:31:07 +08:00
android-build SharedAccount
404cd14806
33b special
...
Change-Id: I025cf8d2db61752e6816a3ca726445fd869bbc57
2010-08-03 22:24:15 -07:00
android-build SharedAccount
69e381b3be
FRG33
...
Change-Id: I04cafed766813daf17316651bf5403c3e4823a74
2010-08-02 14:03:32 -07:00
Ying Wang
e1f37ba0cf
am 55edb20e: Merge "Dist apkcerts.txt for unbundled builds" into froyo
...
Merge commit '55edb20e246e88afd841f63725c647132d9aca17' into gingerbread
* commit '55edb20e246e88afd841f63725c647132d9aca17':
Dist apkcerts.txt for unbundled builds
2010-07-29 10:27:45 -07:00