OSDN Git Service

android-x86/build.git
13 years agoFix for SDK repository.
Raphael [Thu, 24 Feb 2011 00:45:57 +0000 (16:45 -0800)]
Fix for SDK repository.

Change-Id: Ia1245226c451ed4539a0a0cd51022a3325f4b33b

13 years agoMerge "Add stl include path if LOCAL_NDK_VERSION is set"
Ying Wang [Wed, 23 Feb 2011 23:33:27 +0000 (15:33 -0800)]
Merge "Add stl include path if LOCAL_NDK_VERSION is set"

13 years agoam 5e2afb97: am eaa464e6: am a34fa95c: force inclusion of system log tags in the...
Doug Zongker [Wed, 23 Feb 2011 21:34:59 +0000 (13:34 -0800)]
am 5e2afb97: am eaa464e6: am a34fa95c: force inclusion of system log tags in the event-log-tags file

* commit '5e2afb977fcec46e001ac57cc76d3b9534696afa':
  force inclusion of system log tags in the event-log-tags file

13 years agoam eaa464e6: am a34fa95c: force inclusion of system log tags in the event-log-tags...
Doug Zongker [Wed, 23 Feb 2011 21:31:15 +0000 (13:31 -0800)]
am eaa464e6: am a34fa95c: force inclusion of system log tags in the event-log-tags file

* commit 'eaa464e6c4064ce8359d3e5871e0d184388457b8':
  force inclusion of system log tags in the event-log-tags file

13 years agoam a34fa95c: force inclusion of system log tags in the event-log-tags file
Doug Zongker [Wed, 23 Feb 2011 21:25:45 +0000 (13:25 -0800)]
am a34fa95c: force inclusion of system log tags in the event-log-tags file

* commit 'a34fa95c164a9388ed0b84b17a63241bffd4132a':
  force inclusion of system log tags in the event-log-tags file

13 years agoforce inclusion of system log tags in the event-log-tags file
Doug Zongker [Wed, 23 Feb 2011 20:17:29 +0000 (12:17 -0800)]
force inclusion of system log tags in the event-log-tags file

Change-Id: I59066ff151b6cb74a70bd8a900d473a533c84de3

13 years agoAdd stl include path if LOCAL_NDK_VERSION is set
Ying Wang [Wed, 23 Feb 2011 18:07:03 +0000 (10:07 -0800)]
Add stl include path if LOCAL_NDK_VERSION is set

Since NDKr5 the stl headers reside in a separate directory.

Change-Id: I98f37b593560a1a2a55418f8ba413ca842ed37ef

13 years agoincrease java heap size when signing packages
Doug Zongker [Wed, 23 Feb 2011 17:25:01 +0000 (09:25 -0800)]
increase java heap size when signing packages

Large OTA packages are causing signapk to run out of memory.

Change-Id: I511b9b5fb2d303805006ca76458f44bf72faeff2

13 years agoMerge "read partition length from recovery.fstab"
Doug Zongker [Wed, 23 Feb 2011 17:07:35 +0000 (09:07 -0800)]
Merge "read partition length from recovery.fstab"

13 years agoread partition length from recovery.fstab
Doug Zongker [Thu, 17 Feb 2011 23:54:20 +0000 (15:54 -0800)]
read partition length from recovery.fstab

Don't hardcode magical partition behavior in the script generator.

Change-Id: I4aeea022f8a32a7c9f316be2c2514510344ca0e0

13 years agoam d5f90275: am 287987db: add style for \'new-child\' class, which hides the "new...
Scott Main [Wed, 23 Feb 2011 05:40:08 +0000 (21:40 -0800)]
am d5f90275: am 287987db: add style for \'new-child\' class, which hides the "new" tag when the parent list item is expanded (for use when the parent is advertising a new child doc)

* commit 'd5f902751b259b9281c3c87966d6238e262de000':
  add style for 'new-child' class, which hides the "new" tag when the parent list item is expanded (for use when the parent is advertising a new child doc)

13 years agoam 1b879889: resolved conflicts for merge of 747a9780 to honeycomb-plus-aosp
Kenny Root [Wed, 23 Feb 2011 05:35:09 +0000 (21:35 -0800)]
am 1b879889: resolved conflicts for merge of 747a9780 to honeycomb-plus-aosp

* commit '1b8798894c90ef5deaf4f49d468e959ea3c19131':
  Build system tweaks for Valgrind.

