Commit Graph

2208 Commits

Author SHA1 Message Date
Ying Wang ee43a90f4f Merge "Dist only if the goal is to be built" 2010-04-28 15:45:58 -07:00
Ying Wang a37a2cb231 Dist only if the goal is to be built
Change-Id: I1b794f36a6dc39ce68cc990b967d2d55118c92ca
http://b/issue?id=2635603
2010-04-28 12:59:51 -07:00
Scott Main 2dfe398a29 am 1053592f: am e611eef0: am c3d808a7: Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo 2010-04-27 18:56:45 -07:00
Brett Chabot 3fcf6020d3 Merge "Add CTS tests for the accessibility APIs. (make)" 2010-04-27 15:46:55 -07:00
Scott Main 1053592f91 am e611eef0: am c3d808a7: Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo
Merge commit 'e611eef001a7c79ab5b89aef49235944d760806d' into kraken

* commit 'e611eef001a7c79ab5b89aef49235944d760806d':
  support a few more header levels for sidebox so the sidebox can
2010-04-27 14:31:46 -07:00
Scott Main e611eef001 am c3d808a7: Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo
Merge commit 'c3d808a727c2b42d48658e6fca06b1d4a9817f12' into froyo-plus-aosp

* commit 'c3d808a727c2b42d48658e6fca06b1d4a9817f12':
  support a few more header levels for sidebox so the sidebox can
2010-04-27 14:28:12 -07:00
Scott Main c3d808a727 Merge "support a few more header levels for sidebox so the sidebox can be placed at any level and be semantically correct" into froyo 2010-04-27 14:23:04 -07:00
Nick Kralevich 19f5d7db96 am 387e4d06: LOCAL_LDFLAGS should come after TARGET_GLOBAL_LDFLAGS 2010-04-26 15:16:49 -07:00
Nick Kralevich 387e4d0601 LOCAL_LDFLAGS should come after TARGET_GLOBAL_LDFLAGS
A package can define a LOCAL_LDFLAGS.  If a LOCAL_LDFLAGS
exists, it should come after the global LDFLAGS, to allow
the local flags to override the global flags.

Change-Id: I6e44c17949c1f11c808d0ed3f327d63fb51a1468
2010-04-26 14:12:19 -07:00
Ying Wang 03db52ff61 am ee797113: (-s ours) Add ramdisk to dist. [DO NOT MERGE] 2010-04-26 11:53:05 -07:00
Ying Wang ee79711322 Add ramdisk to dist. [DO NOT MERGE]
cherry-pick from master.
http://b/issue?id=2590492

Change-Id: I1a8f0313a486665847b27fb58ac9a57881d5e913
2010-04-26 11:27:55 -07:00
Guang Zhu 0198d6ebb4 collect emm meta files for emma instrumented build
when doing 'make dist', with EMMA_INSTRUMENT on the coverage.em files
generated for each module will be collected into one emma_meta.zip file

Change-Id: I382c39a97005e6cae5c79ad7eaef1c8857f658af
2010-04-26 11:26:55 -07:00
Elliott Hughes 0bc1278964 Merge "Make a full list of locales available, and use it for the sim build." 2010-04-26 10:52:43 -07:00
Elliott Hughes 6b5635e446 Make a full list of locales available, and use it for the sim build.
Bug: 2498876
Change-Id: I59b8d851c6cd242d199c189f3e3dfde9baf3e6e0
2010-04-26 10:49:43 -07:00
Raphael 532155dbfb am 649c4731: am 381ee392: am 9ca1628e: Support building Windows SDK under Linux. 2010-04-26 10:11:50 -07:00
Raphael 614987e680 am 31a4f6ff: am 575cf4dc: am 4c70244c: Make zipalign build for the Win SDK under Linux. 2010-04-26 10:11:48 -07:00
Svetoslav Ganov 08430d5350 Add CTS tests for the accessibility APIs. (make)
Change-Id: I4cdf7639412e1fcea0f4ee29f79e2868408cf9a1
2010-04-23 17:40:29 -07:00
Raphael 649c4731b1 am 381ee392: am 9ca1628e: Support building Windows SDK under Linux.
Merge commit '381ee392e8ebba35cb65321415f4cdb537b446ed' into kraken

* commit '381ee392e8ebba35cb65321415f4cdb537b446ed':
  Support building Windows SDK under Linux.
2010-04-23 17:21:48 -07:00
Raphael 31a4f6ff4c am 575cf4dc: am 4c70244c: Make zipalign build for the Win SDK under Linux.
Merge commit '575cf4dc5e7d290858b1c11f4195694888a8164c' into kraken

