Commit Graph

86485 Commits

Author SHA1 Message Date
Android (Google) Code Review
28ab3b12d3 Merge change 8917 into donut
* changes:
  implement api level toggling  and rename navtree.js to android-developer-reference.js for all reference related scripts  TODO: shading for hidden classes in the treeview navigation... these aren't dynamic yet.
2009-08-05 11:55:54 -07:00
Scott Main
25fda19689 implement api level toggling
and rename navtree.js to android-developer-reference.js for all reference related scripts
 TODO: shading for hidden classes in the treeview navigation... these aren't dynamic yet.
2009-08-05 10:43:55 -07:00
The Android Open Source Project
685b90da0c ERC36 2009-08-05 08:36:03 -07:00
The Android Open Source Project
384cd68799 Merge commit 'remotes/goog/master' into eclair-release 2009-08-05 08:35:50 -07:00
Android (Google) Code Review
8f83fce7f1 Merge change 20007
* changes:
  Add Bluetooth app to generic product file.
2009-08-04 17:25:21 -07:00
Doug Zongker
1218b09012 am 1aca962a: allow for malformed imagesizes.txt
Merge commit '1aca962af153d6437937e3e687740d2c1c12657d'

* commit '1aca962af153d6437937e3e687740d2c1c12657d':
  allow for malformed imagesizes.txt
2009-08-04 15:14:01 -07:00
Doug Zongker
1aca962af1 allow for malformed imagesizes.txt
Some builds have blank values for max image sizes; ignore these lines.
2009-08-04 15:09:27 -07:00
Android (Google) Code Review
7d7630cca8 am b6153173: Merge change 9605 into donut
Merge commit 'b6153173952895441e55d0ff6be332bb7c7605e2'

* commit 'b6153173952895441e55d0ff6be332bb7c7605e2':
  use the max image sizes from the target files zip
2009-08-04 14:16:38 -07:00
Android (Google) Code Review
b615317395 Merge change 9605 into donut
* changes:
  use the max image sizes from the target files zip
2009-08-04 14:11:15 -07:00
Jaikumar Ganesh
4d5fdba032 Add Bluetooth app to generic product file. 2009-08-04 14:06:45 -07:00
Jean-Baptiste Queru
0f64a55381 merge from open-source master 2009-08-04 09:01:27 -07:00
The Android Open Source Project
07514706ec ERC35 2009-08-04 08:38:53 -07:00
The Android Open Source Project
666584fcef DRC35 2009-08-04 08:38:33 -07:00
The Android Open Source Project
1ce1aa44cb Merge commit 'remotes/goog/master' into eclair-release 2009-08-04 08:38:31 -07:00
The Android Open Source Project
b9bccc69f5 Merge commit 'remotes/goog/donut' into donut-release 2009-08-04 08:38:20 -07:00
Doug Zongker
fdd8e69c42 use the max image sizes from the target files zip
For some time now the build system has included all the max image
sizes in a file in the META directory.  Use these instead of needing
to parse the BoardConfig.mk file for the device at the time of
building an image or OTA package.
2009-08-03 17:27:48 -07:00
Doug Zongker
e8cb956b8a am 828bbfb1: in amend, remove symlink targets before creating them
Merge commit '828bbfb18838f04b93ffbed0d7d3b597beaa534c'

* commit '828bbfb18838f04b93ffbed0d7d3b597beaa534c':
  in amend, remove symlink targets before creating them
2009-08-03 16:55:57 -07:00
Doug Zongker
828bbfb188 in amend, remove symlink targets before creating them
amend's symlink command isn't idempotent, so if you restart after the
symlinks have been completed then the second installation attempt will
fail.  Work around this by deleting all symlink targets before
creating symlinks.

Bug: 2020011
2009-08-03 14:11:09 -07:00
The Android Open Source Project
deff9d19bf ERC34 2009-08-03 08:38:59 -07:00
The Android Open Source Project
85eff1306e DRC34 2009-08-03 08:38:55 -07:00
Jean-Baptiste Queru
123f82cb0b merge from donut 2009-08-03 07:50:30 -07:00
The Android Open Source Project
69d03a2062 ERC31B 2009-07-31 09:55:39 -07:00
The Android Open Source Project
682653f72f Merge commit 'remotes/goog/master' into eclair-release 2009-07-31 09:55:32 -07:00
Android (Google) Code Review
c97ea27f86 Merge change 9346
* changes:
  Update warn.py with the latest warnings that popped up in the build.