13 years agoam 287987db: add style for \'new-child\' class, which hides the "new" tag when the...
Scott Main [Wed, 23 Feb 2011 05:13:03 +0000 (21:13 -0800)]
am 287987db: add style for \'new-child\' class, which hides the "new" tag when the parent list item is expanded (for use when the parent is advertising a new child doc)

* commit '287987db4f47a770f9e48375c02fdb3369190f14':
  add style for 'new-child' class, which hides the "new" tag when the parent list item is expanded (for use when the parent is advertising a new child doc)

13 years agoMerge "Build SDK repository"
Raphael [Tue, 22 Feb 2011 22:36:00 +0000 (14:36 -0800)]
Merge "Build SDK repository"

13 years agoresolved conflicts for merge of 747a9780 to honeycomb-plus-aosp
Kenny Root [Tue, 22 Feb 2011 19:13:23 +0000 (11:13 -0800)]
resolved conflicts for merge of 747a9780 to honeycomb-plus-aosp

Change-Id: I06b2fba1d14343bf0489447a01bb7d0bdb675307

13 years agoadd style for 'new-child' class, which hides the "new" tag when the parent
Scott Main [Tue, 22 Feb 2011 16:32:40 +0000 (08:32 -0800)]
add style for 'new-child' class, which hides the "new" tag when the parent
list item is expanded (for use when the parent is advertising a new child doc)

Change-Id: I81945c109d1edc3b588a8b1c5968179266a1dc48

13 years agoRemove obsolete kcm tool.
Jeff Brown [Sat, 19 Feb 2011 13:22:32 +0000 (05:22 -0800)]
Remove obsolete kcm tool.

Change-Id: Ib5aa60cd9d308ce7c672c57513bdcf78e0f1080d

13 years agoRemove libwvm.so from the prelink map
Gloria Wang [Sat, 19 Feb 2011 07:21:41 +0000 (23:21 -0800)]
Remove libwvm.so from the prelink map

Change-Id: If6494cd3e92fef571e8ddf40f0b4c19bee7c9ae6

13 years agoMerge "Add libwvm.so"
Gloria Wang [Sat, 19 Feb 2011 00:39:53 +0000 (16:39 -0800)]
Merge "Add libwvm.so"

13 years agoam a3c3bc33: am a29d7e4b: Merge "Build cts-tradefed README into cts.zip" into honeycomb
Brett Chabot [Fri, 18 Feb 2011 23:54:59 +0000 (15:54 -0800)]
am a3c3bc33: am a29d7e4b: Merge "Build cts-tradefed README into cts.zip" into honeycomb

* commit 'a3c3bc336600bb30680adb920e0b17b28e250dc0':
  Build cts-tradefed README into cts.zip

13 years agoam a29d7e4b: Merge "Build cts-tradefed README into cts.zip" into honeycomb
Brett Chabot [Fri, 18 Feb 2011 23:51:01 +0000 (15:51 -0800)]
am a29d7e4b: Merge "Build cts-tradefed README into cts.zip" into honeycomb

* commit 'a29d7e4b17b6082046092ea7fce94d7aa50d96bb':
  Build cts-tradefed README into cts.zip

13 years agoMerge "Build cts-tradefed README into cts.zip" into honeycomb
Brett Chabot [Fri, 18 Feb 2011 23:45:01 +0000 (15:45 -0800)]
Merge "Build cts-tradefed README into cts.zip" into honeycomb

13 years agoBuild cts-tradefed README into cts.zip
Brett Chabot [Fri, 18 Feb 2011 23:13:50 +0000 (15:13 -0800)]
Build cts-tradefed README into cts.zip

Change-Id: Idd2d36a021eb706846673a1ebc417a1f4c3b9d38

13 years agoRemove unused variable DONT_INSTALL_DEX_FILES
Ying Wang [Fri, 18 Feb 2011 01:03:32 +0000 (17:03 -0800)]
Remove unused variable DONT_INSTALL_DEX_FILES

Change-Id: Ic91ba1f551e0a1a81aaac438fbd1d359a71a7bfa

13 years agoUse shell variable, instead of makefile var.
Ying Wang [Thu, 17 Feb 2011 23:44:45 +0000 (15:44 -0800)]
Use shell variable, instead of makefile var.

Change-Id: I802b145b563145437135412473704f911c8c1474

