Commit Graph

36880 Commits

Author SHA1 Message Date
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
Owen Lin
355670b985 am 64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules.
Merge commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924' into eclair-mr2

* commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924':
  Add OVERRIDE_PACKAGES support for prebuild modules.
2009-10-22 06:44:28 -07:00
Brandon Ballinger
c6c462434c am 36f349ac: Merge change Ied29246e into eclair
Merge commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5' into eclair-mr2

* commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5':
  Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
2009-10-22 06:43:04 -07:00
Dan Bornstein
3d02eacbde It's not safe to use the TARGET ar when building a HOST .a (natch).
Change-Id: If9e851fe3306993fb49210952d81ab36cb78c807
2009-10-21 11:12:56 -07:00
Owen Lin
90a540b321 am 64d5a807: Add OVERRIDE_PACKAGES support for prebuild modules.
Merge commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924' into eclair-plus-aosp

* commit '64d5a8070630e816e62fc2d3fdcbe820f50ec924':
  Add OVERRIDE_PACKAGES support for prebuild modules.
2009-10-21 09:52:33 -07:00
Owen Lin
64d5a80706 Add OVERRIDE_PACKAGES support for prebuild modules.
So that some prebuild module can override existing packages.

Change-Id: I4f0d019e07b84d24cf0234903bd4b06104e0ed27
2009-10-20 22:23:37 -07:00
Brandon Ballinger
603b894c92 am 36f349ac: Merge change Ied29246e into eclair
Merge commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5' into eclair-plus-aosp

* commit '36f349acc9c976cf3966ebde5df6410a09a3d7a5':
  Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
2009-10-20 19:43:46 -07:00
Android (Google) Code Review
36f349acc9 Merge change Ied29246e into eclair
* changes:
  Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules.
2009-10-20 22:28:45 -04:00
Brandon Ballinger
ed29246e31 Add support for LOCAL_OVERRIDES_PACKAGES to prebuilt build rules. 2009-10-20 17:41:16 -07:00
Doug Zongker
5752ee5a99 am decdbd79: Merge change I5e98e6f0 into eclair
Merge commit 'decdbd7956c34895f73001cfa2018a27c8702ad0' into eclair-plus-aosp

* commit 'decdbd7956c34895f73001cfa2018a27c8702ad0':
  use aapt to build jar files instead of the system zip (DO NOT MERGE)
2009-10-20 13:41:04 -07:00
Doug Zongker
5e98e6f05c use aapt to build jar files instead of the system zip (DO NOT MERGE)
By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.

(This is a cherry-pick of a change already submitted to eclair-mr2;
the change was approved for mr1.)
2009-10-19 17:05:46 -07:00
Dan Bornstein
6bffc91c5d Make the host static library build rule know about
LOCAL_WHOLE_STATIC_LIBRARIES.

While I was in the territory, I reordered a few lines to be more
consistent with nearby code/files.

Change-Id: Ie9809f065e32ca748ae4539dd785980ff496c2d2
2009-10-15 16:28:56 -07:00
Jean-Baptiste Queru
3ca0693894 am e93ece70: merge from open-source master
Merge commit 'e93ece70a8d9657d5d08c59db75582d0d057d3bb'

* commit 'e93ece70a8d9657d5d08c59db75582d0d057d3bb':
  Remove temporary vold logic
  added linux-sh.mk to support SuperH architecture
2009-10-14 16:16:46 -07:00
Jean-Baptiste Queru
e93ece70a8 merge from open-source master 2009-10-14 16:02:08 -07:00
Jean-Baptiste Queru
2a11836482 merge from open-source master 2009-10-14 08:18:24 -07:00
Doug Zongker
690804c399 am 6ebf4436: Merge change I04432db5 into eclair-mr2
Merge commit '6ebf443631025b132f644bd349258192db4e3e9c'

* commit '6ebf443631025b132f644bd349258192db4e3e9c':
  use aapt to build jar files instead of the system zip
2009-10-13 17:10:34 -07:00
Raphael
b54523bc00 am feec1ce3: am aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit 'feec1ce3e01c93f43f425747df8073e9580d775a'

* commit 'feec1ce3e01c93f43f425747df8073e9580d775a':
  Windows SDK: support tools/sdklauncher and tools/layoutopt
2009-10-13 17:09:19 -07:00
Dan Bornstein
fa477ba15e Allow WITH_JIT to be overridden in a custom buildspec.mk file.
Change-Id: I0fb7ffcfb9786f611e981d8f22f67a5ac8c9c405
2009-10-13 15:56:48 -07:00
Android (Google) Code Review
6ebf443631 Merge change I04432db5 into eclair-mr2
* changes:
  use aapt to build jar files instead of the system zip
2009-10-13 17:12:59 -04:00
Raphael
feec1ce3e0 am aa569862: Windows SDK: support tools/sdklauncher and tools/layoutopt
Merge commit 'aa569862dee45bfa72d342e9982cb5205df9bf04' into eclair-mr2

