Commit Graph

22765 Commits

Author SHA1 Message Date
Dan Egnor
1a0b304fac am 573205f4: Remove external/googleclient (the code moved elsewhere)
Merge commit '573205f4838cf0369fd6a7028c793726d1eb8620' into eclair-mr2-plus-aosp

* commit '573205f4838cf0369fd6a7028c793726d1eb8620':
  Remove external/googleclient (the code moved elsewhere)
2009-11-17 22:00:06 -08:00
Dan Egnor
573205f483 Remove external/googleclient (the code moved elsewhere) 2009-11-17 21:28:09 -08:00
Dan Bornstein
58226c0825 am 39b99e4f: am 34ce5914: resolved conflicts for merge of c3d9645e to eclair-mr2
Merge commit '39b99e4f593e2af103f6d21bc24776c264ee7ab3'

* commit '39b99e4f593e2af103f6d21bc24776c264ee7ab3':
  Add the example test to the CTS.
2009-11-17 16:38:57 -08:00
Dan Bornstein
39b99e4f59 am 34ce5914: resolved conflicts for merge of c3d9645e to eclair-mr2
Merge commit '34ce59147ca68f81a36ab05533a90199147ef3c7' into eclair-mr2-plus-aosp

* commit '34ce59147ca68f81a36ab05533a90199147ef3c7':
  Add the example test to the CTS.
2009-11-17 16:35:22 -08:00
Dan Bornstein
34ce59147c resolved conflicts for merge of c3d9645e to eclair-mr2 2009-11-17 16:27:02 -08:00
Dan Bornstein
189b528d26 am c3d9645e: Merge change I392672f1 into eclair
Merge commit 'c3d9645e29aeb124b39a0b7639767a5f1fead229' into eclair-plus-aosp

* commit 'c3d9645e29aeb124b39a0b7639767a5f1fead229':
  Add the example test to the CTS.
2009-11-17 15:42:56 -08:00
Android (Google) Code Review
c3d9645e29 Merge change I392672f1 into eclair
* changes:
  Add the example test to the CTS.
2009-11-17 15:39:46 -08:00
Xavier Ducrohet
1ae9880407 Change where makefile looks for sdk_clean.sh 2009-11-17 15:10:41 -08:00
Dan Bornstein
1347f92e3a Add the example test to the CTS.
Change-Id: I392672f1767bf72a18058de49c8658dabdc93a4d
2009-11-17 14:27:40 -08:00
Adam Bliss
cb3e80cd55 am 3a4b4985: am 0774bf3e: am 580cdbe0: Enables nodpi drawables in the framework.
Merge commit '3a4b4985ed9dafc01fd372474d40ec85bcc7f027'

* commit '3a4b4985ed9dafc01fd372474d40ec85bcc7f027':
  Enables nodpi drawables in the framework.
2009-11-17 07:35:29 -08:00
Adam Bliss
3a4b4985ed am 0774bf3e: am 580cdbe0: Enables nodpi drawables in the framework.
Merge commit '0774bf3ebd65c22d8cafb18e868bd2bbc1a0c4c9' into eclair-mr2-plus-aosp

* commit '0774bf3ebd65c22d8cafb18e868bd2bbc1a0c4c9':
  Enables nodpi drawables in the framework.
2009-11-16 20:00:57 -08:00
Adam Bliss
0774bf3ebd am 580cdbe0: Enables nodpi drawables in the framework.
Merge commit '580cdbe0fe0dd794c7035d8a406353f88aad827e' into eclair-mr2

* commit '580cdbe0fe0dd794c7035d8a406353f88aad827e':
  Enables nodpi drawables in the framework.
2009-11-16 19:56:34 -08:00
Adam Bliss
55823d3a08 am 580cdbe0: Enables nodpi drawables in the framework.
Merge commit '580cdbe0fe0dd794c7035d8a406353f88aad827e' into eclair-plus-aosp

* commit '580cdbe0fe0dd794c7035d8a406353f88aad827e':
  Enables nodpi drawables in the framework.
