9d1d63e2a7
am 1be24531: am badffa84: docs: revise intro to reflect changes to quick start
...
* commit '1be245314ddc88e5bde92e9a0660b1fbbd63422f':
docs: revise intro to reflect changes to quick start
2010-11-08 19:25:01 -08:00
1be245314d
am badffa84: docs: revise intro to reflect changes to quick start
...
* commit 'badffa84327de8154ea3ba96dcf908478c4d4a17':
docs: revise intro to reflect changes to quick start
2010-11-08 17:10:25 -08:00
badffa8432
docs: revise intro to reflect changes to quick start
...
Change-Id: I0fdc13344831960d3fb82f80d5e391186117fc5c
2010-11-08 16:10:18 -08:00
00c837da0a
am 9f7e7946: am c775c754: docs: add gingerbread logo for homepage
...
* commit '9f7e7946959fa776731283cbef97646b6d9d3013':
docs: add gingerbread logo for homepage
2010-11-06 16:25:09 -07:00
d5c09153a7
am 56c69603: am ec97fd30: docs: revisions to ndk download intro
...
* commit '56c69603adb97e6f0a81874f16d81f538259cd55':
docs: revisions to ndk download intro
2010-11-06 16:24:08 -07:00
8ad27435f5
Doc change: Merge commit '9561b575' into master
...
Conflicts:
tools/droiddoc/templates-sdk/sdkpage.cs
Change-Id: Ibc2edc2550fe93b3c8f2c7e041fae81136fdb1c2
2010-11-06 16:18:20 -07:00
9f7e794695
am c775c754: docs: add gingerbread logo for homepage
...
* commit 'c775c754f13bd54b7d5da8c28186cdd8167dc53a':
docs: add gingerbread logo for homepage
2010-11-06 14:21:16 -07:00
c2da70dbc5
Merge "Rename protoc to aprotoc."
2010-11-05 15:38:37 -07:00
c775c754f1
docs: add gingerbread logo for homepage
...
Change-Id: I54db7009931e1ec5688d4f473a520a4f61db598a
2010-11-05 14:29:07 -07:00
56c69603ad
am ec97fd30: docs: revisions to ndk download intro
...
* commit 'ec97fd30a6af6d954f156620a69c29352e012d39':
docs: revisions to ndk download intro
2010-11-05 13:57:15 -07:00
9561b57543
am 706e41e5: Update the template text for the NDK download page to point to new links
...
* commit '706e41e55f2e3b456c51b56ba07d1dfd56716af9':
Update the template text for the NDK download page to point to new links
2010-11-05 13:57:10 -07:00
33c0d952fc
Allow module-specific protoc flags.
...
You can add local protoc flags via LOCAL_PROTOC_FLAGS.
Change-Id: If246a4edafe1edcec6a7f193bde8ce3c83de745b
2010-11-05 11:30:58 -07:00
e789083c06
Rename protoc to aprotoc.
...
With gLucid protoc is installed in the base system, by renaming
our version there will be no confusion about which compiler is
being used.
Change-Id: Id6900baacc7d57abee5dc5f694b013d7a42b35c6
2010-11-05 11:28:51 -07:00
60293914c1
Set the correct proto intermediate dir for native modules.
...
Change-Id: I008778de2b81ed0c029979a7865827a96bf44b51
2010-11-05 11:20:03 -07:00
3d6bf975bd
Merge "Integrate protocol buffer compiler into the build system."
2010-11-05 17:33:41 +00:00
ec97fd30a6
docs: revisions to ndk download intro
...
Change-Id: Ib1ba3d5f0e727a1246dc92161b72bcfff6f9d772
2010-11-04 21:02:14 -07:00
706e41e55f
Update the template text for the NDK download page to point to new
...
links
Change-Id: Icb1571eae18dcd9f9f86c5fd855f15783f9d4ae4
2010-11-04 13:36:37 -07:00
5cf0b2cf83
Merge "'make dump-products' to dump products."
2010-11-04 13:21:20 -07:00
9e5d44b796
am 57723b52: Merge 7b393fd1 from open-source master
...
* commit '57723b52cdb446c751ba8e65fa060e7a4faf4907':
Add version_defaults.mk to be a prerequisite of build.prop
2010-11-04 10:57:36 -07:00
57723b52cd
Merge 7b393fd1 from open-source master
...
Change-Id: I5fee3ccbf7845d087e72848b4cec0198cd4afc26
2010-11-04 07:24:56 -07:00
2042cabf71
am 6be29424: am 892ea1ea: Merge "build: Add spare size flag to mkyaffs2image"
...
* commit '6be29424c60cb5e17ce0aacb026c1cb88a62428b':
build: Add spare size flag to mkyaffs2image
2010-11-03 10:59:25 -07:00
7b393fd131
Merge "Add version_defaults.mk to be a prerequisite of build.prop"
2010-11-03 10:29:55 -07:00
75947ef5ef
Add version_defaults.mk to be a prerequisite of build.prop
...
The version_defaults.mk defines variables that may affect
the content of build.prop.
Change-Id: Iabb82459949bb6e7a91829c5b485aad331c50b72
2010-11-03 18:33:46 +08:00
cae4d12fd1
'make dump-products' to dump products.
...
Change-Id: I6a1e7ce5d54f47898199bfc9d29245c2598f733c
2010-11-02 23:04:24 -07:00
462d26bd32
Only copy once even if the first matched src:dest pair appears more than once.
...
Change-Id: I9bef6172a1123518e97e04190fb857f9ee2c7582
2010-11-02 21:31:47 -07:00
a5fc87a937
Integrate protocol buffer compiler into the build system.
...
Bug: 3152546
Change-Id: Ida3ca3d633ce45704dc8e80d044cdbd3ca69aca5
2010-11-02 19:25:47 -07:00
63ae1fa6bb
Temporarily remove some apps from the SDK build.
...
Change-Id: Ic23449ee144f0bf4ba4a208e8742a7db31d1b8a4
2010-11-02 18:35:45 -07:00
6be29424c6
am 892ea1ea: Merge "build: Add spare size flag to mkyaffs2image"
...
* commit '892ea1eaadfa5b57948bb66bd3432e06c58188e1':
build: Add spare size flag to mkyaffs2image
2010-11-02 14:17:54 -07:00
d4dfc2b923
Add the fonts to the SDK system image.
...
Change-Id: I905e42b8ca44901adc15b083689c2252a18ce130
2010-11-02 13:59:40 -07:00
c3d74babc3
Merge "Cygwin fix: Use new #if HAVE_STAT_ST_MTIM"
2010-11-02 11:42:33 -07:00
892ea1eaad
Merge "build: Add spare size flag to mkyaffs2image"
2010-11-02 09:01:30 -07:00
53871886bd
build: Add spare size flag to mkyaffs2image
...
Change-Id: Ib3a915ba5296d31f88cdc81e13da02f281dbdb9f
2010-11-02 08:59:39 -07:00
b18aaf0fa5
am 987fb055: (-s ours) am 2e94aa25: docs: make the resizable side nav standard. DO NOT MERGE. This actually affects only the SDK tab, which previously did not allow resizing---now it does. Also add a couple new templates to allow either 190 or 200 pixel-wide side navigation by
...
* commit '987fb055d12667e4cacad2f9a26e7bb92cce10c2':
docs: make the resizable side nav standard. DO NOT MERGE. This actually affects only the SDK tab, which previously did not allow resizing---now it does. Also add a couple new templates to allow either 190 or 200 pixel-wide side navigation by default, and apply 200 to the Resources tab.
2010-11-01 20:23:06 -07:00
987fb055d1
am 2e94aa25: docs: make the resizable side nav standard. DO NOT MERGE. This actually affects only the SDK tab, which previously did not allow resizing---now it does. Also add a couple new templates to allow either 190 or 200 pixel-wide side navigation by default, and
...
* commit '2e94aa25d458e96d6503b88c52e81c65fb34a9d0':
docs: make the resizable side nav standard. DO NOT MERGE. This actually affects only the SDK tab, which previously did not allow resizing---now it does. Also add a couple new templates to allow either 190 or 200 pixel-wide side navigation by default, and apply 200 to the Resources tab.
2010-11-01 20:21:39 -07:00
a63e3cc186
Cygwin fix: Use new #if HAVE_STAT_ST_MTIM
...
stat.st_mtim doesn't exist under MinGW or Cygwin.
Change-Id: I0d9c81a0529d8d289d84600ed9d1a451e7f1f258
2010-11-01 15:53:45 -07:00
2e94aa25d4
docs: make the resizable side nav standard. DO NOT MERGE.
...
This actually affects only
the SDK tab, which previously did not allow resizing---now it does.
Also add a couple new templates to allow either 190 or 200 pixel-wide
side navigation by default, and apply 200 to the Resources tab.
Change-Id: I4555c496088dd8aac77f9aa01273c3a1d52f89e0
2010-11-01 15:53:06 -07:00
59c762458d
am e9e311a4: (-s ours) am fa83b5e4: Merge "docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else" into gingerbread
...
* commit 'e9e311a47b9a02b411e1b457d5e72ac0321a7015':
docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else
2010-11-01 10:55:43 -07:00
e9e311a47b
am fa83b5e4: Merge "docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else" into gingerbread
...
* commit 'fa83b5e4daf43a431463e80c56fe115a6db3ca04':
docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else
2010-11-01 10:53:08 -07:00
fa83b5e4da
Merge "docs: update sdk download template DO NOT MERGE add windows installer and revise a bit else" into gingerbread
2010-11-01 10:49:07 -07:00
1c8ad8743b
am 3a632f7d: (-s ours) am 4aa7a190: Merge "Fix "make acp" under Cygwin. DO NOT MERGE."
...
* commit '3a632f7d3760fbf34dd03f37642562e31abfd468':
Fix "make acp" under Cygwin. DO NOT MERGE.
2010-10-29 19:05:40 -07:00
3a632f7d37
am 4aa7a190: Merge "Fix "make acp" under Cygwin. DO NOT MERGE."
...
* commit '4aa7a190bb81b7e3ad12d53b83908c3c72745f6e':
Fix "make acp" under Cygwin. DO NOT MERGE.
2010-10-29 19:03:49 -07:00
4aa7a190bb
Merge "Fix "make acp" under Cygwin. DO NOT MERGE."
2010-10-29 18:53:07 -07:00
92a4ccaa94
am b3a45fea: (-s ours) am 6a514dcc: am 16bf5290: (-s ours) Merge from AOSP froyo. Do not merge.
...
* commit 'b3a45feaf9f09dd60b94ef88bbc52ff7a75f39d2':
CTS vm-tests now depend on hosttestlib.
2010-10-29 08:20:09 -07:00
b3a45feaf9
am 6a514dcc: am 16bf5290: (-s ours) Merge from AOSP froyo. Do not merge.
...
* commit '6a514dcc9d7d851d5cbe95ef7603d2bf0523a6a2':
CTS vm-tests now depend on hosttestlib.
2010-10-29 08:16:49 -07:00
6a514dcc9d
am 16bf5290: (-s ours) Merge from AOSP froyo. Do not merge.
...
* commit '16bf5290b1c8fcedda6c376db64f2bacbaf2c7a4':
CTS vm-tests now depend on hosttestlib.
2010-10-29 05:51:54 -07:00
16bf5290b1
Merge from AOSP froyo. Do not merge.
...
CTS vm-tests now depend on hosttestlib.
Change-Id: Ie252227825ccb843b4be1205e3b135b7535b8a03
2010-10-29 05:49:08 -07:00
49b21018a6
Merge "make help: prints a handy list of useful targets"
2010-10-28 12:43:56 -07:00
9566122c9d
make help: prints a handy list of useful targets
...
A small step to making the platform build environment more
self-documenting.
Change-Id: I8f6cebe6cbd4cf89736da23e9d0d2a257ea422ee
2010-10-28 15:40:06 -04:00
f086a6e434
docs: update sdk download template DO NOT MERGE
...
add windows installer and revise a bit else
Change-Id: Ie0ea7765d797cb54ee1d7fc733ec6db4fdedac3a
2010-10-28 00:21:25 -07:00
e6add13d71
Fix "make acp" under Cygwin. DO NOT MERGE.
...
Change-Id: I52ae8d4835b27a712d4795e7f41fa9ca4f3a822d
2010-10-27 19:06:12 -07:00
Scott Main