13 years agoam 951a3e5f: Merge "Build system tweaks for Valgrind."
Kenny Root [Thu, 17 Feb 2011 19:38:51 +0000 (11:38 -0800)]
am 951a3e5f: Merge "Build system tweaks for Valgrind."

* commit '951a3e5f416d9ebe84e922132c85c8696d5d74a0':
  Build system tweaks for Valgrind.

13 years agoAdd libwvm.so
Gloria Wang [Tue, 15 Feb 2011 18:28:27 +0000 (10:28 -0800)]
Add libwvm.so

Change-Id: I4ad2ed5e2ef762f2147a8b7a27dbbd6d61ac1098

13 years agoBuild SDK repository
Raphael [Wed, 16 Feb 2011 00:09:36 +0000 (16:09 -0800)]
Build SDK repository

When the build is invoked with the fake target "sdk_repo" and
a main target of sdk, win_sdk or sdk_addon, we now create
packages in DIST_DIR that can directly be used to populate the
SDK Repository.
This is quite close to how we actually distribute the SDK.

Change-Id: Ie7e0f789bafd73d5ee2461349155a6e562e2edd9

13 years agoMerge "Build system tweaks for Valgrind."
Kenny Root [Wed, 16 Feb 2011 23:27:16 +0000 (15:27 -0800)]
Merge "Build system tweaks for Valgrind."

13 years agoBuild system tweaks for Valgrind.
Jeff Brown [Wed, 16 Feb 2011 22:42:40 +0000 (14:42 -0800)]
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: Ifed4ffe17003d90370c711ea6606e2b75e841dee

13 years agoMerge "Remove usused workaround."
Ben Cheng [Wed, 16 Feb 2011 21:19:13 +0000 (13:19 -0800)]
Merge "Remove usused workaround."

13 years agoRemove usused workaround.
Ben Cheng [Wed, 16 Feb 2011 20:48:38 +0000 (12:48 -0800)]
Remove usused workaround.

Change-Id: I1d42d0f0dee361b98403bc87296dcbc37484ebcb

13 years agoam 826d0321: am c438082f: docs: add sampleindex file for droiddoc to customize the...
Scott Main [Wed, 16 Feb 2011 20:02:59 +0000 (12:02 -0800)]
am 826d0321: am c438082f: docs: add sampleindex file for droiddoc to customize the breadcrumbs

* commit '826d03213faa02820f7fcff0b397a8cfbf00b547':
  docs: add sampleindex file for droiddoc to customize the breadcrumbs

13 years agoam c438082f: docs: add sampleindex file for droiddoc to customize the breadcrumbs
Scott Main [Wed, 16 Feb 2011 20:00:21 +0000 (12:00 -0800)]
am c438082f: docs: add sampleindex file for droiddoc to customize the breadcrumbs

* commit 'c438082fd2dde771f0b3f1628777a3e2bd12214f':
  docs: add sampleindex file for droiddoc to customize the breadcrumbs

13 years agodocs: add sampleindex file for droiddoc to customize the breadcrumbs
Scott Main [Wed, 16 Feb 2011 18:05:29 +0000 (10:05 -0800)]
docs: add sampleindex file for droiddoc to customize the breadcrumbs

Change-Id: If777ebb3cfe4887ec8ce8f746b9ec83b82035b37

13 years agoam 3be47af9: am b3f59bde: am 86a90364: Merge "core/binary.mk: Add missing Objective...
David 'Digit' Turner [Tue, 15 Feb 2011 19:03:57 +0000 (11:03 -0800)]
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.

13 years agoMerge "Don't build everything for APKCERTS_FILE"
Ying Wang [Tue, 15 Feb 2011 18:59:44 +0000 (10:59 -0800)]
Merge "Don't build everything for APKCERTS_FILE"

13 years agoDon't build everything for APKCERTS_FILE
Ying Wang [Tue, 15 Feb 2011 18:56:18 +0000 (10:56 -0800)]
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

13 years agoam b3f59bde: am 86a90364: Merge "core/binary.mk: Add missing Objective-C objects...
David 'Digit' Turner [Tue, 15 Feb 2011 18:40:24 +0000 (10:40 -0800)]
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.

13 years agoam 86a90364: Merge "core/binary.mk: Add missing Objective-C objects to the build."
David 'Digit' Turner [Tue, 15 Feb 2011 18:10:45 +0000 (10:10 -0800)]
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.

