Commit Graph

86485 Commits

Author SHA1 Message Date
The Android Open Source Project
ba92771193 ERC14 2009-07-14 08:36:07 -07:00
The Android Open Source Project
73e23ddad9 DRC14 2009-07-14 08:35:54 -07:00
The Android Open Source Project
e74f60a859 Merge commit 'goog/master' into eclair-release 2009-07-14 08:35:30 -07:00
Android (Google) Code Review
28e0fb4f03 Merge change 7059
* changes:
  Apparently the build server uses a different compiler, one that doesn't understand '-fdiagnostics-show-option'
2009-07-13 21:00:57 -07:00
Marco Nelissen
e4aaa368b3 Apparently the build server uses a different compiler, one that doesn't understand '-fdiagnostics-show-option' 2009-07-13 20:57:24 -07:00
Android (Google) Code Review
41c3a0f8c1 Merge change 7036
* changes:
  Enable some more useful warnings, and treat some particularly bad ones (that we don't have currently) as errors.
2009-07-13 20:30:10 -07:00
Marco Nelissen
bac9a7f18e Enable some more useful warnings, and treat some particularly bad ones (that we don't have currently) as errors. 2009-07-13 17:51:59 -07:00
Mike Lockwood
56c7c9d598 cleanspec.mk: Add clean step needed for switching sholes to real GPS.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-13 19:26:34 -04:00
Wei Huang
a84cc3187e add clean step for IDataMessagingService. 2009-07-13 13:37:53 -07:00
Mike Reed
8ce877a3ab set -fpu=neon so we can use arm_neon.h 2009-07-13 14:48:43 -04:00
Phil Dubach
db3b6e8322 AI 150470: CTS: Fix naming for extra permission tests and include them in makefile
Automated import of CL 150470
2009-07-13 10:49:22 -07:00
The Android Open Source Project
16c3135c1b ERC13 2009-07-13 08:36:02 -07:00
The Android Open Source Project
9db346a9d6 DRC13 2009-07-13 08:35:59 -07:00
The Android Open Source Project
a8dad3654b Merge commit 'goog/master' into eclair-release 2009-07-13 08:35:17 -07:00
Android (Google) Code Review
06f88f5789 Merge change 6571
* changes:
  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-10 16:23:23 -07:00
Mike Reed
a14deb7eaf rename libsgl/libscorecg to libskia 2009-07-10 15:54:32 -04:00
The Android Open Source Project
c29179f392 ERC10 2009-07-10 08:35:16 -07:00
The Android Open Source Project
0dea241c20 DRC10 2009-07-10 08:35:11 -07:00
Scott Main
33beffba52 AI 150428: update the jquery library to version 1.3.2.
the incentive is to utilize an improvement made in the :hidden selector (for the videos page);
  this update should also hopefully improve some performance, but it is otherwise the same
  as before and this file still includes the core library, plus the UI core and resizable libraries

Automated import of CL 150428
2009-07-09 16:27:06 -07:00
The Android Open Source Project
a4b1dca35f DRC09 2009-07-09 08:35:23 -07:00
The Android Open Source Project
bbf955f171 ERC09 2009-07-09 08:35:22 -07:00
The Android Open Source Project
88dd548dc5 Merge commit 'goog/donut' into donut-release 2009-07-09 08:34:53 -07:00
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