Commit graph

4205 commits

Author SHA1 Message Date
Scott Main
826d03213f am c438082f: docs: add sampleindex file for droiddoc to customize the breadcrumbs
* commit 'c438082fd2dde771f0b3f1628777a3e2bd12214f':
  docs: add sampleindex file for droiddoc to customize the breadcrumbs
2011-02-16 12:00:21 -08:00
Scott Main
c438082fd2 docs: add sampleindex file for droiddoc to customize the breadcrumbs
Change-Id: If777ebb3cfe4887ec8ce8f746b9ec83b82035b37
2011-02-16 10:05:29 -08:00
David 'Digit' Turner
d6b413a904 am 3be47af9: am b3f59bde: am 86a90364: Merge "core/binary.mk: Add missing Objective-C objects to the build."
* commit '3be47af9491b7fd93b74122cb7f979f2b86c1634':
  core/binary.mk: Add missing Objective-C objects to the build.
2011-02-15 11:03:57 -08:00
Ying Wang
7ecfe4ad3b Merge "Don't build everything for APKCERTS_FILE" 2011-02-15 10:59:44 -08:00
Ying Wang
15e487a792 Don't build everything for APKCERTS_FILE
Before this change, to build APKCERTS_FILE you have to build any modules
in the system first, which include modules that only need to be checked,
instead of being built. This can reduce the build time when "dist" is
specified.

Change-Id: I64bee67977adcaf7b7c8df3f8f6492c9c33bc69d
2011-02-15 10:56:18 -08:00
David 'Digit' Turner
3be47af949 am b3f59bde: am 86a90364: Merge "core/binary.mk: Add missing Objective-C objects to the build."
* commit 'b3f59bde44fc16fa43b6a01a890c4b42cf446292':
  core/binary.mk: Add missing Objective-C objects to the build.
2011-02-15 10:40:24 -08:00
David 'Digit' Turner
b3f59bde44 am 86a90364: Merge "core/binary.mk: Add missing Objective-C objects to the build."
* commit '86a903647f3f3df4484396ec58ba5b0454abd36e':
  core/binary.mk: Add missing Objective-C objects to the build.
2011-02-15 10:10:45 -08:00
David 'Digit' Turner
86a903647f Merge "core/binary.mk: Add missing Objective-C objects to the build." 2011-02-14 15:07:00 -08:00
Scott Main
386ce961e9 am 2781cae5: am 1000e35a: docs: add honeycomb logo and revise css to for toggle widget
* commit '2781cae512e1abeab43e4e8decd50f2a5a46eb96':
  docs: add honeycomb logo and revise css to for toggle widget
2011-02-14 10:44:20 -08:00
Scott Main
2781cae512 am 1000e35a: docs: add honeycomb logo and revise css to for toggle widget
* commit '1000e35a6b5351cae8c8f5df23020bd870ccd062':
  docs: add honeycomb logo and revise css to for toggle widget
2011-02-14 10:42:35 -08:00
Scott Main
1000e35a6b docs: add honeycomb logo and revise css to for toggle widget
Change-Id: I497dfe417b0d3b496314571ad766f2dd78415954
2011-02-14 10:39:28 -08:00
David 'Digit' Turner
5ca286d58b core/binary.mk: Add missing Objective-C objects to the build.
For some reason, all_objects was not listing objects generated from
objective-C sources. We need these for the emulator (which builds its
own version of SDL which uses Quartz on OS X).

+ Fix a typo in transform-host-m-to-o definition.

This also explains why https://review.source.android.com/#change,21074
had to be reverted, since it gets rid of the prebuilt SDL libraries when
building the emulator.

Change-Id: I173811cf11cdb5b045073aade59364236145bc77
2011-02-11 17:52:52 +01:00
Jean-Baptiste Queru
6bd606c3cd am 50ffeeb2: am c7797bb3: am 8f9849a0: Merge "no-op"
* commit '50ffeeb27625cde4b4aeb8c188b085390b2e3fd9':
  no-op
2011-02-10 15:03:39 -08:00
Ying Wang
acdc56d797 am bf149351: am d239c1bd: Fix dependency of prebuilt target non-static Java libraries.
* commit 'bf149351952b348883c1ed8adfe417a8e179a2bc':
  Fix dependency of prebuilt target non-static Java libraries.
2011-02-10 15:03:35 -08:00
Jean-Baptiste Queru
50ffeeb276 am c7797bb3: am 8f9849a0: Merge "no-op"
* commit 'c7797bb334e071e9d932a37b3d8f3870bafd9176':
  no-op