* commit '575cf4dc5e7d290858b1c11f4195694888a8164c':
  Make zipalign build for the Win SDK under Linux.
2010-04-23 17:21:45 -07:00
Raphael 381ee392e8 am 9ca1628e: Support building Windows SDK under Linux.
Merge commit '9ca1628e3f565607e1fdef71b570d3ddb5ec09df' into froyo-plus-aosp

* commit '9ca1628e3f565607e1fdef71b570d3ddb5ec09df':
  Support building Windows SDK under Linux.
2010-04-23 17:15:13 -07:00
Raphael 575cf4dc5e am 4c70244c: Make zipalign build for the Win SDK under Linux.
Merge commit '4c70244cb1af8b2babd7750c2bd19aeb722e19e0' into froyo-plus-aosp

* commit '4c70244cb1af8b2babd7750c2bd19aeb722e19e0':
  Make zipalign build for the Win SDK under Linux.
2010-04-23 17:14:58 -07:00
Ying Wang 8b9b39e995 Add phony target to build and dist sample code.
See http://b/issue?id=2468418
After this CL, add "samplecode" to your make goals, you will get the sample apks
built and installed at out/target/common/samples/.

Change-Id: Iff83f2ba6b6c2fe6ac1c78ca4a9d4bc6953dac8a
2010-04-23 13:57:07 -07:00
Ying Wang 929cdf3313 Add ramdisk.img to the dist dir.
Change-Id: Ia74c501298010734dd1b8db8df86720d3e8bb7cd
http://b/issue?id=2590492
2010-04-23 13:39:40 -07:00
Raphael 9ca1628e3f Support building Windows SDK under Linux.
- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.

- Makfile: include windows_sdk.mk when needed to build a Windows SDK.

- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)

(Merge master Change I9d08d0df)
2010-04-23 13:17:23 -07:00
Raphael 4c70244cb1 Make zipalign build for the Win SDK under Linux.
(Merge master Change Ibd667437)
2010-04-23 13:15:37 -07:00
Scott Main 7f418a518b support a few more header levels for sidebox so the sidebox can
be placed at any level and be semantically correct

Change-Id: I51b77e82a701e1898986698d3a58a1b8367ec5c6
2010-04-23 11:41:30 -07:00
Raphael 3d224a0fc9 Support building Windows SDK under Linux.
- envsetup.mk & config.mk: we define a new BUILD_OS and a minimal set
of things like BUILD_OUT to be able to use some local tools when
doing cross-compilation. This allows us to use the Linux version of
ACP when cross-compiling the tools to Windows.

- Makfile: include windows_sdk.mk when needed to build a Windows SDK.

- main.mk: support a win_sdk target (e.g. PRODUCT-sdk-win_sdk)

Change-Id: I9d08d0df598b8a7292532d23c55f48101a95a240
2010-04-23 10:06:41 -07:00
Raphael d7036e3cc0 Merge "Make zipalign build for the Win SDK under Linux." 2010-04-23 09:56:54 -07:00
Dianne Hackborn b1ae8ab97d Merge "Mmmmmm... Gingerbread!" 2010-04-22 16:24:19 -07:00
Doug Zongker 6717059ccc don't use the -m option when building OTA packages any more
The -m option no longer exists; we only support one OTA package script
language in gingerbread.

Change-Id: I9b532a30f8c3b297b8ffdb2a570a24db37f056d1
2010-04-21 14:53:07 -07:00
Doug Zongker 9ce2ebf5d3 remove remaining amend support
Remove the remaining (unused and untested) support for generating
amend scripts.  This means that you won't be able to OTA directly from
cupcake to gingerbread.

Change-Id: Ie7179a5f2e5ca0d2c0305000344ac39b1dd7385f
2010-04-21 14:17:21 -07:00
Ying Wang 3533eca851 Add build number to apks by appending it to versionName.
Change-Id: I476ff3514068814211d67e8ed956f1923be33bcd
http://b/issue?id=2557312
2010-04-21 10:23:42 -07:00
Scott Main 475089cc25 am 19ca463e: am 55f1fca1: am d72731d2: docs: misc css changes make sidebox size match qv make figure align with right margin remove margins from the last <p> in a table cell 2010-04-20 17:46:25 -07:00
Scott Main 19ca463e87 am 55f1fca1: am d72731d2: docs: misc css changes make sidebox size match qv make figure align with right margin remove margins from the last <p> in a table cell
Merge commit '55f1fca10ee8419d10b25fa7d2ab5a1dc1278f0b' into kraken

* commit '55f1fca10ee8419d10b25fa7d2ab5a1dc1278f0b':
  docs: misc css changes
