Commit graph

1921 commits

Author SHA1 Message Date
Jean-Baptiste Queru
a2c1261e71 Set version numbers for AOSP - do not merge
Change-Id: I7be67f46069ed758e67066e696aa2567983fa374
2011-12-12 17:16:07 -08:00
Bruce Beare
381581613a am 3343b27c: x86: The default ATOM BSP flags need to be in sync with the NDK ABI
* commit '3343b27c534fb4ea238f2feaa0d9346840ee2f92':
  x86: The default ATOM BSP flags need to be in sync with the NDK ABI
2011-12-09 16:21:00 -08:00
Bruce Beare
3343b27c53 x86: The default ATOM BSP flags need to be in sync with the NDK ABI
Change-Id: Ic741e1795c655ace1e33ae6708219f2708358090
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-12-09 13:27:08 -08:00
Dianne Hackborn
d7b15982d2 am e73b24cc: Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
* commit 'e73b24ccbe728476e5bc77aaf2fd6865276cacc3':
  Did I say 4.1?  Oh well what I *really* meant was 4.0.3, of course.
2011-12-07 10:34:21 -08:00
Dianne Hackborn
e73b24ccbe Did I say 4.1? Oh well what I *really* meant was 4.0.3, of course.
Change-Id: I61ccc290aec8fa7e2e68cf01bc920a65b8b9e246
2011-12-07 10:30:19 -08:00
Jean-Baptiste Queru
0cd997ff31 am 8af0efd6: Improve handling of absolute paths in out directory
* commit '8af0efd6a157e682d88c9a6e030f37bab9860caf':
  Improve handling of absolute paths in out directory
2011-12-06 19:32:38 -08:00
Jean-Baptiste Queru
78b680458b am ffe03c98: Set OUT_DIR based on a common base path
* commit 'ffe03c984b2836a9b4e4ddb5a17ec0dd26ba686c':
  Set OUT_DIR based on a common base path
2011-12-06 19:32:37 -08:00
Jean-Baptiste Queru
8af0efd6a1 Improve handling of absolute paths in out directory
Change-Id: If6b320e274fb1cee33808424246ce2c88b9b7ef5
2011-12-06 16:33:11 -08:00
Jean-Baptiste Queru
ffe03c984b Set OUT_DIR based on a common base path
Change-Id: I2c4ba8b101d4d186ed4b371b9d07b3bcf75bbcc9
Author: Jean-Baptiste Queru<jbq@google.com>
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2011-12-06 14:36:49 -08:00
Marius Renn
f945235a8a am 72db32c7: Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1
* commit '72db32c744744ae1ace26830ecce968b6a95e173':
  Google Add-On API Documentation Fixes (5429077)
2011-11-30 09:53:05 -08:00
Tor Norbye
dc2450ca25 Build fix - include sdk/lint in build. 2011-11-28 15:05:31 -08:00
Marius Renn
b1df701ed8 Google Add-On API Documentation Fixes (5429077)
We no longer want a reference directory, but rather
maps_api and effects_api directories.

Change-Id: I72b3a342d0871ec4cf7010be0d2b6486ca83571b
2011-11-23 18:08:51 -08:00
Jean-Baptiste Queru
d2cbcb40c0 Restore AOSP-specific pseudo-version-numbers.
For great justice.

Change-Id: I5a0f722419bff676142ce975a66225f0cd418ff8
2011-11-22 12:21:00 -08:00
Svetoslav Ganov
ecca008c17 am 700b18cc: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1
* commit '700b18cc72e75737fa5cf79896c98f12003b7735':
  Add the support libraries to the platform documentation (build).
2011-11-18 10:14:02 -08:00
Svetoslav Ganov
155d855cee Add the support libraries to the platform documentation (build).
Added path to the support libraries.

bug: 5629339

Change-Id: Id414597046c528617313881ea857134512d1c2ba
2011-11-17 15:13:56 -08:00
The Android Open Source Project
4115aeaef3 am 324c814c: Merge from AOSP
* commit '324c814c6f479bb33eb8aa05d221c8a44b8f61b9':
  Add a hash-bang as the first line of a shell script
2011-11-11 16:06:02 -08:00
The Android Open Source Project
324c814c6f Merge from AOSP
Change-Id: Ie444a93a1fcba693332d302de828bdc62fd61647
2011-11-11 16:03:56 -08:00
Jean-Baptiste Queru
f9b556cd51 Add a hash-bang as the first line of a shell script
Change-Id: I5b663b036ecb25e952ecd2d998971cc326d4ebdf
2011-11-11 14:37:31 -08:00
Ying Wang
bb5ada524c am a032d3d0: Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
* commit 'a032d3d07372423176e072dfcbcf60a53f8a7d57':
  Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
