Commit Graph

1559 Commits

Author SHA1 Message Date
Jean-Baptiste Queru 905da31a24 merge from open-source master 2009-11-15 10:58:56 -08:00
Christopher Tate 87cffba830 am 218c6d34: am 014b8e03: am eb71bf7b: Merge change I01d9d733 into eclair
Merge commit '218c6d3464c6e5c75765d59fbc42bb8357d88a1d'

* commit '218c6d3464c6e5c75765d59fbc42bb8357d88a1d':
  Add a host shell function to generate system_server stack traces
2009-11-13 10:55:33 -08:00
Dianne Hackborn 73053721a0 am 26542574: am 8feaa2b6: am d0b22902: Merge change I847e8ab8 into eclair
Merge commit '265425746b50ddb14467b2bdbd62f3424b7176f0'

* commit '265425746b50ddb14467b2bdbd62f3424b7176f0':
  Fix issue #2258571: Fix build versions
2009-11-13 10:55:29 -08:00
Xavier Ducrohet ca41c3c71e am e43eb27f: am 2bfaec8d: am c725b6ee: Merge change I4d3d08a1 into eclair
Merge commit 'e43eb27fc0ff883e83cdf4ff9b9bc403bff120be'

* commit 'e43eb27fc0ff883e83cdf4ff9b9bc403bff120be':
  Add the sdk overlay to the build.
2009-11-13 10:55:26 -08:00
Christopher Tate 218c6d3464 am 014b8e03: am eb71bf7b: Merge change I01d9d733 into eclair
Merge commit '014b8e0372d85b88eb647be690ae31c6213628bd' into eclair-mr2-plus-aosp

* commit '014b8e0372d85b88eb647be690ae31c6213628bd':
  Add a host shell function to generate system_server stack traces
2009-11-13 10:41:04 -08:00
Dianne Hackborn 265425746b am 8feaa2b6: am d0b22902: Merge change I847e8ab8 into eclair
Merge commit '8feaa2b67fdb93fe04a220cd5857c80c60b53934' into eclair-mr2-plus-aosp

* commit '8feaa2b67fdb93fe04a220cd5857c80c60b53934':
  Fix issue #2258571: Fix build versions
2009-11-13 10:41:01 -08:00
Xavier Ducrohet e43eb27fc0 am 2bfaec8d: am c725b6ee: Merge change I4d3d08a1 into eclair
Merge commit '2bfaec8d3299031130330e4b6b32603df6900697' into eclair-mr2-plus-aosp

* commit '2bfaec8d3299031130330e4b6b32603df6900697':
  Add the sdk overlay to the build.
2009-11-13 10:40:51 -08:00
Christopher Tate 014b8e0372 am eb71bf7b: Merge change I01d9d733 into eclair
Merge commit 'eb71bf7b743c94796dd6a93f8fa11e0fa6b8996b' into eclair-mr2

* commit 'eb71bf7b743c94796dd6a93f8fa11e0fa6b8996b':
  Add a host shell function to generate system_server stack traces
2009-11-13 09:08:38 -08:00
Dianne Hackborn 8feaa2b67f am d0b22902: Merge change I847e8ab8 into eclair
Merge commit 'd0b229025792977fe668cd636c7875d954b80b82' into eclair-mr2

* commit 'd0b229025792977fe668cd636c7875d954b80b82':
  Fix issue #2258571: Fix build versions
2009-11-13 09:08:34 -08:00
Christopher Tate a6e72ded88 am eb71bf7b: Merge change I01d9d733 into eclair
Merge commit 'eb71bf7b743c94796dd6a93f8fa11e0fa6b8996b' into eclair-plus-aosp

* commit 'eb71bf7b743c94796dd6a93f8fa11e0fa6b8996b':
  Add a host shell function to generate system_server stack traces
2009-11-13 09:08:30 -08:00
Xavier Ducrohet 2bfaec8d32 am c725b6ee: Merge change I4d3d08a1 into eclair
Merge commit 'c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275' into eclair-mr2

* commit 'c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275':
  Add the sdk overlay to the build.
