Jean-Baptiste Queru
979e4765e7
Change branch name to openmaster, to avoid confusion
...
Change-Id: Ibd0e460fd0f0c5d6fa4c1f858fbc280a0bcf7f1a
2010-06-18 08:11:13 -07:00
Jean-Baptiste Queru
7ef314546b
Revert "Build BUILD_MULTI_PREBUILT for the prebuilt target"
...
This reverts commit 9bfd697cff
,
which was causing all prebuilts to be installed in all builds.
Change-Id: Ia5973b31d23bd74ec187b9e44715dea56c063efe
2010-06-17 09:30:37 -07:00
Jean-Baptiste Queru
633c4a5094
Merge "generic.mk: Replaced AlarmClock with newer DeskClock App"
2010-06-11 15:45:15 -07:00
Jean-Baptiste Queru
64947314b7
Merge "Build BUILD_MULTI_PREBUILT for the prebuilt target"
2010-06-08 10:06:47 -07:00
Jeff Hamilton
8d09b69e2d
Build host tools as 32bit on all Darwin machines.
...
Change-Id: I121b388056e68b787518c66a01c172bc4ffaef9b
2010-06-03 17:59:11 -05:00
Christian Mehlmauer
8056ee21f0
generic.mk: Replaced AlarmClock with newer DeskClock App
...
Change-Id: I2afe4876b1dd7e9e9200e27ba64eebe4a34065fb
2010-05-22 22:22:26 +02:00
Jean-Baptiste Queru
4dccdd6401
Merge "Use a different kernel boot line for the disk installer."
2010-05-14 15:47:56 -07:00
Jean-Baptiste Queru
f81d75ed47
Merge "Use a property to enable the eth0 LAN port on the emulator"
2010-05-14 15:47:39 -07:00
Jean-Baptiste Queru
f91e9e2729
Merge "Fix "make modules" script bug under Mac OS X."
2010-05-14 14:10:50 -07:00
Jean-Baptiste Queru
5eac957bdd
Merge "Updated to better distinguish between options and operands"
2010-05-14 12:21:31 -07:00
Jean-Baptiste Queru
be6b55ccc2
Merge "Support absolute path, in OUT_DIR"
2010-05-14 12:17:43 -07:00
Ravi K Yenduri
9bfd697cff
Build BUILD_MULTI_PREBUILT for the prebuilt target
...
Add files included as prebuilts with "BUILD_MULTI_PREBUILT"
to be installed as part of the 'prebuilt' target.
Change-Id: I2fa2dfff2637701281ab78a523c58fc46577ab75
2010-05-10 14:51:56 -07:00
Jean-Baptiste Queru
7bb4f10a96
Merge "Replace arm with proper variable for CPU/ABI"
2010-05-07 12:53:45 -07:00
Bruce Beare
9d4c5b1c20
Use a different kernel boot line for the disk installer.
...
Change-Id: I6b20386a24e1141bfe2a252b635243c235d46865
2010-05-07 11:51:30 -07:00
Bruce Beare
5b9f19e58f
Replace arm with proper variable for CPU/ABI
...
Change-Id: If8594d9a2abf4d8c08b5ccea612bb700afa9e9b7
2010-05-05 11:26:04 -07:00
Bruce Beare
a197281bc2
Use a property to enable the eth0 LAN port on the emulator
...
Change-Id: I26f4ec7fac9b7a8ad3013914967cf0f8fdec91ff
2010-05-05 09:52:23 -07:00
Bruce Beare
f9f1a9d764
Add support for x86 VirtualBox Emulation
...
To make a VirtualBox install image,
make installer_img
2010-05-05 09:52:09 -07:00
Jean-Baptiste Queru
f015e94dc8
Adapt to new location of libcore
...
Change-Id: I316355751db621d318a78dc6e844d6bf2c7fdc87
2010-05-03 09:52:03 -07:00
Alexey Tarasov
73fda1b973
Make expr more POSIXy
...
Change-Id: I939cf1f227c14112656804d69c1afd7ead4a31ed
2010-04-29 14:19:28 -07:00
Jean-Baptiste Queru
e3ec6d120c
Merge "generic_x86 support"
2010-04-29 07:16:36 -07:00
Bruce Beare
c25e503207
generic_x86 support
...
Add in Makefiles and support files for x86 builds
Based on changes by: wonjong.lee <wonjong.lee@windriver.com>
Additional changes by: Mark Gross <mark.gross@intel.com>
Additional changes by: Bruce Beare <brucex.j.beare@intel.com>
Change-Id: Id087411b282b1b68a0251e7f9cbbdde183549787
Signed-off-by: Bruce Beare <brucex.j.beare@intel.com>
2010-04-28 16:52:51 -07:00
Evan JIANG
f380692430
Fix "make modules" script bug under Mac OS X.
...
For Mac OS uses BSD sed, it doesn't support "\n". Then, "make modules"
command cannot work correctly under Mac OS. Using tr command to replace
sed command, it has the same behavior under both Mac OS and Linux.
Change-Id: I29e044cc66bf24f6459cbb33164fd9f55f772e3c
2010-04-28 16:13:28 -07:00
Raphael Moll
bfa25878f9
Remove obsolete machine-setup.html reference.
...
Bug 1231
Change-Id: I629361cf5dddc9d0fbf493e016f1aaf2a50b6935
2010-04-28 14:30:44 -07:00
Raphael Moll
7058f499e9
Fix "make layoutlib" under Windows+Cygwin
...
Change-Id: I5277afe77f1e3367ecfd0933a9ab14a5a42c2be2
2010-04-13 10:49:29 -07:00
The Android Open Source Project
5381c1a30c
merge from open-source master
...
Change-Id: I7254b628bba1be9222a643e9e8c73e1240f645d7
2010-03-08 16:43:00 -08:00
Jean-Baptiste Queru
048683ea7e
Merge from eclair
...
Change-Id: I4496dadd8a738a05c647589ca78732e9b608ca29
2010-03-05 07:23:14 -08:00
Jean-Baptiste Queru
29c6c01bd6
Add provisioning app in the generic build
...
Change-Id: Iffdd4d21a3c55e7a73d58289fda31ac8a27a18ac
2010-03-04 17:31:28 -08:00
Jean-Baptiste Queru
4eb079f67f
Look for product configs in device/ in addition to vendor/
...
This will allow to create open-sourceable product configurations.
Change-Id: I4e73347c2095935340bfc8c3737c2adf1ef22a9c
2010-03-04 15:20:09 -08:00
Doug Zongker
b87e0e1d17
Merge commit '27bb6f5f' into manualmerge
2010-03-01 12:36:07 -08:00
Doug Zongker
27bb6f5f23
add signing checker script to releasetools
...
The check_target_files_signatures determines what key was used to sign
every .apk in a given target_files. It can compare that signature to
that of another target_files (eg, the previous release for that
device) and flag any problems such as .apks signed with a different
key.
(This is a backport of a change in froyo. It does not affect device
code, only the scripts that sign images and OTA packages.)
2010-03-01 12:26:17 -08:00
Jean-Baptiste Queru
75e3264867
Don't build OTA package for aosp_emulator_us
...
This allows "make dist" to work on that configuration.
A better fix would be to allow each product to specify
whether it's an emulator target or a device target, and
to adapt to that, but that'd be a lot more intrusive.
Change-Id: I47708025204a4991466abceb1708a3020a543238
2010-02-24 15:59:36 -08:00
The Android Open Source Project
f925cb322e
am 97233468
: reconcile main tree with open-source eclair
...
Merge commit '97233468715838e42b98abe047c60e108fcc44bd' into eclair-plus-aosp
* commit '97233468715838e42b98abe047c60e108fcc44bd': (198 commits)
android-2.1_r1 snapshot
ERD79
ERD78
ERD77D
ERD77C
ERD77B
ERD77
ERD76
ERD75
ERD72
ERD71F
ERD71E
ERD71D
ERD71C
ERD71B
ERD71
ERD70B
ERD70
ERD69
ERD68B
...
2010-02-05 08:43:41 -08:00
The Android Open Source Project
9723346871
reconcile main tree with open-source eclair
2010-02-05 08:09:32 -08:00
Doug Zongker
20d93db18d
am cdb621bf
: retry patch using cache if in-place write fails
...
Merge commit 'cdb621bfea3083afbea238dbf374826742aca6d0' into eclair-plus-aosp
* commit 'cdb621bfea3083afbea238dbf374826742aca6d0':
retry patch using cache if in-place write fails
2010-02-02 08:53:17 -08:00
Doug Zongker
cdb621bfea
retry patch using cache if in-place write fails
...
[cherry-pick from donut branch]
Instead of failing outright when yaffs lies about how much space is
free on the filesystem, delete the partially-written output file and
retry using the copy-source-to-cache method instead.
Change all the log statements to printf; mixing stdout and stderr
logging just makes the logs hard to read because they're buffered
differently.
2010-02-02 08:44:12 -08:00
The Android Open Source Project
cad3c092ae
reconcile android-2.1_r1 snapshot
2010-01-29 14:07:32 -08:00
Ed Heyl
ffae6f5127
am 25a331ab
: Merge "Update version string." into eclair
...
Merge commit '25a331ab870edcf31dbbfab0a9e6f4cef88654f5' into eclair-plus-aosp
* commit '25a331ab870edcf31dbbfab0a9e6f4cef88654f5':
Update version string.
2010-01-26 15:01:17 -08:00
Scott Main
5729dbfa00
am e6fed880
: Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don\'t get executed when pressed. Bug: 1909300" into eclair
...
Merge commit 'e6fed8807f469a91e10b64990a7709482378dfa9' into eclair-plus-aosp
* commit 'e6fed8807f469a91e10b64990a7709482378dfa9':
docs: accept the enter key on key-down, rather than key-up,
2010-01-26 15:01:13 -08:00
Ed Heyl
25a331ab87
Merge "Update version string." into eclair
2010-01-26 14:55:33 -08:00
Dianne Hackborn
813022b0a3
Update version string.
...
Change-Id: I9b03dadcbc93109f9c91bb9813a41ec23a6c1448
2010-01-26 12:54:40 -08:00
Scott Main
e6fed8807f
Merge "docs: accept the enter key on key-down, rather than key-up, in order to be sure we capture this key before anything else. Fixes case where highlighted suggestions don't get executed when pressed. Bug: 1909300" into eclair
2010-01-25 15:39:40 -08:00
Scott Main
9033c12688
docs: accept the enter key on key-down, rather than key-up,
...
in order to be sure we capture this key before anything else.
Fixes case where highlighted suggestions don't get executed
when pressed.
Bug: 1909300
2010-01-25 15:26:10 -08:00
Raphael
ccd0338ce6
am e749b5a7
: Fix windows make: layoutlib_api moved to sdk.git too.
...
Merge commit 'e749b5a71abe9c3659921c50cc4468a1a4f984f5' into eclair-plus-aosp
* commit 'e749b5a71abe9c3659921c50cc4468a1a4f984f5':
Fix windows make: layoutlib_api moved to sdk.git too.
2010-01-25 14:30:49 -08:00
Raphael
e749b5a71a
Fix windows make: layoutlib_api moved to sdk.git too.
...
Change-Id: Ia030eda4514361b20a5ecb29c997ab625909228c
2010-01-22 18:36:37 -08:00
Dirk Dougherty
262e821409
am 6339cfe8
: Merge "doc change: add announce for developer lab at mwc." into eclair
...
Merge commit '6339cfe89b62bfa7803ff93c4fc13c9be759f47a' into eclair-plus-aosp
* commit '6339cfe89b62bfa7803ff93c4fc13c9be759f47a':
doc change: add announce for developer lab at mwc.
2010-01-22 14:27:55 -08:00
Dirk Dougherty
6339cfe89b
Merge "doc change: add announce for developer lab at mwc." into eclair
2010-01-22 14:23:07 -08:00
Dirk Dougherty
781a636aed
doc change: add announce for developer lab at mwc.
...
Bug: 2160782
Change-Id: I363e964f0d35eaf7b2d7593d6a3630196ed6de33
2010-01-22 13:24:55 -08:00
Scott Main
daa3b7a469
am 945ed36e
: docs: add the ability to exclude PRE elements from being prettified by adding the class "no-pretty-print" (needs to hyphenate \'prettyprint\', otherwise the prettify script will parse "no-prettyprint" the same as "prettyprint")
...
Merge commit '945ed36ec486f83c4546cac8d6bed954dfe32c4e' into eclair-plus-aosp
* commit '945ed36ec486f83c4546cac8d6bed954dfe32c4e':
docs: add the ability to exclude PRE elements from being prettified
2010-01-19 11:13:44 -08:00
Scott Main
945ed36ec4
docs: add the ability to exclude PRE elements from being prettified
...
by adding the class "no-pretty-print" (needs to hyphenate 'prettyprint',
otherwise the prettify script will parse "no-prettyprint" the same as
"prettyprint")
2010-01-19 10:59:16 -08:00
Scott Main
4bd6c862f0
am 3556305e
: Merge "docs: hide the "back to top" link when there\'s no vertical scroll also use local variables for DOM objects (in a slow effort to eventually remove all non-essential global vars)" into eclair
...
Merge commit '3556305eb00cd63ce75bc5ef4a84fd1b454c50fb' into eclair-plus-aosp
* commit '3556305eb00cd63ce75bc5ef4a84fd1b454c50fb':
docs: hide the "back to top" link when there's no vertical scroll
2010-01-13 11:18:02 -08:00