Commit Graph

85413 Commits

Author SHA1 Message Date
The Android Open Source Project
d82d6ce331 Merge commit 'goog/master' into eclair-release 2009-07-09 08:34:50 -07:00
Shin-ichiro KAWASAKI
ff328a9409 added linux-sh.mk to support SuperH architecture 2009-07-09 17:51:25 +09:00
Marco Nelissen
73a075d8b2 Since we're using gcc 4.4 in master, we can use the -Werror= option
to make not having a virtual destructor in classes with virtual
methods an error. I already fixed all code that had this problem,
so now it's a matter of turning the option on.
Also, as long as we don't have any C-specific options, it's
probably best to copy the CPP flags from the C flags. We can
always break them out later.
2009-07-08 17:51:18 -07:00
Android (Google) Code Review
60175aadcd Merge change 6444
* changes:
  Revert "Ensure that /system/etc/vold.conf is created in the "generic" product."
2009-07-08 15:35:05 -07:00
Scott Main
4cb0b458b0 AI 150398: fix the sdk build break
BUG=1790234

Automated import of CL 150398
2009-07-08 15:14:05 -07:00
Scott Main
8ebeb52cb0 AI 150393: edit the reference's navtree highlighting logic to handle intl/ directories
BUG=1790234

Automated import of CL 150393
2009-07-08 14:45:58 -07:00
Dirk Dougherty
c13d04594c AI 150389: Fix handling of cookie writes for intl pages.
BUG=1790234

Automated import of CL 150389
2009-07-08 14:39:31 -07:00
Android (Google) Code Review
c8e545b405 am e41accf6: Merge change 6412 into donut
Merge commit 'e41accf68eedfd17bc569aee8480cf8c48d82e61'

* commit 'e41accf68eedfd17bc569aee8480cf8c48d82e61':
  Pass compiler flags for C++ too, and add a flag that enables warnings about missing virtual destructors
2009-07-08 13:52:21 -07:00
Doug Zongker
b17199ee41 am 742fa575: fix problems with new image size calculations
Merge commit '742fa575d09272f1e06616fc208a1e08830c8f82'

* commit '742fa575d09272f1e06616fc208a1e08830c8f82':
  fix problems with new image size calculations
2009-07-08 13:52:20 -07:00
Android (Google) Code Review
e41accf68e Merge change 6412 into donut
* changes:
  Pass compiler flags for C++ too, and add a flag that enables warnings about missing virtual destructors
2009-07-08 13:01:22 -07:00
Doug Zongker
742fa575d0 fix problems with new image size calculations
The build servers have GNU coreutils 5.93, where stat does not output
a newline.  Ubuntu hardy has GNU coreutils 6.10, where it does.
Lacking a newline messes up the summing of the sizes.  Fix
get-file-size to remove the newline if present, and make the total
calculation in assert-max-file-size more robust.

Also, if the image was too big, it was not actually making the build
fail (because /bin/false was not the last thing called).  Fix that so
it does.
2009-07-08 12:09:04 -07:00
The Android Open Source Project
6409b5bfbd ERC08 2009-07-08 08:34:42 -07:00
The Android Open Source Project
2de5f4a414 Merge commit 'goog/master' into eclair-release 2009-07-08 08:34:21 -07:00
Ramanan Rajeswaran
4fb916be09 Add calculator and email to generic 2009-07-08 08:28:14 -07:00
The Android Open Source Project
13cca00b99 DRC08 2009-07-08 08:10:42 -07:00
The Android Open Source Project
cd29dc12ca Merge commit 'goog/donut' into donut-release 2009-07-08 08:10:04 -07:00
San Mehat
8e879ba1c5 Revert "Ensure that /system/etc/vold.conf is created in the "generic" product."
This reverts commit ff2c9deb79.