* commit 'aa569862dee45bfa72d342e9982cb5205df9bf04':
  Windows SDK: support tools/sdklauncher and tools/layoutopt
2009-10-13 12:17:40 -07:00
Dianne Hackborn
3d967b873a am 3f7405e9: am ff6f3fe4: Finish issue #2168428: STOP SHIP: Bump API version to 5.
Merge commit '3f7405e9940db18fade6fb86899bb8b88bd67bcf'

* commit '3f7405e9940db18fade6fb86899bb8b88bd67bcf':
  Finish issue #2168428: STOP SHIP: Bump API version to 5.
2009-10-13 12:12:03 -07:00
Raphael
aa569862de Windows SDK: support tools/sdklauncher and tools/layoutopt
Change-Id: Iac7d7a0cdc439b2bb1e334e82fe0f354b14d7001
2009-10-12 16:16:02 -07:00
Sriram Raman
ca02204ddb am 2bd9027d: Merge change I5bbd2294 into eclair-mr2
Merge commit '2bd9027d0a2055e56a8047c11dda7f6551b9f183'

* commit '2bd9027d0a2055e56a8047c11dda7f6551b9f183':
  For Ying Wang:
2009-10-12 12:42:05 -07:00
Joe Onorato
a5ed6af74d am cb9102e0: am 0889661c: eng builds only -- make the thing that makes setupwizard optional actually work.
Merge commit 'cb9102e056e8553745c2abd942852232bfadd98b'

* commit 'cb9102e056e8553745c2abd942852232bfadd98b':
  eng builds only -- make the thing that makes setupwizard optional actually work.
2009-10-12 12:30:57 -07:00
Dianne Hackborn
c2289d10cc am de7e9e6e: am 0187d842: Part of issue #2168428: STOP SHIP: Bump API version to 5
Merge commit 'de7e9e6e8fc4044dbc48f1687af92e7aae1d6638'

* commit 'de7e9e6e8fc4044dbc48f1687af92e7aae1d6638':
  Part of issue #2168428: STOP SHIP: Bump API version to 5
2009-10-12 12:26:59 -07:00
Brett Chabot
392bda6e09 am 66e0c458: Merge change I7bc67c51 into eclair-mr2
Merge commit '66e0c458ae94b8520d8d54c15ecf6a283380b69d'

* commit '66e0c458ae94b8520d8d54c15ecf6a283380b69d':
  Manual merge of donut-gms cts.mk changes.
2009-10-12 11:41:46 -07:00
Doug Zongker
9e4374be2c use aapt to build jar files instead of the system zip
By using 'aapt add' instead of whatever 'zip' utility happens to be
installed on the machine, we get files that are imgdiff-friendly,
which makes for smaller incremental OTAs.
2009-10-09 12:14:03 -07:00
Dianne Hackborn
3f7405e994 am ff6f3fe4: Finish issue #2168428: STOP SHIP: Bump API version to 5.
Merge commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9' into eclair-mr2

* commit 'ff6f3fe4482bcad900bce2e78204ad5cb466bbf9':
  Finish issue #2168428: STOP SHIP: Bump API version to 5.
2009-10-08 21:07:12 -07:00
Dianne Hackborn
ff6f3fe448 Finish issue #2168428: STOP SHIP: Bump API version to 5.
We are now 2.0.  Note that CorpCal and PhoneConfig are now gone
until their prebuilts are updated.

Change-Id: I26d13d6b75f5633113d82b8d90788d8bbc915014
2009-10-08 20:50:27 -07:00
Brett Chabot
1b3886b848 am 45dc54f6: Add speech tests to CTS makefile.
Merge commit '45dc54f680faea12519870db356f84924c00687d' into eclair

* commit '45dc54f680faea12519870db356f84924c00687d':
  Add speech tests to CTS makefile.
2009-10-08 10:48:24 -07:00
Brett Chabot
af6ccb69fe am 30e1f2bd: Add dpi tests to CTS.
Merge commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408' into eclair

* commit '30e1f2bdd83ad7b0f2cb8ec738e93ea2a5a6c408':
  Add dpi tests to CTS.
2009-10-08 10:48:20 -07:00
Brett Chabot
45dc54f680 Add speech tests to CTS makefile. 2009-10-08 10:00:37 -07:00
Brett Chabot
30e1f2bdd8 Add dpi tests to CTS. 2009-10-08 10:00:37 -07:00
Sriram Raman
5bbd2294e9 For Ying Wang:
Fix "argument list too long" build error bug.
2009-10-07 16:27:38 -07:00
Joe Onorato
cb9102e056 am 0889661c: eng builds only -- make the thing that makes setupwizard optional actually work.
Merge commit '0889661cd890e49a4827da0dc5d583274347d178' into eclair-mr2

* commit '0889661cd890e49a4827da0dc5d583274347d178':
  eng builds only -- make the thing that makes setupwizard optional actually work.
2009-10-07 11:37:52 -07:00
Joe Onorato
0889661cd8 eng builds only -- make the thing that makes setupwizard optional actually work. 2009-10-07 10:01:13 -07:00