2011-11-11 14:36:39 -08:00
Ying Wang
a032d3d073 Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
Bug: 5429077
Change-Id: I8d962c803496479ba5b5e7316538aced65ee4df1
2011-11-11 10:52:12 -08:00
Jim Huang
e39ee4d5e0 am cb48497f: HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
* commit 'cb48497ff2f84e8f7def981246ddc028ea126879':
  HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
2011-11-10 21:34:23 +00:00
Jim Huang
cb48497ff2 HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
While building Android with latest host gcc, it causes the following
build error:

Install: out/host/linux-x86/bin/mkbootimg
host C++: obbtool <= frameworks/base/tools/obbtool/Main.cpp
<command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
<built-in>:0:0: note: this is the location of the previous definition
cc1plus: all warnings being treated as errors

In order to make build system happy, this patch does unset macro
_FORTIFY_SOURCE and then define it in host cflags.

Change-Id: Ic37a90f05081a2c3650b3335bc87e9e895900fb2
2011-11-10 13:28:13 -08:00
Conley Owens
e04c2c21ee am e915ab45: Place linker arguments after objects for gcc
* commit 'e915ab45a11f88c4fa5f2561c1aaca4b7d3d7593':
  Place linker arguments after objects for gcc
2011-11-10 19:01:36 +00:00
Conley Owens
e915ab45a1 Place linker arguments after objects for gcc
gcc 4.6.1 does not properly link if libraries are specified before
objects.

Change-Id: Iabe3eac831fe597abe8a93a946ab7a22d584db46
2011-11-10 10:55:13 -08:00
Brian Muramatsu
e43794ace2 am 277be2fe: Stop Packaging Old CTS Test Runner Files
* commit '277be2fe0cfcb31c34ad3426a1ab8df9b8cde6cb':
  Stop Packaging Old CTS Test Runner Files
2011-11-03 19:56:00 +00:00
Brian Muramatsu
277be2fe0c Stop Packaging Old CTS Test Runner Files
Bug 5563917

This stops packaging the startcts script and the cts.jar into
the android-cts.zip. Since we are only testing using Tradefed,
we should prevent confusion by removing the old test runner.

Change-Id: I79f991617dd9e6a51a314207b4727cce3136d60f
2011-11-03 11:42:39 -07:00
Dianne Hackborn
b32faad390 MR1 is version 4.1, API 15.
Change-Id: I5f31630b17121ce43b3c60d43409069640e4d97a
2011-11-02 11:37:25 -07:00
Jim Huang
fddf23f19e HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
While building Android with latest host gcc, it causes the following
build error:

Install: out/host/linux-x86/bin/mkbootimg
host C++: obbtool <= frameworks/base/tools/obbtool/Main.cpp
<command-line>:0:0: error: "_FORTIFY_SOURCE" redefined [-Werror]
<built-in>:0:0: note: this is the location of the previous definition
cc1plus: all warnings being treated as errors

In order to make build system happy, this patch does unset macro
_FORTIFY_SOURCE and then define it in host cflags.

Change-Id: Ic37a90f05081a2c3650b3335bc87e9e895900fb2
2011-10-27 10:38:10 -07:00
Ying Wang
00d1d614f6 am b3e6fa5e: Merge "new LOCAL_DEX_PREOPT option "nostripping"" into ics-mr0
* commit 'b3e6fa5e6bdaf6e1e827c3e79ffda1ef796b3a1b':
  new LOCAL_DEX_PREOPT option "nostripping"
2011-10-27 04:04:50 +00:00
Ed Heyl
525389ee49 set ID to MR1. Please do not merge.
Change-Id: Ib181d19806a2589ec124b648e2d12c5350b0ce81
2011-10-25 07:23:21 -07:00
Ying Wang
79e3dec83e new LOCAL_DEX_PREOPT option "nostripping"
Set "LOCAL_DEX_PREOPT := nostripping" to do dex-preopt while not strip
the classes.dex.

Bug: 5396625 5502338
Change-Id: Ie8dea4414ebeefeae89c6433b246faea27baa5e7
2011-10-24 12:29:25 -07:00
Wink Saville
4427f4e812 Change BUILD_ID.
On master branch build id should be MASTER.

Change-Id: I7829b3933947730b298fca8a4e39de6a60b9caad
2011-10-21 16:31:55 -07:00
Tor Norbye
4377cc701a Build fix - include sdk/lint in build
Change-Id: Id65b7a3f72dd6c5104738fa872f3beb029d91163
2011-10-20 19:21:30 -07:00
Bjorn Bringert
cec077521e Merge "Compile each proto file separately" 2011-10-18 09:48:20 -07:00
Bjorn Bringert
20f5efd82c Compile each proto file separately
Before, if a module had several proto source files,
they would all be compiled in a single invocation
of aprotoc. If any of the files imported one of the
other files, you got an aprotoc error about duplicates.
And if you removed the files that were imported
from the list of source files, no Java code
would be generated for the imported files,
causing a Java compile time error.