13 years agoMerge "core/binary.mk: Add missing Objective-C objects to the build."
David 'Digit' Turner [Mon, 14 Feb 2011 23:07:00 +0000 (15:07 -0800)]
Merge "core/binary.mk: Add missing Objective-C objects to the build."

13 years agoam 2781cae5: am 1000e35a: docs: add honeycomb logo and revise css to for toggle widget
Scott Main [Mon, 14 Feb 2011 18:44:20 +0000 (10:44 -0800)]
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

13 years agoam 1000e35a: docs: add honeycomb logo and revise css to for toggle widget
Scott Main [Mon, 14 Feb 2011 18:42:35 +0000 (10:42 -0800)]
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

13 years agodocs: add honeycomb logo and revise css to for toggle widget
Scott Main [Mon, 14 Feb 2011 18:39:28 +0000 (10:39 -0800)]
docs: add honeycomb logo and revise css to for toggle widget

Change-Id: I497dfe417b0d3b496314571ad766f2dd78415954

13 years agocore/binary.mk: Add missing Objective-C objects to the build.
David 'Digit' Turner [Fri, 11 Feb 2011 15:19:31 +0000 (16:19 +0100)]
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

13 years agoam 50ffeeb2: am c7797bb3: am 8f9849a0: Merge "no-op"
Jean-Baptiste Queru [Thu, 10 Feb 2011 23:03:39 +0000 (15:03 -0800)]
am 50ffeeb2: am c7797bb3: am 8f9849a0: Merge "no-op"

* commit '50ffeeb27625cde4b4aeb8c188b085390b2e3fd9':
  no-op

13 years agoam bf149351: am d239c1bd: Fix dependency of prebuilt target non-static Java libraries.
Ying Wang [Thu, 10 Feb 2011 23:03:35 +0000 (15:03 -0800)]
am bf149351: am d239c1bd: Fix dependency of prebuilt target non-static Java libraries.

* commit 'bf149351952b348883c1ed8adfe417a8e179a2bc':
  Fix dependency of prebuilt target non-static Java libraries.

13 years agoam c7797bb3: am 8f9849a0: Merge "no-op"
Jean-Baptiste Queru [Thu, 10 Feb 2011 22:48:35 +0000 (14:48 -0800)]
am c7797bb3: am 8f9849a0: Merge "no-op"

* commit 'c7797bb334e071e9d932a37b3d8f3870bafd9176':
  no-op

13 years agoam 8f9849a0: Merge "no-op"
Jean-Baptiste Queru [Thu, 10 Feb 2011 21:22:01 +0000 (13:22 -0800)]
am 8f9849a0: Merge "no-op"

* commit '8f9849a037c901ea3b1e7a1d7d43f56728abea40':
  no-op

13 years agoMerge "no-op"
Jean-Baptiste Queru [Thu, 10 Feb 2011 20:58:01 +0000 (12:58 -0800)]
Merge "no-op"

13 years agono-op
Jean-Baptiste Queru [Thu, 10 Feb 2011 20:57:31 +0000 (12:57 -0800)]
no-op

Change-Id: Ifd90e66fe63d429f9998a36f72553e2aacf3fc7c

13 years agoClose inherited PIPE before doing work
Ying Wang [Tue, 14 Dec 2010 00:25:36 +0000 (16:25 -0800)]
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

13 years agoFix the case image-size-from-data-size returns 0.
Ying Wang [Thu, 10 Feb 2011 01:24:27 +0000 (17:24 -0800)]
Fix the case image-size-from-data-size returns 0.

This time with correct escaping.

Change-Id: I660887ac62425e9960e266391b52979a7dff4617

13 years agoRevert "Fix the case BOARD_FLASH_BLOCK_SIZE smaller than BOARD_NAND_PAGE_SIZE, eg...
Ying Wang [Thu, 10 Feb 2011 00:10:11 +0000 (16:10 -0800)]
Revert "Fix the case BOARD_FLASH_BLOCK_SIZE smaller than BOARD_NAND_PAGE_SIZE, eg generic_x86"

This reverts commit 279f3084bbb4781d872412f5e49c74f462f7844a.

Change-Id: I27069190503e586d3d77a933d92459a34eb55cb8

