Commit graph

2617 commits

Author SHA1 Message Date
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
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
Ying Wang
55edb20e24 Merge "Dist apkcerts.txt for unbundled builds" into froyo 2010-07-29 10:21:15 -07:00
The Android Open Source Project
609fef7173 am 3a0576a4: merge from open-source froyo
Merge commit '3a0576a41881ceb11c3b11642666abc2f3d5a271' into gingerbread

* commit '3a0576a41881ceb11c3b11642666abc2f3d5a271':
2010-07-28 11:35:24 -07:00
The Android Open Source Project
3a0576a418 merge from open-source froyo
Change-Id: I947332f4e978326309fe14d01875ebfe94405c9f
2010-07-28 11:24:38 -07:00
The Android Open Source Project
dbaff11c84 reconcile forked froyos
Change-Id: Ie0ab94638cc4489d9644e17d26f0603578a011e7
2010-07-28 10:41:54 -07:00
The Android Open Source Project
989fade304 am af44485f: merge from open-source froyo
Merge commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10' into gingerbread

* commit 'af44485fe83bb36a9d55fb54a8f5362854dd7b10':
  Include Test Case List from CTS Project
2010-07-26 12:06:35 -07:00
The Android Open Source Project
af44485fe8 merge from open-source froyo
Change-Id: I6bac03b1f646ea171ee20f0e90d37f337d7987fa
2010-07-26 12:02:01 -07:00
Ying Wang
efb2168266 Dist apkcerts.txt for unbundled builds
Change-Id: Ic381d846f020dc43f48f43581c0db5721f2e36f7
2010-07-23 16:42:13 -07:00
Dirk Dougherty
35e642f768 Doc change: Add nexus one to dev phones image.
Change-Id: I39541b208ed4a2f7b7f48c42f37f3ccdfc05de02
2010-07-23 14:39:41 -07:00
Evan Charlton
f2bfa76cf8 resolved conflicts for merge of 121a7873 to gingerbread
Change-Id: I7b5cecd4236f263c31d4af73d929ff6b5729089e
2010-07-23 12:21:48 -07:00
Evan Charlton
121a78733a Packages can specify where to find AndroidManifest.xml
By overriding LOCAL_MANIFEST_FILE, a package can now specify which
AndroidManifest.xml file to use. This also allows for AndroidManifest.xml to
be in a non-standard location, though that's not recommended.

Change-Id: Ib6d1baeef7601e5a93d4ce64d18883d45373fc12
2010-07-23 11:03:29 -07:00
android-build SharedAccount
0b991a158b FRG22
Change-Id: Ie91f0556bd5e89e8b6640f0a7de1b914558bb564
2010-07-22 22:16:06 -07:00
Ying Wang
ef5bf469fa am bce4b75f: Add JNI_H_INCLUDE as default header search path
Merge commit 'bce4b75fa7801fcb88c6a9ade9465806fe18d441' into gingerbread

* commit 'bce4b75fa7801fcb88c6a9ade9465806fe18d441':
  Add JNI_H_INCLUDE as default header search path
2010-07-22 17:49:13 -07:00
Ying Wang
bce4b75fa7 Add JNI_H_INCLUDE as default header search path
So that module Android.mk does not need to include it manually.
Also with this change, CL like https://android-git.corp.google.com/g/57887 is not needed.

Change-Id: I68fa73a00c76eb37a8142f35d7eeef79cf53c09b
2010-07-22 15:58:19 -07:00
Brian Muramatsu
fa3d88f884 Include Test Case List from CTS Project
Bug 2732160

Have the cts.mk include the test case list from CTS rather
than defining it in cts.mk. This permits CTS developers to
add new packages and applications without having to submit
multiple project changes to both the CTS and build projects
everytime.

Change-Id: I63d90ac4f5d9fc9a9aa0ff79a8bf9dfb1a79c822
2010-07-22 14:46:53 -07:00
Ying Wang
d9dea715e5 am d5c217ac: Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo
Merge commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d' into gingerbread

* commit 'd5c217aca18726f0ed9f2ea034f750620d4bdf7d':
  add phony target "all_modules" and use it as make goal for "mm"/"mmm"
2010-07-22 10:58:14 -07:00
Ying Wang
ebf93bb5c4 am 75b28573: Fix sim build for unbundling native code
Merge commit '75b28573fe739a10f0f91fab1ef916ddd1c0b91c' into gingerbread

* commit '75b28573fe739a10f0f91fab1ef916ddd1c0b91c':
  Fix sim build for unbundling native code
2010-07-22 10:58:12 -07:00
Ying Wang
d5c217aca1 Merge "add phony target "all_modules" and use it as make goal for "mm"/"mmm"" into froyo 2010-07-22 10:51:03 -07:00
Ying Wang
0188414bc6 add phony target "all_modules" and use it as make goal for "mm"/"mmm"
So that mm/mmm don't depend on phony target "files", which brings in
unwanted files for apps-only build.
Also allow "dist" for mmm.
Bug: http://b/issue?id=2811503

Change-Id: I2c0794aebd1d171d8a0f44eb8cda67855704d6bd
2010-07-20 16:18:16 -07:00
Ying Wang
75b28573fe Fix sim build for unbundling native code
NDK does not support sim build.

Change-Id: I57a09c0083126c57a99cf33c055edef3390d1c28
2010-07-16 11:34:36 -07:00
Joe Onorato
b1c272a670 Do a full clean build because of the installclean improvement steps
Change-Id: I8f8ec00667374cd1f5adad6ea4d737dac79be47f
2010-07-15 17:02:25 -07:00
Scott Main
81f42236e2 am 9269a711: docs: ensure code-ified links in qv are the proper color
Merge commit '9269a711753f2523acd3fe5ae661559f754a1bd0' into gingerbread

* commit '9269a711753f2523acd3fe5ae661559f754a1bd0':
  docs: ensure code-ified links in qv are the proper color
2010-07-15 16:43:38 -07:00
android-build SharedAccount
0958d77590 FRG15B
Change-Id: Ife2aad69ca5f79a53a85d486da8d7db552891dc4
2010-07-15 14:47:25 -07:00