2009-11-13 09:08:30 -08:00
Dianne Hackborn 8d9c211a12 am d0b22902: Merge change I847e8ab8 into eclair
Merge commit 'd0b229025792977fe668cd636c7875d954b80b82' into eclair-plus-aosp

* commit 'd0b229025792977fe668cd636c7875d954b80b82':
  Fix issue #2258571: Fix build versions
2009-11-13 09:08:26 -08:00
Xavier Ducrohet 69a8ac1d76 am c725b6ee: Merge change I4d3d08a1 into eclair
Merge commit 'c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275' into eclair-plus-aosp

* commit 'c725b6ee0c192c134a9ce4d74ecda9cbcd2c1275':
  Add the sdk overlay to the build.
2009-11-13 09:08:22 -08:00
Jean-Baptiste Queru e6b4e5b20a eclair snapshot 2009-11-13 07:31:05 -08:00
Android (Google) Code Review eb71bf7b74 Merge change I01d9d733 into eclair
* changes:
  Add a host shell function to generate system_server stack traces
2009-11-12 16:46:35 -08:00
Android (Google) Code Review d0b2290257 Merge change I847e8ab8 into eclair
* changes:
  Fix issue #2258571: Fix build versions
2009-11-12 16:28:03 -08:00
Android (Google) Code Review c725b6ee0c Merge change I4d3d08a1 into eclair
* changes:
  Add the sdk overlay to the build.
2009-11-12 16:20:00 -08:00
Dianne Hackborn f6295cdd82 Fix issue #2258571: Fix build versions
Change-Id: I847e8ab8080d5a0716e913da8e176e7dfcd966eb
2009-11-12 15:35:35 -08:00
Christopher Tate 744ee8025a Add a host shell function to generate system_server stack traces
For debugging non-ANR weird states in the system server, it is incredibly handy
to be able to force a complete thread-stack dump of that process.  Here's a
shell function that does so (creating the /data/anr/traces.txt file with the
usual permissions if it does not yet exist).

Depends on adb having been configured to run as root.

Change-Id: I01d9d733ef08ffefb00cb61968df36ecf62087f0
2009-11-12 15:33:08 -08:00
Dan Egnor fb78ca6efd am 26bcb110: am 75384694: Merge change I0c33d697 into eclair-mr2
Merge commit '26bcb110f81ff0f00593839bf8bd013c390649b8'

* commit '26bcb110f81ff0f00593839bf8bd013c390649b8':
  Clean old DropBoxService.java generated class
2009-11-12 14:21:21 -08:00
Dan Egnor 26bcb110f8 am 75384694: Merge change I0c33d697 into eclair-mr2
Merge commit '753846943dfd32c4dce100743fb143c8eb3119d5' into eclair-mr2-plus-aosp

* commit '753846943dfd32c4dce100743fb143c8eb3119d5':
  Clean old DropBoxService.java generated class
2009-11-12 14:16:54 -08:00
Android (Google) Code Review 753846943d Merge change I0c33d697 into eclair-mr2
* changes:
  Clean old DropBoxService.java generated class
2009-11-12 14:10:31 -08:00
Dan Egnor 0c33d697e7 Clean old DropBoxService.java generated class 2009-11-12 11:42:15 -08:00
David 'Digit' Turner 579e12bb6e am e870a487: am 002d1c24: am 31597999: Merge change I2edfb71d into eclair
Merge commit 'e870a487d6679eecca1f19524807cc2215922fb5'

* commit 'e870a487d6679eecca1f19524807cc2215922fb5':
  Support secondary CPU ABI in build.prop
2009-11-11 18:19:48 -08:00
David 'Digit' Turner e870a487d6 am 002d1c24: am 31597999: Merge change I2edfb71d into eclair
Merge commit '002d1c24b4dee2582e660f80669176c4a3e2db33' into eclair-mr2-plus-aosp

* commit '002d1c24b4dee2582e660f80669176c4a3e2db33':
  Support secondary CPU ABI in build.prop
2009-11-11 18:15:08 -08:00
David 'Digit' Turner 0464bc49e1 am 31597999: Merge change I2edfb71d into eclair
Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-plus-aosp

* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
  Support secondary CPU ABI in build.prop
2009-11-11 18:13:01 -08:00
David 'Digit' Turner 002d1c24b4 am 31597999: Merge change I2edfb71d into eclair
Merge commit '31597999a61c6b58b8f8b903f5f228a6ca07183f' into eclair-mr2

* commit '31597999a61c6b58b8f8b903f5f228a6ca07183f':
  Support secondary CPU ABI in build.prop
2009-11-11 18:12:06 -08:00
Android (Google) Code Review 31597999a6 Merge change I2edfb71d into eclair
* changes:
  Support secondary CPU ABI in build.prop
2009-11-11 18:08:03 -08:00
Jean-Baptiste Queru 96c3892fc0 merge from open-source master 2009-11-11 08:19:07 -08:00
Xavier Ducrohet 325b2eb9cb Add the sdk overlay to the build.
Change-Id: I4d3d08a13d23194a84fdd822a130f9aa71bb6360
2009-11-10 17:52:55 -08:00
Steve Block ffff296514 am 4ceee017: am 6ef2c375: Merge change I2bba1884 into eclair-mr2
Merge commit '4ceee017811ac4802703b40ac3997f393ead245b'

* commit '4ceee017811ac4802703b40ac3997f393ead245b':
  Clean libwebkit, libjs and libv8 after WebKit merge.
2009-11-10 15:27:37 -08:00
Doug Zongker fec674d99c am 4cc57b40: am d628eaca: am f17e6387: allow use of unzip version 6.0
Merge commit '4cc57b40fc6d7e5ee3692dac790254fdb0d2dd5e'

* commit '4cc57b40fc6d7e5ee3692dac790254fdb0d2dd5e':
  allow use of unzip version 6.0
2009-11-10 15:22:49 -08:00
Steve Block 4ceee01781 am 6ef2c375: Merge change I2bba1884 into eclair-mr2
Merge commit '6ef2c3759bf7ec457b86335bc2e06c6e6328fc24' into eclair-mr2-plus-aosp

* commit '6ef2c3759bf7ec457b86335bc2e06c6e6328fc24':
  Clean libwebkit, libjs and libv8 after WebKit merge.
2009-11-10 15:21:48 -08:00
Android (Google) Code Review 6ef2c3759b Merge change I2bba1884 into eclair-mr2
* changes:
  Clean libwebkit, libjs and libv8 after WebKit merge.
2009-11-10 14:54:04 -08:00
Doug Zongker 4cc57b40fc am d628eaca: am f17e6387: allow use of unzip version 6.0
Merge commit 'd628eacae7af10c520df98323250b385212270ca' into eclair-mr2-plus-aosp

* commit 'd628eacae7af10c520df98323250b385212270ca':
  allow use of unzip version 6.0
2009-11-10 14:52:07 -08:00
Doug Zongker d628eacae7 am f17e6387: allow use of unzip version 6.0
Merge commit 'f17e63879c9356d107bda7f8d599f7ce5f449051' into eclair-mr2

* commit 'f17e63879c9356d107bda7f8d599f7ce5f449051':
  allow use of unzip version 6.0
2009-11-10 12:33:31 -08:00
Doug Zongker baa5760a51 am f17e6387: allow use of unzip version 6.0
Merge commit 'f17e63879c9356d107bda7f8d599f7ce5f449051' into eclair-plus-aosp

* commit 'f17e63879c9356d107bda7f8d599f7ce5f449051':
  allow use of unzip version 6.0
2009-11-10 12:32:59 -08:00
Elliott Hughes 03ead3365d Teach apicheck about interface methods.
If a method is declared by an interface implemented directly by a class,
or indirectly by any of its superclasses, removing a duplicate declaration
is not an API change.