13 years agoMerge "Fix generic_x86 image sizes."
Ying Wang [Wed, 9 Feb 2011 22:48:05 +0000 (14:48 -0800)]
Merge "Fix generic_x86 image sizes."

13 years agoMerge "Fix the case BOARD_FLASH_BLOCK_SIZE smaller than BOARD_NAND_PAGE_SIZE, eg...
Ying Wang [Wed, 9 Feb 2011 21:21:09 +0000 (13:21 -0800)]
Merge "Fix the case BOARD_FLASH_BLOCK_SIZE smaller than BOARD_NAND_PAGE_SIZE, eg generic_x86"

13 years agoFix the case BOARD_FLASH_BLOCK_SIZE smaller than BOARD_NAND_PAGE_SIZE, eg generic_x86
Ying Wang [Wed, 9 Feb 2011 20:26:42 +0000 (12:26 -0800)]
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

13 years agoFix generic_x86 image sizes.
Ying Wang [Wed, 9 Feb 2011 18:50:55 +0000 (10:50 -0800)]
Fix generic_x86 image sizes.

The image build tools only accept decimals.

Change-Id: I4fc3d32a9528bdad4cfb9381cff344a1a1b6b6d5

13 years agoMerge "Build system tweaks for Valgrind."
Jeff Brown [Wed, 9 Feb 2011 01:11:38 +0000 (17:11 -0800)]
Merge "Build system tweaks for Valgrind."

13 years agoBuild system tweaks for Valgrind.
Jeff Brown [Sat, 5 Feb 2011 04:15:00 +0000 (20:15 -0800)]
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

13 years agoMerge "libFLAC is now a static library"
Glenn Kasten [Tue, 8 Feb 2011 19:56:22 +0000 (11:56 -0800)]
Merge "libFLAC is now a static library"

13 years agoam d239c1bd: Fix dependency of prebuilt target non-static Java libraries.
Ying Wang [Tue, 8 Feb 2011 19:22:02 +0000 (11:22 -0800)]
am d239c1bd: Fix dependency of prebuilt target non-static Java libraries.

* commit 'd239c1bd1bef3067acebcd9d87a7be68d6eb4b98':
  Fix dependency of prebuilt target non-static Java libraries.

13 years agoFix dependency of prebuilt target non-static Java libraries.
Ying Wang [Tue, 1 Feb 2011 20:57:45 +0000 (12:57 -0800)]
Fix dependency of prebuilt target non-static Java libraries.

Change-Id: Ib9a01e1d0cf1eed57de0dc7706ee12125212ba67

13 years agoMerge "Add system image size for X86"
Kenny Root [Tue, 8 Feb 2011 17:34:07 +0000 (09:34 -0800)]
Merge "Add system image size for X86"

13 years agoAdd system image size for X86
Kenny Root [Tue, 8 Feb 2011 15:45:46 +0000 (07:45 -0800)]
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

13 years agoam 1a35a101: am 4c8ae40a: docs: remove preliminary watermark from docs
Scott Main [Mon, 7 Feb 2011 23:37:00 +0000 (15:37 -0800)]
am 1a35a101: am 4c8ae40a: docs: remove preliminary watermark from docs

* commit '1a35a101ada24a0fa5220dc695f458cf248c814f':
  docs: remove preliminary watermark from docs

13 years agoam 4c8ae40a: docs: remove preliminary watermark from docs
Scott Main [Mon, 7 Feb 2011 23:34:50 +0000 (15:34 -0800)]
am 4c8ae40a: docs: remove preliminary watermark from docs

* commit '4c8ae40abba83921bd98eb6636b5e3d753bbd183':
  docs: remove preliminary watermark from docs

13 years agodocs: remove preliminary watermark from docs
Scott Main [Mon, 7 Feb 2011 22:26:45 +0000 (14:26 -0800)]
docs: remove preliminary watermark from docs

Change-Id: I452596cdc5b87effdb958ff963d9aa80ebec5d37

13 years agoam 2f2a43cd: am 61281638: am 886e5aa7: Merge "fix api level filtering script to compa...
Scott Main [Mon, 7 Feb 2011 21:47:26 +0000 (13:47 -0800)]
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

13 years agoam 77c1e67b: (-s ours) am 3e01b483: (-s ours) am 843c6e25: merge "SDK: stub the maps...
Raphael [Mon, 7 Feb 2011 21:47:24 +0000 (13:47 -0800)]
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.