2009-07-31 09:43:24 -07:00
Marco Nelissen
5236fbde30 Update warn.py with the latest warnings that popped up in the build. 2009-07-31 09:02:11 -07:00
The Android Open Source Project
3c2c2ec800 ERC31 2009-07-31 08:38:35 -07:00
The Android Open Source Project
3351be0cba DRC31 2009-07-31 08:38:17 -07:00
The Android Open Source Project
b6f7fe646c Merge commit 'remotes/goog/master' into eclair-release 2009-07-31 08:38:17 -07:00
Dan Egnor
67dc3d9a99 oops, missed one 2009-07-30 16:53:26 -07:00
Dan Egnor
d51042522a Needed for incremental builds after MD2 removal 2009-07-30 16:23:04 -07:00
Joe Onorato
1de66889ec Don't check build tools versions (including javac) every time make is run.
This trims off another 1/3 of a second from incremental build times.
VERSION_CHECK_SEQUENCE_NUMBER can be incremented to force a check.
2009-07-30 11:54:27 -07:00
Joe Onorato
ead9646f1f Don't run findleaves.sh if we're doing ONE_SHOT_MAKEFILE.
This cuts the minimum mmm time from 17 seconds to 5 seconds on my mac pro.
2009-07-30 11:20:04 -07:00
Joe Onorato
2a5d4d81b2 Add cproj function to envsetup.sh that finds an Android.mk and goes to its directory. 2009-07-30 10:24:28 -07:00
The Android Open Source Project
857a865515 DRC30B 2009-07-30 09:29:51 -07:00
The Android Open Source Project
b8027066af ERC30 2009-07-30 08:38:17 -07:00
The Android Open Source Project
b5c065960b DRC30 2009-07-30 08:38:09 -07:00
The Android Open Source Project
0d564a68a4 Merge commit 'remotes/goog/master' into eclair-release 2009-07-30 08:38:00 -07:00
The Android Open Source Project
b196f541f8 Merge commit 'remotes/goog/donut' into donut-release 2009-07-30 08:37:53 -07:00
Android (Google) Code Review
1951d0eed9 am 7ebafd5a: Merge change 9009 into donut
Merge commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c'

* commit '7ebafd5aa03e9d84696be0448f9d248e8f90e16c':
  Reapply modifications from 3175 to fix display of navTree in doc output.
2009-07-30 06:56:59 -07:00
Phil Dubach
e7faad965f am 951f3d89: CTS: Add telephony and webkit test cases to CTS makefile
Merge commit '951f3d89fb8c61264a20f9e44b7882e6f562e1d3'

* commit '951f3d89fb8c61264a20f9e44b7882e6f562e1d3':
  CTS: Add telephony and webkit test cases to CTS makefile
2009-07-30 06:56:47 -07:00
Daisuke Miyakawa
cca2cdf1ae am 981bafb1: AI 150131: Remove English/Chinese IME from OpenWnn.
Merge commit '981bafb11bf73806f78676d7a1bdc98e3c92bd16'

* commit '981bafb11bf73806f78676d7a1bdc98e3c92bd16':
  AI 150131: Remove English/Chinese IME from OpenWnn.
2009-07-30 06:56:45 -07:00
Jean-Baptiste Queru
3a37cdf3a2 am 239637ea: (-s ours) findleaves.sh: Properly fix arguments.
Merge commit '239637eac86c8f4f92384891a8f99085039a5778'

* commit '239637eac86c8f4f92384891a8f99085039a5778':
  findleaves.sh: Properly fix arguments.
2009-07-29 16:48:32 -07:00
Android (Google) Code Review
a86afb626f am c16c0a41: Merge change 8942 into donut
Merge commit 'c16c0a41f58458b21a4ee5f34a2bcdaa46d156af'

* commit 'c16c0a41f58458b21a4ee5f34a2bcdaa46d156af':
  Add CTS permission2 test package to cts.
2009-07-29 16:44:58 -07:00
Scott Main
a7f49e3b95 am df09424f: Patch 2: some fixes to the developer-docs stylesheet.... Patch 3: add "Since:" to the api level info Patch 4: fix packages page and styles to reveal class summary
Merge commit 'df09424f19ca8d455037b19641b15a7c55d9523f'

* commit 'df09424f19ca8d455037b19641b15a7c55d9523f':
  Patch 2: some fixes to the developer-docs stylesheet....
2009-07-29 16:44:56 -07:00
Jean-Baptiste Queru
7227ea7619 merge from donut 2009-07-29 14:56:48 -07:00
Android (Google) Code Review
7ebafd5aa0 Merge change 9009 into donut
* changes:
  Reapply modifications from 3175 to fix display of navTree in doc output.
2009-07-29 13:58:07 -07:00
Android (Google) Code Review
94a7e48086 Merge change 9010
* changes:
  include GoogleContactsSyncAdapter in products with google
2009-07-29 13:55:29 -07:00
Fred Quintana
e4e5b5865a include GoogleContactsSyncAdapter in products with google 2009-07-29 12:47:54 -07:00
Dirk Dougherty
3b1ee3789c Reapply modifications from 3175 to fix display of navTree in doc output. 2009-07-29 12:25:44 -07:00
Phil Dubach
951f3d89fb CTS: Add telephony and webkit test cases to CTS makefile 2009-07-29 11:58:11 -07:00