Commit graph

1631 commits

Author SHA1 Message Date
Wei-Ta Chen
09831ec9b2 Merge "Add libjpeg to the prelink map." 2010-01-13 01:29:12 -08:00
Raphael Moll
44f6dde6a5 am acbbba88: am d1b68863: Merge "Add etc1tool to Windows SDK." into eclair
Merge commit 'acbbba88fb2a2e43b63cb83675ea368c47621ca8'

* commit 'acbbba88fb2a2e43b63cb83675ea368c47621ca8':
  Add etc1tool to Windows SDK.
2010-01-12 15:43:22 -08:00
Raphael Moll
acbbba88fb am d1b68863: Merge "Add etc1tool to Windows SDK." into eclair
Merge commit 'd1b68863f5ef252a92adcfb22d3ca48872981a61' into eclair-plus-aosp

* commit 'd1b68863f5ef252a92adcfb22d3ca48872981a61':
  Add etc1tool to Windows SDK.
2010-01-12 15:38:41 -08:00
Raphael Moll
d1b68863f5 Merge "Add etc1tool to Windows SDK." into eclair 2010-01-12 15:32:00 -08:00
Scott Main
685e9f3ec3 am 29bec3f7: am 7e680c89: Merge "docs: make the Resources docs use the same clearsilver template as the Dev Guide. This removes the custom resourcespage.cs file and routes resources pages to use docpage.cs, while still setting the resource hdf flag true (in order to h
Merge commit '29bec3f707401630e6ad93dcaa3e9a620f0d9bbb'

* commit '29bec3f707401630e6ad93dcaa3e9a620f0d9bbb':
  docs: make the Resources docs use the same clearsilver template
2010-01-12 13:11:58 -08:00
Scott Main
29bec3f707 am 7e680c89: Merge "docs: make the Resources docs use the same clearsilver template as the Dev Guide. This removes the custom resourcespage.cs file and routes resources pages to use docpage.cs, while still setting the resource hdf flag true (in order to highlight the
Merge commit '7e680c89ae01ca30c411f32e2e7ca1c093db0336' into eclair-plus-aosp

* commit '7e680c89ae01ca30c411f32e2e7ca1c093db0336':
  docs: make the Resources docs use the same clearsilver template
2010-01-12 12:23:50 -08:00
Scott Main
7e680c89ae Merge "docs: make the Resources docs use the same clearsilver template as the Dev Guide. This removes the custom resourcespage.cs file and routes resources pages to use docpage.cs, while still setting the resource hdf flag true (in order to highlight the Resources tab)." into eclair 2010-01-12 12:19:57 -08:00
Raphael
4e7b0e21c5 Add etc1tool to Windows SDK.
SDK BUG 2368918

This depends on Change I83485145 from development.git.

Change-Id: I1b4f5e39bd08c0cfbb656f2857921fb5ad305812
2010-01-12 11:18:02 -08:00
Joe Onorato
226d0057ef Merge "$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/VoiceSearchWithKeyboard.apk)" 2010-01-11 12:46:14 -08:00
Joe Onorato
c38d5011ef $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app/VoiceSearchWithKeyboard.apk) 2010-01-11 15:45:42 -05:00
Jean-Baptiste Queru
75127b769e Remove special-handling of the restricted tag.
Nobody is using it any more, and it'd be too easy to
make a build system change that wouldn't properly handle it.

Change-Id: Ia61232ff944c34c46932c1885b2b0ec1b479566b
2010-01-11 09:40:39 -08:00
Jean-Baptiste Queru
6907cfe7de Remove special-case where CLASS=apps ignored TAGS=user
Also add a warning when there's TAG=user on a CLASS=apps module,
as this is not what people normally intend (this should be handled
in core.mk instead).

This used to be a source of confusion, with people using TAGS=user on
APPS and non-APPS modules, and being surprised to see some of those
included but not others.

Change-Id: I56b5618a556abdc6b841bf7a943d77c20fe9a4c5
2010-01-11 09:40:39 -08:00
Jean-Baptiste Queru
a831cbdcfc Warn when using unrecognized/uncommon tags.
Such tags don't do anything, so using them is at
best a no-op, at worst a typo where the author intended
something else.

Change-Id: I1462032f4df3564b06a82685f226a6d5a665a633
2010-01-11 09:40:39 -08:00
Bjorn Bringert
ff22b00329 Merge "Include QuickSearchBox in build" 2010-01-11 03:09:39 -08:00
Bjorn Bringert
cb00546286 Include QuickSearchBox in build
Change-Id: I079e2ae0dabb7a94e95658ae4189abfa2f292a7a
Fixes: http://b/issue?id=2360980
2010-01-08 22:29:41 +00:00
Joe Onorato
be522c22bd Merge "add a warning about using include in product spec files." 2010-01-08 11:37:38 -08:00
Dirk Dougherty
f3538b21aa am bd4fcbfb: am 5b395224: Merge "SDK doc change: css styling for blockquote." into eclair
Merge commit 'bd4fcbfb03758cca84b6ce0041cfa77e178f6135'