2009-11-16 18:59:04 -08:00
Adam Bliss
580cdbe0fe Enables nodpi drawables in the framework. 2009-11-16 17:18:40 -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
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
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
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
Dianne Hackborn
f6295cdd82 Fix issue #2258571: Fix build versions
Change-Id: I847e8ab8080d5a0716e913da8e176e7dfcd966eb
2009-11-12 15:35:35 -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
c967829807 Merge change I573364cd
* changes:
  Fix the host rule for building executables on darwin-x86.
2009-11-09 13:19:32 -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
Jean-Baptiste Queru
e1b710a5ba merge from open-source master 2009-11-09 10:34:27 -08:00
Dan Bornstein
16dc9c38d8 Fix the host rule for building executables on darwin-x86.
Change-Id: I573364cd0c95ce0157e21d3bb4f7e3b13c61dd70
2009-11-08 17:44:01 -08:00
Jean-Baptiste Queru
04f7cc171f merge from open-source master 2009-11-08 16:06:29 -08:00
David 'Digit' Turner
2edfb71d01 Support secondary CPU ABI in build.prop
BoardConfig.mk typically defines TARGET_CPU_ABI to the name of the
native machine code CPU ABI supported by the target device. For example,
existing devices today use the value 'armeabi' corresponding to an
ARMv5TE instruction set with soft-float implementation.

This patch allows this file to also define TARGET_CPU_ABI2 to name
a secondary (minor) CPU ABI also supported by the device. This is useful
when the main ABI is ARMv7-A (identified as 'armeabi-v7a') which also
supports ARMv5TE. Such devices should have TARGET_CPU_ABI defined to
'armeabi-v7a' and TARGET_CPU_ABI2 defined to 'armeabi'.

TARGET_CPU_ABI2 will be translated into the ro.product.cpu.abi2 property
in build.prop. This value will be used by the PackageManager to handle
"fat-binaries" generated with the NDK.
2009-11-06 15:12:00 -08:00
Mike Reed
c4386e4112 am ebed06a2: am 65a731b7: Merge change I8dd26ee4 into eclair-mr2
Merge commit 'ebed06a259eb1c00112a4e3a9d6d721700bbaedb'

* commit 'ebed06a259eb1c00112a4e3a9d6d721700bbaedb':
  remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
2009-11-06 11:35:02 -08:00
Mike Reed
ebed06a259 am 65a731b7: Merge change I8dd26ee4 into eclair-mr2
Merge commit '65a731b737bd6e8afa0b18176064dcc130dbb4ce' into eclair-mr2-plus-aosp

* commit '65a731b737bd6e8afa0b18176064dcc130dbb4ce':
  remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
2009-11-06 11:24:37 -08:00
Android (Google) Code Review
65a731b737 Merge change I8dd26ee4 into eclair-mr2
* changes:
  remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
2009-11-06 14:16:37 -05:00
akushner
ceb18f8923 Added prune options to findleaves.sh to ignore the .git and .repo
directories since the Android.mk files will not be found in these
directories.

Prunning out these directories decreased the make parse by nearly
a minute on a cold cache and eliminated 60,000+ stats on files in
the .git and .repo directories.
2009-11-05 12:49:27 -08:00
Fred Quintana
78562c4174 am 6f007cf9: am aa82f8ee: am 357f5bc8: Merge change I7397e6fe into eclair
Merge commit '6f007cf96c21b1dfce6e258eee5c2963aa86bcf1'

* commit '6f007cf96c21b1dfce6e258eee5c2963aa86bcf1':
  add the new accounts and sync package to the generic target and enable sync for all builds
2009-11-05 12:00:08 -08:00
Fred Quintana
6f007cf96c am aa82f8ee: am 357f5bc8: Merge change I7397e6fe into eclair
Merge commit 'aa82f8ee8f747e4466f3f6754201765a2b5b3707' into eclair-mr2-plus-aosp

* commit 'aa82f8ee8f747e4466f3f6754201765a2b5b3707':
  add the new accounts and sync package to the generic target and enable sync for all builds
2009-11-05 11:49:53 -08:00
Fred Quintana
aa82f8ee8f am 357f5bc8: Merge change I7397e6fe into eclair
Merge commit '357f5bc804fc80f06776e1da141e4b322d7e3248' into eclair-mr2

* commit '357f5bc804fc80f06776e1da141e4b322d7e3248':
  add the new accounts and sync package to the generic target and enable sync for all builds