2011-02-10 14:48:35 -08:00
Jean-Baptiste Queru
c7797bb334 am 8f9849a0: Merge "no-op"
* commit '8f9849a037c901ea3b1e7a1d7d43f56728abea40':
  no-op
2011-02-10 13:22:01 -08:00
Jean-Baptiste Queru
8f9849a037 Merge "no-op" 2011-02-10 12:58:01 -08:00
Jean-Baptiste Queru
c13cf1919f no-op
Change-Id: Ifd90e66fe63d429f9998a36f72553e2aacf3fc7c
2011-02-10 12:57:31 -08:00
Ying Wang
7e6d4e45d9 Close inherited PIPE before doing work
Gmake in Darwin has file descriptor leak.
In a full build, ota_from_target_files will inherits
more than 2000 open PIPEs from gmake and fails in a call to select.select().
This change fixes the build by closing the PIPEs before doing real work.

Change-Id: Ie7035d7add0b1da3afb6bf9c2009d40f8c7d29b3
2011-02-10 11:36:43 -08:00
Ying Wang
4a2ecaf5dc Fix the case image-size-from-data-size returns 0.
This time with correct escaping.

Change-Id: I660887ac62425e9960e266391b52979a7dff4617
2011-02-09 17:24:27 -08:00
Ying Wang
bfaf531e05 Revert "Fix the case BOARD_FLASH_BLOCK_SIZE smaller than BOARD_NAND_PAGE_SIZE, eg generic_x86"
This reverts commit 279f3084bb.

Change-Id: I27069190503e586d3d77a933d92459a34eb55cb8
2011-02-09 16:15:21 -08:00
Ying Wang
9a0c36af91 Merge "Fix generic_x86 image sizes." 2011-02-09 14:48:05 -08:00
Ying Wang
389cf7ac4e Merge "Fix the case BOARD_FLASH_BLOCK_SIZE smaller than BOARD_NAND_PAGE_SIZE, eg generic_x86" 2011-02-09 13:21:09 -08:00
Ying Wang
279f3084bb Fix the case BOARD_FLASH_BLOCK_SIZE smaller than BOARD_NAND_PAGE_SIZE, eg generic_x86
Also don't build ota package for generic_x86.

Change-Id: I7606d56b312ac2e0c3514a8f250e005e0c05a3f1
2011-02-09 13:11:50 -08:00
Ying Wang
5371de12df Fix generic_x86 image sizes.
The image build tools only accept decimals.

Change-Id: I4fc3d32a9528bdad4cfb9381cff344a1a1b6b6d5
2011-02-09 10:50:55 -08:00
Jeff Brown
f67684b22a Merge "Build system tweaks for Valgrind." 2011-02-08 17:11:38 -08:00
Jeff Brown
703e7c6d50 Build system tweaks for Valgrind.
Added LOCAL_NO_CRT to enable building executables that do not link
to the C runtime library.

Removed support for LOCAL_MODULE_SUBDIR since it was broken
and unused.  (Was going to use it but ended up using LOCAL_MODULE_PATH
instead.)

Change-Id: I3b6f5ab7e5ae6aaa7119899adccece2b4ab1cbb3
2011-02-08 16:38:56 -08:00
Glenn Kasten
e5f114b3a5 Merge "libFLAC is now a static library" 2011-02-08 11:56:22 -08:00
Ying Wang
bf14935195 am d239c1bd: Fix dependency of prebuilt target non-static Java libraries.
* commit 'd239c1bd1bef3067acebcd9d87a7be68d6eb4b98':
  Fix dependency of prebuilt target non-static Java libraries.
2011-02-08 11:22:02 -08:00
Ying Wang
d239c1bd1b Fix dependency of prebuilt target non-static Java libraries.
Change-Id: Ib9a01e1d0cf1eed57de0dc7706ee12125212ba67
2011-02-08 10:07:11 -08:00
Kenny Root
3ff17b3bc5 Merge "Add system image size for X86" 2011-02-08 09:34:07 -08:00
Kenny Root
773f315bd8 Add system image size for X86
It was defaulting to 128M which was slightly too small for all the
applications. Increasing to 150M fits the resulting image.

Change-Id: I55957c54fbdb77090487c08ed3948988621978b3
2011-02-08 07:45:46 -08:00
Scott Main
706408ea9f am 1a35a101: am 4c8ae40a: docs: remove preliminary watermark from docs
* commit '1a35a101ada24a0fa5220dc695f458cf248c814f':
  docs: remove preliminary watermark from docs