This changes compiles each proto file separately, which
avoids both of the problems above. It's slightly more
inefficient, but aprotoc is really fast.

Change-Id: I7bd8092ec2953c20269367a1c68ff84acceea3be
2011-10-18 16:08:27 +01:00
Ying Wang
67d6305c5c am 55370202: Remvoe whisperd from user_tags.mk.
* commit '5537020242a499e54c351ced962fe437ae1fc4d2':
  Remvoe whisperd from user_tags.mk.
2011-10-17 20:06:51 -07:00
Ying Wang
5537020242 Remvoe whisperd from user_tags.mk.
Change-Id: Ib271c568a6e6907d033040dbe6c3574124fbe469

Bug: 5473754
2011-10-17 17:59:44 -07:00
Dianne Hackborn
9baabf8d7e am a0f464a8: New PRODUCT_AAPT_PREF_CONFIG.
* commit 'a0f464a8e7f006177db084df7e925bbb8e5ffed3':
  New PRODUCT_AAPT_PREF_CONFIG.
2011-10-17 11:31:38 -07:00
Dianne Hackborn
a0f464a8e7 New PRODUCT_AAPT_PREF_CONFIG.
To use the new aapt --preferred-configurations option.  For use with Prime
to be able to strip everything but xhdpi density bitmaps selectively,
not stripping when this would result in no data for the resource.

Change-Id: I4e1012929b8f9b0b1e79c06496647f69661ba1f2
2011-10-14 19:37:57 -07:00
Ying Wang
32fa8a313c Support to package prebuilt NDK libstlport_shared.so into apk
To package libstlport_shared.so, use the following syntax in the app
module definition:
LOCAL_NDK_STL_VARIANT := stlport_shared
LOCAL_NDK_VERSION := <num>

The rationale behind is:
The NDK prebiult libstlport_shared.so is intentionally different from
the system libstlport.so.
Essentially they are slightly different versions of the library so
shouldn't be mixed up.
libstlport.so is used by the system, but not exposed by the NDK, it is
routinely tweaked in various ways between platform releases, and there
is no guarantee that its ABI is stable, or that it will not be replaced
by something else in the future.
libstlport_shared.so is typically distributed with application packages,
and should not be part of the system.

Change-Id: I72c9911781f7d8402687e9891f3f605f3a60be22
2011-10-13 17:31:45 -07:00
Dima Zavin
5fc85c6bfe am 854233e9: core: remove the built fake packages (not installed) on installclean
* commit '854233e9b2e24c75f63db96bb1be9a7bb2cecd84':
  core: remove the built fake packages (not installed) on installclean
2011-10-12 13:50:40 -07:00
Dima Zavin
854233e9b2 core: remove the built fake packages (not installed) on installclean
Change-Id: I1ff3754132a48c545d0a3215ae23d204aba50637
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-12 13:34:32 -07:00
Dima Zavin
eee20ca405 am 7dac5909: core: remove fake package timestamps on installclean
* commit '7dac5909d23a78ff6ed2af6e4d937354de8c7756':
  core: remove fake package timestamps on installclean
2011-10-11 17:32:50 -07:00
Dima Zavin
7dac5909d2 core: remove fake package timestamps on installclean
Change-Id: Ic07af1f751b301b69fa5cbbb7bf51ad718d54d52
Signed-off-by: Dima Zavin <dima@android.com>
2011-10-11 15:54:10 -07:00
Ying Wang
d89452976b Merge "Use shell variable to eliminate $(eval) in commands." 2011-10-11 10:11:44 -07:00
Android Git Automerger
861348a4be Merge branch 'master' of ssh://android-git:29418/platform/build 2011-10-11 10:10:35 -07:00
Ying Wang
e27347e7a4 Merge "Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds" 2011-10-11 10:01:50 -07:00
Ed Heyl
738f053bf3 mr0 - do not merge
Change-Id: I3b19b8cdad6820bc8ab2047ac48cb2964132a3fa
2011-10-11 06:40:06 -07:00
Ying Wang
486be82198 Enforce no nonexistent modules in PRODUCT_PACKAGES for sdk builds
Bug: 5430740
- Remove nonexistent names in PRODUCT_PACKAGES.
- Push down bluetooth-health, hostapd and wpa_supplicant.conf to
generic_no_telephony.mk and large_emu_hw.mk because they are not needed
by sdk builds.
- Remove core.mk from generic_armv5.mk and generic_x86.mk because they
  already inherit from generic.mk.

Change-Id: Ie44b95f1cae7ed0d4cf827ffce6a91d41902434d
2011-10-10 13:10:13 -07:00
Ying Wang
32ef58e2c1 Remove PRODUCT_CONTRIBUTORS_FILE which is no longer in use.
Bug: 5433204
Change-Id: Id88c21f8d1991d8cbcc5bb7dae784aa72dc4becf
2011-10-10 09:54:47 -07:00