2009-11-05 11:23:44 -08:00
Fred Quintana
5b5ec09e2e am 357f5bc8: Merge change I7397e6fe into eclair
Merge commit '357f5bc804fc80f06776e1da141e4b322d7e3248' into eclair-plus-aosp

* commit '357f5bc804fc80f06776e1da141e4b322d7e3248':
  add the new accounts and sync package to the generic target and enable sync for all builds
2009-11-05 11:23:10 -08:00
Android Code Review
617c402c71 Merge change I377f1f02
* changes:
  Update prelink map for libFLAC
2009-11-04 09:17:13 -08:00
Fred Quintana
170e1d59f6 add the new accounts and sync package to the generic target and enable sync for all builds 2009-11-03 16:05:03 -08:00
Mike Reed
8dd26ee452 remove reference to SK_RELEASE, since that is automatically set based on NDEBUG (or its absence)
i.e. if NDEBUG is defined, then SK_RELEASE will get defined in the skia config headers
2009-10-30 08:32:28 -04:00
android-build SharedAccount
96fb8fef18 resolved conflicts for merge of 01e7a68f to master 2009-10-29 01:31:08 -07:00
android-build SharedAccount
01e7a68fd0 am 8a5d5272: resolved conflicts for merge of 3fa11599 to eclair-mr2
Merge commit '8a5d527223414c3c23b8021eb8ed468d3299e968' into eclair-mr2-plus-aosp

* commit '8a5d527223414c3c23b8021eb8ed468d3299e968':
  Bump version to 2.1 API 6.
2009-10-28 17:21:53 -07:00
android-build SharedAccount
8a5d527223 resolved conflicts for merge of 3fa11599 to eclair-mr2 2009-10-28 16:12:11 -07:00
Dianne Hackborn
b8906579ab am 3fa11599: Bump version to 2.1 API 6.
Merge commit '3fa115999c8512095301724f557821f25ddfe08f' into eclair-plus-aosp

* commit '3fa115999c8512095301724f557821f25ddfe08f':
  Bump version to 2.1 API 6.
2009-10-27 12:57:08 -07:00
Dianne Hackborn
3fa115999c Bump version to 2.1 API 6.
Change-Id: Ic607952dfaa96d8735c83bb26bae4f2f4161fcbc
2009-10-26 17:40:19 -07:00
Dan Bornstein
6581feda85 Only put .o files into static libraries when building for the host.
In particular don't put the symbol indices from included .a files into
them. I didn't change the equivalent device rule ala the "if it ain't
broke" rule of thumb.

Change-Id: I064ac356a6f48f93fca2cd08a8408ca835f8f9a4
2009-10-22 13:14:41 -07:00
Owen Lin
ecfec9da14 am 053ff0e6: am 355670b9: am 64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules.
Merge commit '053ff0e674087e6320fbb961f384b9fe6d2c6949'

* commit '053ff0e674087e6320fbb961f384b9fe6d2c6949':
  Add OVERRIDE_PACKAGES support for prebuild modules.
2009-10-22 09:50:18 -07:00
Brandon Ballinger
bccc5b549b am 21e91f35: am c6c46243: am 36f349ac: Merge change Ied29246e into eclair
Merge commit '21e91f357a45069eaa55542dc9f46d1293d1c21c'

* commit '21e91f357a45069eaa55542dc9f46d1293d1c21c':
  Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
2009-10-22 09:50:15 -07:00
Owen Lin
053ff0e674 am 355670b9: am 64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules.
Merge commit '355670b98584210502f96fe0446a854f07026c28' into eclair-mr2-plus-aosp

* commit '355670b98584210502f96fe0446a854f07026c28':
  Add OVERRIDE_PACKAGES support for prebuild modules.
2009-10-22 09:33:33 -07:00
Brandon Ballinger
21e91f357a am c6c46243: am 36f349ac: Merge change Ied29246e into eclair
Merge commit 'c6c462434c17dfbbe3128b2a2804f5d2417ebadb' into eclair-mr2-plus-aosp

* commit 'c6c462434c17dfbbe3128b2a2804f5d2417ebadb':
  Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
2009-10-22 09:33:29 -07:00