* commit 'bd4fcbfb03758cca84b6ce0041cfa77e178f6135':
  SDK doc change: css styling for blockquote.
2010-01-07 12:47:15 -08:00
Dirk Dougherty
bd4fcbfb03 am 5b395224: Merge "SDK doc change: css styling for blockquote." into eclair
Merge commit '5b3952249ccf7e41ac6a0ac1490cf150bca3a80f' into eclair-plus-aosp

* commit '5b3952249ccf7e41ac6a0ac1490cf150bca3a80f':
  SDK doc change: css styling for blockquote.
2010-01-07 12:43:47 -08:00
Dirk Dougherty
5b3952249c Merge "SDK doc change: css styling for blockquote." into eclair 2010-01-07 12:39:47 -08:00
Dirk Dougherty
a16e79c8b0 SDK doc change: css styling for blockquote.
Bug: 2160782
Change-Id: I99a9494feb8b754636745f979db27380ae623c96
2010-01-07 12:23:01 -08:00
Joe Onorato
7b86bfb03e add a warning about using include in product spec files.
currently disabled because there are too many of them.
2010-01-07 11:26:05 -08:00
Wei Huang
84136cf667 clean GSF GTalkService objects.
Change-Id: If2461c60a53aa081fb097581e71272eea1449657
2010-01-07 10:23:03 -08:00
Scott Main
554d1fa649 am 91533402: am b6da4808: update for change Ia39d3bb0, which regressed a resizing hack for IE6.
Merge commit '915334025e0c7a5b77c387315118e687461e4842'

* commit '915334025e0c7a5b77c387315118e687461e4842':
  update for change Ia39d3bb0, which regressed a resizing hack for IE6.
2010-01-07 10:08:48 -08:00
Scott Main
915334025e am b6da4808: update for change Ia39d3bb0, which regressed a resizing hack for IE6.
Merge commit 'b6da4808699180c608bccef88ddb843411e663c7' into eclair-plus-aosp

* commit 'b6da4808699180c608bccef88ddb843411e663c7':
  update for change Ia39d3bb0, which regressed a resizing hack for IE6.
2010-01-07 10:06:00 -08:00
Scott Main
b6da480869 update for change Ia39d3bb0, which regressed a resizing hack for IE6.
This now will avoid writing the cookie for the width when IE6 calls
resizeWidth() in order to properly resize the doc-content div (other
browsers to not call resizeWidth() for resizing doc-content because it
has auto width, which IE6 does not perform).
2010-01-06 16:58:52 -08:00
Scott Main
9776131af8 am 83e85549: am a39d3bb0: docs: fix resizeAll script for IE6 so that the resizeWidth function is only called when the side navigation is actually resizable
Merge commit '83e855494b0b4215c78593efdf69b98c115288f1'

* commit '83e855494b0b4215c78593efdf69b98c115288f1':
  docs: fix resizeAll script for IE6 so that the resizeWidth function
2010-01-06 16:57:28 -08:00
Scott Main
83e855494b am a39d3bb0: docs: fix resizeAll script for IE6 so that the resizeWidth function is only called when the side navigation is actually resizable
Merge commit 'a39d3bb0c9001c79f93ae829d564e5fef27a573a' into eclair-plus-aosp

* commit 'a39d3bb0c9001c79f93ae829d564e5fef27a573a':
  docs: fix resizeAll script for IE6 so that the resizeWidth function
2010-01-06 16:55:15 -08:00
Scott Main
a39d3bb0c9 docs: fix resizeAll script for IE6 so that the resizeWidth function
is only called when the side navigation is actually resizable