2011-02-07 15:37:00 -08:00
Scott Main
1a35a101ad am 4c8ae40a: docs: remove preliminary watermark from docs
* commit '4c8ae40abba83921bd98eb6636b5e3d753bbd183':
  docs: remove preliminary watermark from docs
2011-02-07 15:34:50 -08:00
Scott Main
4c8ae40abb docs: remove preliminary watermark from docs
Change-Id: I452596cdc5b87effdb958ff963d9aa80ebec5d37
2011-02-07 14:26:45 -08:00
Scott Main
c4305eefe3 am 2f2a43cd: am 61281638: am 886e5aa7: Merge "fix api level filtering script to compare integers, not strings" into gingerbread
* commit '2f2a43cd92842dd38d20f95db1998c60da0c34dd':
  fix api level filtering script to compare integers, not strings
2011-02-07 13:47:26 -08:00
Raphael
038c9805e7 am 77c1e67b: (-s ours) am 3e01b483: (-s ours) am 843c6e25: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
* commit '77c1e67b876b0d486d0056e418889117d8093093':
  merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
2011-02-07 13:47:24 -08:00
Scott Main
3fbd3207f2 am 053f5491: am 4b311bc9: Merge "fix api level filtering script to compare integers, not strings" into honeycomb
* commit '053f5491340f5bacddd9943521c8f1b1d0c0bb6a':
  fix api level filtering script to compare integers, not strings
2011-02-07 13:47:05 -08:00
Scott Main
6f963b3930 am c52832ad: am 8cf6d9e3: Merge "tweak header css for more distinction" into honeycomb
* commit 'c52832ad5c5ac994f6e49de14c6e9f43da997d32':
  tweak header css for more distinction
2011-02-07 13:45:10 -08:00
Raphael
59f7b629bc am 0a7ed4af: am 30e07075: SDK: stub the maps.jar from the google_apis addon.
* commit '0a7ed4af97bdd52be96d8c9db1eff3fa4d6dc843':
  SDK: stub the maps.jar from the google_apis addon.
2011-02-07 13:44:26 -08:00
Scott Main
2f2a43cd92 am 61281638: am 886e5aa7: Merge "fix api level filtering script to compare integers, not strings" into gingerbread
* commit '612816385a5c6ca2bd54d027617c42c34338682f':
  fix api level filtering script to compare integers, not strings
2011-02-04 15:20:42 -08:00
Raphael
77c1e67b87 am 3e01b483: (-s ours) am 843c6e25: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
* commit '3e01b483708d0fc3766fa4adff2ae8b354de75dc':
  merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
2011-02-04 15:20:36 -08:00
Scott Main
053f549134 am 4b311bc9: Merge "fix api level filtering script to compare integers, not strings" into honeycomb
* commit '4b311bc91a7851b204c63e678b0213504125d3aa':
  fix api level filtering script to compare integers, not strings
2011-02-04 15:17:04 -08:00
Scott Main
612816385a am 886e5aa7: Merge "fix api level filtering script to compare integers, not strings" into gingerbread
* commit '886e5aa742c1667de3ca5b628bf6865948ef4513':
  fix api level filtering script to compare integers, not strings
2011-02-04 15:14:57 -08:00
Scott Main
4b311bc91a Merge "fix api level filtering script to compare integers, not strings" into honeycomb 2011-02-04 15:14:45 -08:00
Scott Main
11057f5a0a fix api level filtering script to compare integers, not strings
Change-Id: I8f0e44ec2bf0833a0d547a3795ee31ee0dc69d8a
2011-02-04 15:13:04 -08:00
Scott Main
886e5aa742 Merge "fix api level filtering script to compare integers, not strings" into gingerbread 2011-02-04 15:11:59 -08:00
Scott Main
af2ba51ed5 fix api level filtering script to compare integers, not strings
Change-Id: I4d0d6c40dd5c1f8470567ef30f0f7500b442fbe5
2011-02-04 15:10:33 -08:00
Raphael
3e01b48370 am 843c6e25: merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
* commit '843c6e2530a0783ae1a5a4758cb5e76ad975ae72':
  merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
2011-02-04 14:49:17 -08:00
Raphael
843c6e2530 merge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
Depends on change 8252cdea from development to get the
verbose/quiet flag for mkstub.

Change-Id: I1ac97023570a4fc8a0b9dd50db429c55184ec88c
2011-02-04 12:34:54 -08:00