2010-04-20 17:37:28 -07:00
Scott Main 55f1fca10e am d72731d2: docs: misc css changes make sidebox size match qv make figure align with right margin remove margins from the last <p> in a table cell
Merge commit 'd72731d213269f63f2bb80631f02914800f556ad' into froyo-plus-aosp

* commit 'd72731d213269f63f2bb80631f02914800f556ad':
  docs: misc css changes
2010-04-20 17:33:03 -07:00
Scott Main c1d74726cb am 6f467f62: am e3e590be: am f655dab5: Merge "docs: add script to capture the ctrl+f key event (initiates \'find\' search on the page) and expand all inherited members." into froyo 2010-04-20 15:52:32 -07:00
Raphael 925a3279b7 Make zipalign build for the Win SDK under Linux.
Change-Id: Ibd667437d6637fbc5b21147f57eb41e81cbd8577
2010-04-20 15:46:54 -07:00
Scott Main 6f467f6206 am e3e590be: am f655dab5: Merge "docs: add script to capture the ctrl+f key event (initiates \'find\' search on the page) and expand all inherited members." into froyo
Merge commit 'e3e590be4e7260beae0de164f07a199bc73bbcf8' into kraken

* commit 'e3e590be4e7260beae0de164f07a199bc73bbcf8':
  docs: add script to capture the ctrl+f key event (initiates 'find' search
2010-04-20 15:43:19 -07:00
Scott Main e3e590be4e am f655dab5: Merge "docs: add script to capture the ctrl+f key event (initiates \'find\' search on the page) and expand all inherited members." into froyo
Merge commit 'f655dab5e611d8e013f1e5ad4ddcb269f7db05a6' into froyo-plus-aosp

* commit 'f655dab5e611d8e013f1e5ad4ddcb269f7db05a6':
  docs: add script to capture the ctrl+f key event (initiates 'find' search
2010-04-20 15:38:17 -07:00
Scott Main d72731d213 docs: misc css changes
make sidebox size match qv
make figure align with right margin
remove margins from the last <p> in a table cell

Change-Id: Ie655dac45728f782fb309f3c11c1b7ee56bc5660
2010-04-20 15:35:49 -07:00
Scott Main f655dab5e6 Merge "docs: add script to capture the ctrl+f key event (initiates 'find' search on the page) and expand all inherited members." into froyo 2010-04-20 15:34:22 -07:00
Guang Zhu 155afe393f enhancement for building app with emma code coverage
* global filter to avoid applying instrumentation on emma classes
* remove local variable information at dex step instead of compile time

Change-Id: If04c27bc717f34816077a98ead9ceb0dbcbb0d2f
2010-04-20 13:38:49 -07:00
Jean-Baptiste Queru 1c75692147 am 488891d8: Merge "Replace AlarmClock with DeskClock in the SDK" into kraken 2010-04-20 11:06:45 -07:00
Jean-Baptiste Queru 488891d8c9 Merge "Replace AlarmClock with DeskClock in the SDK" into kraken 2010-04-20 10:58:59 -07:00
Kenny Root a51b76e15b Merge "Add subdir under frameworks/base for code ported from icu4j." 2010-04-20 10:21:02 -07:00
Roman Nurik dc85191a6f am 34cbced9: am d1d9f048: am af232984: cherry-pick from master: 42092024eb 2010-04-19 16:47:11 -07:00
Roman Nurik 34cbced96e am d1d9f048: am af232984: cherry-pick from master: 42092024eb
Merge commit 'd1d9f048b1e28472896c482c1f942b8f2143bd9c' into kraken

* commit 'd1d9f048b1e28472896c482c1f942b8f2143bd9c':
  cherry-pick from master: 42092024eb
2010-04-19 16:36:57 -07:00
Roman Nurik d1d9f048b1 am af232984: cherry-pick from master: 42092024eb
Merge commit 'af23298447b211a8417e58cda982ea787360e9ff' into froyo-plus-aosp

* commit 'af23298447b211a8417e58cda982ea787360e9ff':
  cherry-pick from master: 42092024eb
2010-04-19 16:30:12 -07:00
Roman Nurik af23298447 cherry-pick from master: 42092024eb
Enable query highlighting and result ranking for search autocomplete on d.a.c. Also make it case-insensitive.

Change-Id: I3dd0e4edd7efae5a5758952699c08f1a46bdfeda
2010-04-19 15:18:41 -07:00
Dianne Hackborn d6f9929f4a Mmmmmm... Gingerbread!
Change-Id: I1ad5293d5b35eaa34107d9112266ac28d1269925
2010-04-19 15:09:47 -07:00