This breaks SD cards on the device (always installs the emulator vold.conf)
2009-07-07 20:13:41 -07:00
Dirk Dougherty
4405a23258 AI 150370: Add localized content infrastructure in droiddoc templates, javascript, and css. DocFile.java - instead of FileReader, use InputStreamReader with UTF-8 encoding. ClearPage.java - add UTF-8 output encoding to FileOutputStreamWriter. Note: this change also up-integrates gerrit 2146 (smain).
BUG=1910893

Automated import of CL 150370
2009-07-07 17:43:27 -07:00
Doug Zongker
b6d89448a9 am 8cebf1ff: fix mislaid \'if\' in recovery
Merge commit '8cebf1ff7836a5dc365e49f7a14d7546a651d9c7'

* commit '8cebf1ff7836a5dc365e49f7a14d7546a651d9c7':
  fix mislaid 'if' in recovery
2009-07-07 17:19:29 -07:00
Doug Zongker
8cebf1ff78 fix mislaid 'if' in recovery
When I moved the building of the recovery image upwards in the file, I
moved an 'endif' surrounding it but not the matching 'if'.  How did
this ever work?
2009-07-07 17:14:25 -07:00
Doug Zongker
97f696cdaa am 4647f12a: fix image size tests
Merge commit '4647f12a4ff9dc54247184f17ff3de1cc423f213'

* commit '4647f12a4ff9dc54247184f17ff3de1cc423f213':
  fix image size tests
2009-07-07 16:43:16 -07:00
Marco Nelissen
79005e03cc Pass compiler flags for C++ too, and add a flag that enables warnings about missing virtual destructors 2009-07-07 13:59:38 -07:00
Ramanan Rajeswaran
2cae1086a3 Add calculator to core makefiles 2009-07-07 09:41:23 -07:00
The Android Open Source Project
759a63884d ERC07 2009-07-07 09:13:42 -07:00
The Android Open Source Project
9af0292b6c Merge commit 'goog/master' into eclair-release 2009-07-07 09:13:04 -07:00
The Android Open Source Project
c94545815c DRC07 2009-07-07 09:00:33 -07:00
Jean-Baptiste Queru
04edc95a32 Merge branch 'master' of git://android.git.kernel.org/platform/build into merge_korg_master
Conflicts:
	core/apicheck_msg_current.txt
2009-07-06 12:27:36 -07:00
The Android Open Source Project
9c1df5a4d5 DRC06 2009-07-06 08:37:28 -07:00
The Android Open Source Project
31e9e02216 ERC06 2009-07-06 08:36:33 -07:00
Android (Google) Code Review
9945bac303 am bd1ee348: Merge change 6059 into donut
Merge commit 'bd1ee348a1891836cf3b5d0da72e75c0d256fa43'

* commit 'bd1ee348a1891836cf3b5d0da72e75c0d256fa43':
  Also look in vendor/*/build for vendorsetup.sh
2009-07-03 08:58:53 -07:00
Android (Google) Code Review
45ae88c2a2 am 92c8ecbf: Merge change 5929 into donut
Merge commit '92c8ecbf99daf492a24408686017609763429251'

* commit '92c8ecbf99daf492a24408686017609763429251':
  Add the JNI library of CertTool for handling certificates.
2009-07-03 08:58:35 -07:00
Android (Google) Code Review
4a37dbb2d9 Merge change 6050
* changes:
  force libwebcore clean build after turning <video> support with V8
2009-07-03 00:15:12 -07:00
Andrei Popescu
370a09bd20 force libwebcore clean build after turning <video> support with V8 2009-07-03 01:10:41 +01:00
Doug Zongker
8b3f93a7d5 am 6e9c1a6d: remove some accidentally-submitted debug logging
Merge commit '6e9c1a6dd0042e123941e59ad5da6fc569093fbb'

* commit '6e9c1a6dd0042e123941e59ad5da6fc569093fbb':
  remove some accidentally-submitted debug logging
2009-07-02 15:24:24 -07:00
Doug Zongker
4647f12a4f fix image size tests
There are currently two errors in the way we test the size of built
images against the size of the partition on the hardware:

- the limits in BoardConfig.mk are set with the data size only, but
  images contain an extra 64 bytes per 2048-byte page.  This means we
  think the partition is about 1/32 smaller than it really is.

- when we deliver a build via OTA, the system partition ends up with
  one more file than when it's flashed via fastboot.  That file is a
  copy of the recovery image.  In order to be able to OTA a build, we
  need to make sure the system partition has enough room for all the
  system files plus the recovery image as well.

For the kila system partition, these errors are roughly the same order
of magnitude -- about 2MB, one in the "safe" direction, one in the
"unsafe" direction.  This change fixes both to give us a more accurate
notion of how close we are to the limit.

Make the build emit a warning (but not fail) when the size is within
32kb of the limit.

Also, include the values of the partition size limits in an info file
in the target-files package, so post-processing tools can use them
without parsing the BoardConfig.mk file.
2009-07-02 12:21:43 -07:00
Android (Google) Code Review
bd1ee348a1 Merge change 6059 into donut
* changes:
  Also look in vendor/*/build for vendorsetup.sh