13 years agoam 053f5491: am 4b311bc9: Merge "fix api level filtering script to compare integers...
Scott Main [Mon, 7 Feb 2011 21:47:05 +0000 (13:47 -0800)]
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

13 years agoam c52832ad: am 8cf6d9e3: Merge "tweak header css for more distinction" into honeycomb
Scott Main [Mon, 7 Feb 2011 21:45:10 +0000 (13:45 -0800)]
am c52832ad: am 8cf6d9e3: Merge "tweak header css for more distinction" into honeycomb

* commit 'c52832ad5c5ac994f6e49de14c6e9f43da997d32':
  tweak header css for more distinction

13 years agoam 0a7ed4af: am 30e07075: SDK: stub the maps.jar from the google_apis addon.
Raphael [Mon, 7 Feb 2011 21:44:26 +0000 (13:44 -0800)]
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.

13 years agoam 61281638: am 886e5aa7: Merge "fix api level filtering script to compare integers...
Scott Main [Fri, 4 Feb 2011 23:20:42 +0000 (15:20 -0800)]
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

13 years agoam 3e01b483: (-s ours) am 843c6e25: merge "SDK: stub the maps.jar from the google_api...
Raphael [Fri, 4 Feb 2011 23:20:36 +0000 (15:20 -0800)]
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.

13 years agoam 4b311bc9: Merge "fix api level filtering script to compare integers, not strings...
Scott Main [Fri, 4 Feb 2011 23:17:04 +0000 (15:17 -0800)]
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

13 years agoam 886e5aa7: Merge "fix api level filtering script to compare integers, not strings...
Scott Main [Fri, 4 Feb 2011 23:14:57 +0000 (15:14 -0800)]
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

13 years agoMerge "fix api level filtering script to compare integers, not strings" into honeycomb
Scott Main [Fri, 4 Feb 2011 23:14:45 +0000 (15:14 -0800)]
Merge "fix api level filtering script to compare integers, not strings" into honeycomb

13 years agofix api level filtering script to compare integers, not strings
Scott Main [Fri, 4 Feb 2011 23:13:04 +0000 (15:13 -0800)]
fix api level filtering script to compare integers, not strings

Change-Id: I8f0e44ec2bf0833a0d547a3795ee31ee0dc69d8a

13 years agoMerge "fix api level filtering script to compare integers, not strings" into gingerbread
Scott Main [Fri, 4 Feb 2011 23:11:59 +0000 (15:11 -0800)]
Merge "fix api level filtering script to compare integers, not strings" into gingerbread

13 years agofix api level filtering script to compare integers, not strings
Scott Main [Fri, 4 Feb 2011 23:10:33 +0000 (15:10 -0800)]
fix api level filtering script to compare integers, not strings

Change-Id: I4d0d6c40dd5c1f8470567ef30f0f7500b442fbe5

13 years agoam 843c6e25: merge "SDK: stub the maps.jar from the google_apis addon." from HC....
Raphael [Fri, 4 Feb 2011 22:49:17 +0000 (14:49 -0800)]
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.

13 years agomerge "SDK: stub the maps.jar from the google_apis addon." from HC. Do not merge.
Raphael [Fri, 4 Feb 2011 06:59:27 +0000 (22:59 -0800)]
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

13 years agoam 8cf6d9e3: Merge "tweak header css for more distinction" into honeycomb
Scott Main [Fri, 4 Feb 2011 19:48:59 +0000 (11:48 -0800)]
am 8cf6d9e3: Merge "tweak header css for more distinction" into honeycomb

* commit '8cf6d9e3ae1f7a18c49121c578fe1f5f05371342':
  tweak header css for more distinction

13 years agoMerge "tweak header css for more distinction" into honeycomb
Scott Main [Fri, 4 Feb 2011 19:47:18 +0000 (11:47 -0800)]
Merge "tweak header css for more distinction" into honeycomb

13 years agoam 30e07075: SDK: stub the maps.jar from the google_apis addon.
Raphael [Fri, 4 Feb 2011 19:12:25 +0000 (11:12 -0800)]
am 30e07075: SDK: stub the maps.jar from the google_apis addon.

* commit '30e0707531268343e11dfeb51f28ccdacd7f9875':
  SDK: stub the maps.jar from the google_apis addon.

13 years agoMerge "Bug 3366885 Remove LVMX"
Glenn Kasten [Fri, 4 Feb 2011 16:42:11 +0000 (08:42 -0800)]
Merge "Bug 3366885 Remove LVMX"