(This fixes the master build, which is currently broken because getOption
and setOption were removed from DatagramSocketImpl because they were
duplicate declarations of the same methods in the implemented interface
SocketOptions.)
2009-11-09 23:49:43 -08:00
Doug Zongker f17e63879c allow use of unzip version 6.0
Unzip 6.0 changes the name of the fourth column in the "unzip -lv"
output from "Ratio" to "Cmpr".  Allow either name so that
dump-package-stats works with both unzip 5 and unzip 6.
2009-11-09 18:19:48 -08:00
Steve Block 3be0640ad1 Clean libwebkit, libjs and libv8 after WebKit merge.
Change-Id: I2bba18843aa31b849de53e047dceb40de5eccc8a
2009-11-10 02:17:14 +00:00
Android Code Review 152b98fb7f Merge change Ia3f2b98b
* changes:
  Cosmetic fixes in css/js
2009-11-09 16:13:28 -08:00
Xavier Ducrohet 9dd765ff2c am ebbb0d45: am 38c09a03: am 216faf3f: Add Livewallpapers picker to SDK.
Merge commit 'ebbb0d45d7a892e784ea6cb8de92f6ae8fb848ce'

* commit 'ebbb0d45d7a892e784ea6cb8de92f6ae8fb848ce':
  Add Livewallpapers picker to SDK.
2009-11-09 13:49:21 -08:00
Xavier Ducrohet 77edd503af am a6f2b447: am 07cca294: am 58302409: Add CertInstaller to the SDK.
Merge commit 'a6f2b447090db78eb8d7a5097f1e182bca271961'

* commit 'a6f2b447090db78eb8d7a5097f1e182bca271961':
  Add CertInstaller to the SDK.
2009-11-09 13:49:18 -08:00
Android (Google) Code Review c967829807 Merge change I573364cd
* changes:
  Fix the host rule for building executables on darwin-x86.
2009-11-09 13:19:32 -08:00
Xavier Ducrohet ebbb0d45d7 am 38c09a03: am 216faf3f: Add Livewallpapers picker to SDK.
Merge commit '38c09a03195bbfee94b887ca6b1b8da3d79a4841' into eclair-mr2-plus-aosp

* commit '38c09a03195bbfee94b887ca6b1b8da3d79a4841':
  Add Livewallpapers picker to SDK.
2009-11-09 12:14:45 -08:00
Xavier Ducrohet a6f2b44709 am 07cca294: am 58302409: Add CertInstaller to the SDK.
Merge commit '07cca294a362450a5fc86e372d77503daab11eb1' into eclair-mr2-plus-aosp

* commit '07cca294a362450a5fc86e372d77503daab11eb1':
  Add CertInstaller to the SDK.
2009-11-09 12:14:42 -08:00
Jean-Baptiste Queru f43b38da71 am e1b710a5: merge from open-source master
Merge commit 'e1b710a5ba16be660d5383f1e56bd76b664b1d05'

* commit 'e1b710a5ba16be660d5383f1e56bd76b664b1d05':
  Added prune options to findleaves.sh to ignore the .git and .repo
  Added a default to specify an alternative tool chain prefix if needed.
  Update prelink map for libFLAC
2009-11-09 12:07:48 -08:00
Xavier Ducrohet 38c09a0319 am 216faf3f: Add Livewallpapers picker to SDK.
Merge commit '216faf3f1c2c8857ad7e88e860897766c830ce31' into eclair-mr2

* commit '216faf3f1c2c8857ad7e88e860897766c830ce31':
  Add Livewallpapers picker to SDK.
2009-11-09 11:59:56 -08:00
Xavier Ducrohet 07cca294a3 am 58302409: Add CertInstaller to the SDK.
Merge commit '58302409dd88d10e5c0ab03e5c5b5729ca41111a' into eclair-mr2

* commit '58302409dd88d10e5c0ab03e5c5b5729ca41111a':
  Add CertInstaller to the SDK.
2009-11-09 11:59:51 -08:00
Xavier Ducrohet b29ce14e0d am 216faf3f: Add Livewallpapers picker to SDK.
Merge commit '216faf3f1c2c8857ad7e88e860897766c830ce31' into eclair-plus-aosp

* commit '216faf3f1c2c8857ad7e88e860897766c830ce31':
  Add Livewallpapers picker to SDK.
2009-11-09 11:49:30 -08:00