2009-07-02 05:43:46 -07:00
Joe Onorato
a8c14e8c33 Also look in vendor/*/build for vendorsetup.sh 2009-07-02 08:43:00 -04:00
Android (Google) Code Review
92c8ecbf99 Merge change 5929 into donut
* changes:
  Add the JNI library of CertTool for handling certificates.
2009-07-02 00:28:16 -07:00
Android (Google) Code Review
d77ccd3f1b am a2bd9af9: Merge change 4759 into donut
Merge commit 'a2bd9af94757e73a4ff4c1fe8c98b4174b008b62'

* commit 'a2bd9af94757e73a4ff4c1fe8c98b4174b008b62':
  Removing top tabs from PDK navigation because right now we only have one section.
2009-07-01 22:43:50 -07:00
Doug Zongker
acb8bda3bb am 0f3298a4: delete source files not in target
Merge commit '0f3298a497e32f6c2325a0071124a62d031fae6f'

* commit '0f3298a497e32f6c2325a0071124a62d031fae6f':
  delete source files not in target
2009-07-01 16:01:52 -07:00
Doug Zongker
6e9c1a6dd0 remove some accidentally-submitted debug logging 2009-07-01 14:18:59 -07:00
Chung-yih Wang
c74bbeecd0 Add the JNI library of CertTool for handling certificates. 2009-07-02 00:36:44 +08:00
Android (Google) Code Review
810e4c9d54 am c898974b: Merge change 5553 into donut
Merge commit 'c898974bcc3e6adfc2900c2a01bde5f83a0591d6'

* commit 'c898974bcc3e6adfc2900c2a01bde5f83a0591d6':
  Change cts makefile to bundle junit.jar.
2009-06-30 14:48:52 -07:00
Android (Google) Code Review
a2bd9af947 Merge change 4759 into donut
* changes:
  	Removing top tabs from PDK navigation because right now we only have one section.
2009-06-30 13:53:47 -07:00
Doug Zongker
0f3298a497 delete source files not in target
Incremental OTAs were not removing files from the old build that don't
exist in the new build.  Fix.
2009-06-30 08:16:58 -07:00
Android (Google) Code Review
c898974bcc Merge change 5553 into donut
* changes:
  Change cts makefile to bundle junit.jar.
2009-06-29 09:16:49 -07:00
Brett Chabot
67bae7fc68 Change cts makefile to bundle junit.jar. 2009-06-27 13:30:38 -07:00
Daisuke Miyakawa
f9f41d0dfd AI 150131: Remove English/Chinese IME from OpenWnn.
Automated import of CL 150131
2009-06-25 16:52:13 -07:00
Patrick Scott
f4f85a277e Fix the simulator build by setting TARGET_PRELINK_MODULE before including
BoardConfig.mk
2009-06-25 15:55:17 -04:00
Doug Zongker
8e2f2b9b20 ignore missing/bad device-specific releasetools modules
If we fail to load the device-specific releasetools module (ie, if -s
is specified but the file is missing), issue an error message but
continue without any device-specific code.
2009-06-24 14:34:57 -07:00