This stops 'width' cookies from being written for the SDK docs
(and any other page that doesn't have resizable nav) and also adds
some security to the init() function to be sure we properly read
cookie names.
2010-01-06 14:33:20 -08:00
Wei-Ta Chen
d139dbb818 Add libjpeg to the prelink map.
libjpeg is now built to a shared library,
which enables it be dynamically linked by various packeages/libraries.
2010-01-06 18:42:25 +08:00
Joe Onorato
05c7f61caf Don't do the check build step for apps that link against the SDK.
We already have the apicheck process to make sure that nobody breaks that,
so doing the extra check isn't necessary.
2010-01-05 12:47:14 -08:00
Joe Onorato
bc8abb6fec Tell python not to spam the source tree with .pyc files.
This only has an effect on python 2.6 and above.
2010-01-04 12:57:38 -08:00
Jack Palevich
fcc50ebb4a Add libETC1 to the prelink map.
libETC1 is a library for compressing and
decompressing images in the ETC1 format.

This is a common texture format for OpenGL ES 2.0
GPUs.
2009-12-29 19:04:13 +08:00
Jean-Baptiste Queru
524829130c resolved conflicts for merge of a7bfdbf2 to master 2009-12-21 15:50:18 -08:00
Jean-Baptiste Queru
a7bfdbf2f5 merge from open-source master 2009-12-21 15:31:49 -08:00
Jean-Baptiste Queru
0a3cfdc853 Add all-html-files-under
This allows to run droiddoc on only a specific set of subdirectories
instead of using all subdirectories.

Change-Id: I6b5daa31f6ce6801705a5c87bd05ea0e4e8c5d88
2009-12-18 09:02:13 -08:00
Brett Chabot
a709a1b2a4 am d5cf3a95: am 1e43c510: Add CTS accounts tests to CTS makefile.
Merge commit 'd5cf3a95cce2d9699d2c3f5998d51302f51aa03c'

* commit 'd5cf3a95cce2d9699d2c3f5998d51302f51aa03c':
  Add CTS accounts tests to CTS makefile.
2009-12-17 16:40:56 -08:00
Brett Chabot
d5cf3a95cc am 1e43c510: Add CTS accounts tests to CTS makefile.
Merge commit '1e43c510758439b3195597056121c59b71481254' into eclair-plus-aosp

* commit '1e43c510758439b3195597056121c59b71481254':
  Add CTS accounts tests to CTS makefile.
2009-12-17 16:38:04 -08:00
Brett Chabot
1e43c51075 Add CTS accounts tests to CTS makefile.
Change-Id: If7d87e2deed2036536ad852c382dca0e8bbad87b
2009-12-17 15:14:40 -08:00
Andreas Huber
64b00e3f98 Squashed commit of the following:
commit b03d5f537dee393affddf89663ae6977a5512d98
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 17 14:00:37 2009 -0800

    Update cleanspec to facilitate incremental building with full stagefright lib.

commit b92560a1989f8b9cb27a8772cec5346d3d90dc84
Author: Andreas Huber <andih@google.com>
Date:   Thu Dec 17 13:31:48 2009 -0800

    Enable building stagefright in all builds, make stagefright the default player.
2009-12-17 14:46:46 -08:00
Jeff Hamilton
c4be3ecb01 Cleanspecs from Ed to cleanup after my previous name change. 2009-12-17 15:35:37 -06:00
Jeff Hamilton
aa2885ed34 Switch the platform name from Eclair-MR2 to Froyo. 2009-12-17 15:25:19 -06:00
Scott Main
3669072b81 docs: make the Resources docs use the same clearsilver template
as the Dev Guide. This removes the custom resourcespage.cs file
and routes resources pages to use docpage.cs, while still
setting the resource hdf flag true (in order to highlight the
Resources tab).
2009-12-17 12:52:54 -08:00
Scott Main
c5aea0ebcd am b0c21911: am 99a25fba: Merge change I92c7fe59 into eclair
Merge commit 'b0c219115533fe94056d4498603ce8e474e1b9a0'

* commit 'b0c219115533fe94056d4498603ce8e474e1b9a0':
  docs: change DOCTYPE to html5 format
2009-12-16 21:43:46 -08:00
Scott Main
b0c2191155 am 99a25fba: Merge change I92c7fe59 into eclair
Merge commit '99a25fbaa50a077c5d62b9ae204677c176534d8b' into eclair-plus-aosp

* commit '99a25fbaa50a077c5d62b9ae204677c176534d8b':
  docs: change DOCTYPE to html5 format
2009-12-16 21:40:55 -08:00
Android (Google) Code Review
99a25fbaa5 Merge change I92c7fe59 into eclair
* changes:
  docs: change DOCTYPE to html5 format
2009-12-16 21:38:02 -08:00
Scott Main
92c7fe59a7 docs: change DOCTYPE to html5 format 2009-12-16 21:36:15 -08:00
Android (Google) Code Review
99873bbbf1 Merge change I32b3795d
* changes:
  add Provision to the generic build
2009-12-16 16:11:15 -08:00
Scott Main
b8143d2f0a am d79b160d: am ab32fed6: docs for esr: add support for breadcrumbing in the resource docs
Merge commit 'd79b160d90450068237282393be0d7456cb14bc1'

* commit 'd79b160d90450068237282393be0d7456cb14bc1':
  docs for esr: add support for breadcrumbing in the resource docs
2009-12-16 15:52:41 -08:00
Scott Main
d79b160d90 am ab32fed6: docs for esr: add support for breadcrumbing in the resource docs
Merge commit 'ab32fed6a8efbdb8640f6f6b355b751fd6c7eb53' into eclair-plus-aosp

* commit 'ab32fed6a8efbdb8640f6f6b355b751fd6c7eb53':
  docs for esr: add support for breadcrumbing in the resource docs
2009-12-16 15:44:37 -08:00
Scott Main
ab32fed6a8 docs for esr: add support for breadcrumbing in the resource docs 2009-12-16 15:36:20 -08:00