13 years agoSDK: stub the maps.jar from the google_apis addon.
Raphael [Fri, 4 Feb 2011 06:59:27 +0000 (22:59 -0800)]
SDK: stub the maps.jar from the google_apis addon.

Depends on change 8252cdea from development to get the
verbose/quiet flag for mkstub.

Change-Id: I5f4e766613576828147c97be8d38e97fe1035672

13 years agotweak header css for more distinction
Scott Main [Fri, 4 Feb 2011 02:11:05 +0000 (18:11 -0800)]
tweak header css for more distinction

Change-Id: I1d63b7587917bfde3df5547b5648610d86083d6a

13 years agoBug 3366885 Remove LVMX
Glenn Kasten [Fri, 4 Feb 2011 02:24:59 +0000 (18:24 -0800)]
Bug 3366885 Remove LVMX

Change-Id: If35e28c44a4ccc3e1a777e95f2551cf5d6552f12

13 years agoam 5c6069d6: am ed191898: am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk...
Raphael Moll [Fri, 4 Feb 2011 02:07:50 +0000 (18:07 -0800)]
am 5c6069d6: am ed191898: am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"

* commit '5c6069d632b3019c74de57b5d89a4e90d2b59759':
  SDK: Enable "make sdk/common" under Windows

13 years agoam 004f68f0: am 79e1d2cf: am 6b6e8114: am 4167b2ba: Merge "SDK: Strip llvm-rs-cc...
Raphael [Fri, 4 Feb 2011 01:17:55 +0000 (17:17 -0800)]
am 004f68f0: am 79e1d2cf: am 6b6e8114: am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."

* commit '004f68f01c410f33fbeb44313597ee97b1f17a86':
  SDK: Strip llvm-rs-cc in SDK.

13 years agolibFLAC is now a static library
Glenn Kasten [Thu, 3 Feb 2011 19:41:07 +0000 (11:41 -0800)]
libFLAC is now a static library

Change-Id: Iaf48e795607ddaeb3cc1da2fce068d4d985061da

13 years agoam ed191898: am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under...
Raphael Moll [Thu, 3 Feb 2011 19:45:21 +0000 (11:45 -0800)]
am ed191898: am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"

* commit 'ed19189877a3a380074e8e76969ef23689cec8fd':
  SDK: Enable "make sdk/common" under Windows

13 years agoam a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"
Raphael Moll [Thu, 3 Feb 2011 19:42:34 +0000 (11:42 -0800)]
am a15717c9: am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"

* commit 'a15717c9905e32f2724645e3734567c40d8d3eb0':
  SDK: Enable "make sdk/common" under Windows

13 years agoam 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"
Raphael Moll [Thu, 3 Feb 2011 18:54:05 +0000 (10:54 -0800)]
am 6b7b53cb: Merge "SDK: Enable "make sdk/common" under Windows"

* commit '6b7b53cb36bda3b2aa1de94654cd73785d67c267':
  SDK: Enable "make sdk/common" under Windows

13 years agoMerge "SDK: Enable "make sdk/common" under Windows"
Raphael Moll [Thu, 3 Feb 2011 18:45:50 +0000 (10:45 -0800)]
Merge "SDK: Enable "make sdk/common" under Windows"

13 years agoFix x86 build.
Jean-Baptiste Queru [Thu, 3 Feb 2011 17:55:47 +0000 (09:55 -0800)]
Fix x86 build.

Change-Id: I22dc39a68911e1b5846c20e63c0f8c59521ea7f5

13 years agoam 79e1d2cf: am 6b6e8114: am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."
Raphael [Thu, 3 Feb 2011 17:16:38 +0000 (09:16 -0800)]
am 79e1d2cf: am 6b6e8114: am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."

* commit '79e1d2cf99754f81137c0f390d0e1fd898e52277':
  SDK: Strip llvm-rs-cc in SDK.

13 years agoam 6b6e8114: am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."
Raphael [Thu, 3 Feb 2011 17:05:07 +0000 (09:05 -0800)]
am 6b6e8114: am 4167b2ba: Merge "SDK: Strip llvm-rs-cc in SDK."

* commit '6b6e8114810bb26a64e1d8d9814fdfadb90c3848':
  SDK: Strip llvm-rs-cc in SDK.