Jean-Baptiste Queru
493306f7c3
Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"
2010-11-19 11:01:22 -08:00
Jean-Baptiste Queru
cc21582fb3
resolved conflicts for merge of 4130c80a
to gingerbread-plus-aosp
...
Change-Id: I4c37c4a6a54c3fb005eec4789bfcf96678d8cec9
2010-11-19 10:58:11 -08:00
Jean-Baptiste Queru
4130c80aa3
Merge "Correct makefile test for stagefright build"
2010-11-19 10:45:27 -08:00
Bruce Beare
885b6b99d3
Correct makefile test for stagefright build
...
Change-Id: Ia79b97d43e3fad82491e7d6197ffef2e764a63e3
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-11-19 10:45:11 -08:00
Jean-Baptiste Queru
f41934fcd4
am 26d8c589
: Merge "Display the TARGET_ARCH_VARIANT"
...
* commit '26d8c5896e937ed677007c23d46d6759845fe91f':
Display the TARGET_ARCH_VARIANT
2010-11-19 10:37:07 -08:00
Jean-Baptiste Queru
26d8c5896e
Merge "Display the TARGET_ARCH_VARIANT"
2010-11-19 10:29:14 -08:00
Ying Wang
92cc4c0747
am b26a65b5
: Merge "Restrict make version to 3.81"
...
* commit 'b26a65b59ff5ed777accaf34ac06ab6a86dc37c6':
Restrict make version to 3.81
2010-11-19 10:24:57 -08:00
Ying Wang
b26a65b59f
Merge "Restrict make version to 3.81"
2010-11-18 11:20:21 -08:00
Ying Wang
4f9269ef75
Restrict make version to 3.81
...
Bug: 3209290
It turns out that gmake 3.82 on Mac OSX crashes with segmentation fault
at some point.
Change-Id: I7b632abe1cafc5f0ff2ea45611d8ccf0aa3f976a
2010-11-18 11:18:52 -08:00
Jean-Baptiste Queru
766a2a2125
am 48ec6d6f
: Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."
...
* commit '48ec6d6f814a70068c4632b468cd7872f34295ad':
Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
2010-11-17 15:27:13 -08:00
Jean-Baptiste Queru
48ec6d6f81
Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."
2010-11-17 15:15:32 -08:00
Johnnie Birch
a4716b2618
Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
...
Change-Id: Idbceb6c7d4117fbecd35e4261330e6405666189e
2010-11-17 15:15:08 -08:00
Xavier Ducrohet
f5f81fc75e
am 01a9840b
: Merge "Rename layoutlib_utils into ide_common"
...
* commit '01a9840ba7545d9175575cc3d95b2584b2dee31c':
Rename layoutlib_utils into ide_common
2010-11-11 14:59:57 -08:00
Xavier Ducrohet
01a9840ba7
Merge "Rename layoutlib_utils into ide_common"
2010-11-11 14:45:05 -08:00
Xavier Ducrohet
2e5ee27e9e
Rename layoutlib_utils into ide_common
...
Change-Id: Iaa8275881dd1ee7d41c30f8b0d481253a6635271
2010-11-11 12:44:16 -08:00
Scott Main
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
Scott Main
badffa8432
docs: revise intro to reflect changes to quick start
...
Change-Id: I0fdc13344831960d3fb82f80d5e391186117fc5c
2010-11-08 16:10:18 -08:00
Scott Main
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
Scott Main
c775c754f1
docs: add gingerbread logo for homepage
...
Change-Id: I54db7009931e1ec5688d4f473a520a4f61db598a
2010-11-05 14:29:07 -07:00
Scott Main
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
Robert Ly
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
Scott Main
ec97fd30a6
docs: revisions to ndk download intro
...
Change-Id: Ib1ba3d5f0e727a1246dc92161b72bcfff6f9d772
2010-11-04 21:02:14 -07:00
Robert Ly
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
Jean-Baptiste Queru
57723b52cd
Merge 7b393fd1
from open-source master
...
Change-Id: I5fee3ccbf7845d087e72848b4cec0198cd4afc26
2010-11-04 07:24:56 -07:00
Jean-Baptiste Queru
7b393fd131
Merge "Add version_defaults.mk to be a prerequisite of build.prop"
2010-11-03 10:29:55 -07:00
Chih-Wei Huang
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
Jean-Baptiste Queru
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
Jean-Baptiste Queru
892ea1eaad
Merge "build: Add spare size flag to mkyaffs2image"
2010-11-02 09:01:30 -07:00
Naseer Ahmed
53871886bd
build: Add spare size flag to mkyaffs2image
...
Change-Id: Ib3a915ba5296d31f88cdc81e13da02f281dbdb9f
2010-11-02 08:59:39 -07:00
Scott Main
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
Scott Main
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
Scott Main
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
Scott Main
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
Raphael Moll
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
Raphael Moll
4aa7a190bb
Merge "Fix "make acp" under Cygwin. DO NOT MERGE."
2010-10-29 18:53:07 -07:00
Jean-Baptiste Queru
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
Jean-Baptiste Queru
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
Jean-Baptiste Queru
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
Scott Main
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
Raphael Moll
e6add13d71
Fix "make acp" under Cygwin. DO NOT MERGE.
...
Change-Id: I52ae8d4835b27a712d4795e7f41fa9ca4f3a822d
2010-10-27 19:06:12 -07:00
Brett Chabot
6e644e14cb
am ebf4b519
: cherry pick \'CTS vm-tests depend on hostestlib\' into GB.
2010-10-27 18:56:53 -07:00
Brett Chabot
ebf4b5190a
cherry pick 'CTS vm-tests depend on hostestlib' into GB.
...
Original description:
CTS vm-tests now depend on hosttestlib.
Bug 3125713
Conflicts:
core/tasks/cts.mk
Change-Id: I9e364a9d9d2cae396691921424ca591beca05468
2010-10-27 18:49:33 -07:00
Jean-Baptiste Queru
ba8d47b764
Merge "CTS vm-tests now depend on hosttestlib." into froyo
2010-10-27 14:59:39 -07:00
Brett Chabot
bdb51d7c64
CTS vm-tests now depend on hosttestlib.
...
Bug 3125713
Change-Id: I5774df2abeff7dd82e1218138d1ea3b25edd0901
2010-10-26 18:55:56 -07:00
Scott Main
6084cc948c
am 9d32bd5b
: docs: css tweak to Ps in sidebox. DO NOT MERGE.
...
Merge commit '9d32bd5b03c92e9220ff6cca029a587f5f3c754c' into gingerbread-plus-aosp
* commit '9d32bd5b03c92e9220ff6cca029a587f5f3c754c':
docs: css tweak to Ps in sidebox. DO NOT MERGE.
2010-10-25 17:22:50 -07:00
Scott Main
9d32bd5b03
docs: css tweak to Ps in sidebox. DO NOT MERGE.
...
Change-Id: Ifa3e4a9a2c2ba67b6da615ebc336c897dd9caeda
2010-10-25 17:15:12 -07:00
Jean-Baptiste Queru
cbc479c3a6
Set defauilt ringtone and default notification in full builds
...
Change-Id: Ia5c76d393d428dffc72cb8440720fa0f0884e401
2010-10-24 13:31:17 -07:00
Jean-Baptiste Queru
cd3bd7402f
Use the new list of all audio files
...
Change-Id: Ic510c243dde616cca3374f6aa6a2835690cf6818
2010-10-22 18:56:30 -07:00
Jean-Baptiste Queru
68f21cdc71
Minor cleanup - DO NOT MERGE
...
Change-Id: I0fc4e3c45ae5a545f1a02ed974bc3c7500286e22
2010-10-22 16:13:20 -07:00
Jean-Baptiste Queru
dd46ad41ff
Clean up full config - DO NOT MERGE
...
This splits the existing full.mk in two parts:
-One is the device-independent full_base.mk
-The other is the emulator-specific device.mk
This way we'll be able to inherit from full_base.mk
for on-device builds without any emulator-specific
files getting in the way.
Change-Id: Ieb1f4ed47988c8fff119ff53f1f374032da3752d
2010-10-22 15:00:24 -07:00