tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
7881 commits 1 branch 0 tags 119 MiB
Commit graph

2062 commits

Author SHA1 Message Date
Jean-Baptiste Queru
316febd715 am 78b68045: am ffe03c98: Set OUT_DIR based on a common base path 
* commit '78b680458b3ba53fb2f88a603e371c002eb8944b':
  Set OUT_DIR based on a common base path
 2011-12-06 22:53:44 -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
Tor Norbye
59075b8fbc Make asm-3.1 an optional module, remove from grandfathered list 
Change-Id: I880cb298fad81d439e557ff5949cc9105bec217b
 2011-12-05 14:31:50 -08:00
Ying Wang
99bcbeb355 Print more info of the image size stats. 
Bug: 5620615
Before this change it only reports the limit if the real size exceeeds
or approaches the limit.

Change-Id: Ie1737d6ba2dc2d57ad82c487990e109882526d6e
 2011-12-02 10:34:45 -08:00
Marius Renn
33abebcc3f am f945235a: am 72db32c7: Merge "Google Add-On API Documentation Fixes (5429077)" into ics-mr1 
* commit 'f945235a8adc6b163a0e46941791bb305ef37034':
  Google Add-On API Documentation Fixes (5429077)
 2011-11-30 10:51:17 -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
Ying Wang
b50bd7f009 Move the prebuilt NDKs to their own git project prebuilts/ndk/. 
Change-Id: If85986da436d412cff139af1fd8426e420bec121
 2011-11-29 11:20:16 -08:00
Ying Wang
9978faf8f5 Move prebuilt SDKs to their own git project. 
Change-Id: Ie6e9614e43bf82b8dd1f8702968be40cfb76b6c5
 2011-11-29 10:24:27 -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
Jeff Hamilton
86624bf608 Merge "Bypass alias for grep in the tapas command." 2011-11-18 15:30:34 -08:00
Jeff Hamilton
293f9392ba Bypass alias for grep in the tapas command. 
Change-Id: I82705535bda927ddc7e9aebb9610d712b68a50d2
 2011-11-18 17:24:13 -06:00
Svetoslav Ganov
cbd4821b0a am ecca008c: am 700b18cc: Merge "Add the support libraries to the platform documentation (build)." into ics-mr1 
* commit 'ecca008c17c0f74a749289e23f8606f1b92930f6':
  Add the support libraries to the platform documentation (build).
 2011-11-18 15:22:34 -08:00
Jing Yu
877bddc604 Merge "Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields." 2011-11-18 14:34:53 -08:00
Jing Yu
7bf82e0171 Workaround for a gcc-4.6 bug on -fstrict-volatile-bitfields. 
http://gcc.gnu.org/ml/gcc-patches/2011-03/msg01477.html
http://gcc.gnu.org/ml/gcc-patches/2011-11/msg01390.html

-fstrict-volatile-bitfields is set on by default on gcc-4.6
for ARM target. This causes an inline asm() error. While
upstream gcc community is working on the patch, we shut
off this option temporarily.

This patch does not affect gcc-4.4.3 build.

Change-Id: Id7016dc5856a516e10f2617232945034728a74ab
 2011-11-18 14:22:55 -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
Raphael
1985846eb0 Merge "SDK: pass $HOST_OUT variable to atree." 2011-11-16 14:19:11 -08:00
Raphael
2a533178c1 SDK: pass $HOST_OUT variable to atree. 
Required by Change Id623bbef45 in development.git

Change-Id: I43229f1e6aaeea176df92a499b9cda3237fb36b9
 2011-11-15 16:32:42 -08:00
Dianne Hackborn
227b9f8b9b Merge "Dev branch for ICS MR2." 2011-11-14 13:14:25 -08:00
The Android Open Source Project
e446160ae1 am 4115aeae: am 324c814c: Merge from AOSP 
* commit '4115aeaef30cc2f13abc4a1e4165995909fa3098':
  Add a hash-bang as the first line of a shell script
 2011-11-11 16:07:31 -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
Ying Wang
7deff5fc54 am bb5ada52: am a032d3d0: Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES 
* commit 'bb5ada524c3c15132c832e076104d44ca7dde5ad':
  Support for multiple PRODUCT_SDK_ADDON_DOC_MODULES
 2011-11-11 14:38:14 -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
Nick Kralevich
32a3e84f4d Merge "make gdbclient work on x86" 2011-11-11 11:43:11 -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
Nick Kralevich
0ab21d3ed3 make gdbclient work on x86 
Change-Id: I2fd4fc2b89db13a8db1b177afdab593772cb12f8
 2011-11-11 09:02:01 -08:00
Dianne Hackborn
6e4e1bbbc1 Dev branch for ICS MR2. 
Change-Id: I53c18f2e84cd0a5c6529da1acc5f2c8d0ad0ef2e
 2011-11-10 15:19:51 -08:00
Ying Wang
9f8e8db188 Build cache.img on demand 
Bug: 5153694
To build cache.img, set BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE (required,
ext4 only for now), BOARD_CACHEIMAGE_PARTITION_SIZE (optional) in
BoardConfig.mk.

Change-Id: I1d8b91646aa1dba88285e008ad3335768bcbddd2
 2011-11-10 14:30:34 -08:00
Jim Huang
ba2c734f71 am e39ee4d5: am cb48497f: HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE 
* commit 'e39ee4d5e043872b3ef8053678a9c6020d82d4b6':
  HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE
 2011-11-10 21:35:56 +00: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
Conley Owens
d9e7d25741 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 09:57:40 -08:00
Nick Kralevich
d9d2e7a42c x86: enable PIE for dynamically linked executables 
Compile all x86 programs on Android with -fPIE and -pie. This enables
PIE (Position Independent Executables), which helps protect Android
applications from exploitation due to memory management bugs.

Note 1: PIE *static* executables are not supported at this time and
require additional linker changes.

Note 2: This change compliments 026a85b129,
which was the exact same change, except for ARM.

Testing: Rebuilt the tree completely from scratch, and verified
that the system boots and basic functionality works in the emulator.

Change-Id: I990064c37da3d857e663b27f31fee05f689a2824
 2011-11-04 13:15:24 -07:00
Brian Muramatsu
ff728d2c2d am 976fbcbd: am e43794ac: am 277be2fe: Stop Packaging Old CTS Test Runner Files 
* commit '976fbcbd095ced5b07e7b0ed777f013c7b8ca717':
  Stop Packaging Old CTS Test Runner Files
 2011-11-03 19:59:30 +00: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
Nick Kralevich
003dc3cf43 Merge "stop using a custom linker script for static executables." 2011-11-02 16:44:10 -07:00
Ying Wang
d4495e9933 Allow to set ANDROID_BUILDSPEC as path of buildspec.mk 
So that clients can set a custom buildspec.mk without adding
buildspec.mk at the top dir.

Change-Id: Ic15efa6cfbf00f04db35447e70bb5bdd63a5058c
 2011-11-02 14:12:51 -07:00
Dianne Hackborn
caf58b1f5c am 0c8f79dd: am 1b601a44: Merge "MR1 is version 4.1, API 15." into ics-mr1 
* commit '0c8f79dd01366a45b255584ef279e498741728e4':
  MR1 is version 4.1, API 15.
 2011-11-02 18:42:39 +00:00
Dianne Hackborn
b32faad390 MR1 is version 4.1, API 15. 
Change-Id: I5f31630b17121ce43b3c60d43409069640e4d97a
 2011-11-02 11:37:25 -07:00
Ying Wang
c0debb9b5e Revert "Build cache.img." 
This reverts commit 531bdb546a.
 2011-11-02 11:19:28 -07:00
Nick Kralevich
4185447f2f stop using a custom linker script for static executables. 
This is causing problems with making the linker relocatable.

Change-Id: I53e37fba52eabd3145130712d6e9bff074aed493
 2011-11-01 12:09:29 -07:00
Ying Wang
531bdb546a Build cache.img. 
Change-Id: I3dbe7afa4934fa718ba20605eebd2e3ce2ae82ab
 2011-11-01 10:44:19 -07:00
Ying Wang
178ef923ac Fix build. 
Change-Id: I166d4e0c5cc4d2b58c7af3f0207b2d161a9d1715
 2011-10-31 18:13:30 -07:00
Ying Wang
bd93d425ae Unify the user image building code 
Bug: 5398808

Before this change we have duplicate code in the Makefile and the
python-based releasetool. That's a real headache to maintain.

Change-Id: I8ddf04a79c6886540e89d990f723d8f77c9dd883
 2011-10-31 17:11:35 -07:00
Jean-Baptiste Queru
e7d25da929 am 9a3dfc06: am 68eb6649: am 432f8d88: Reconcile with AOSP master 
* commit '9a3dfc06b94a59bdc7005a8a944996c956527c19':
 2011-10-28 15:28:28 +00:00
Ying Wang
e0c60125b9 Merge "Add TARGET_COPY_OUT_* variables." 2011-10-27 15:39:02 -07:00
Ying Wang
2b6aaa367a Add TARGET_COPY_OUT_* variables. 
They are relative to PRODUCT_OUT so can be used in PRODUCT_COPY_FILES.
If TARGET_COPY_OUT_VENDOR instead of hardcoded system/vendor is used, we
will be able to transition smoothly to a separate vendor staging directory.

Change-Id: Ia9fdb208768cf4699180306280b4c02421b2ea9c
 2011-10-27 15:18:39 -07:00
Jing Yu
6af4bb07e3 Merge "Fix build problems with gcc-4.6.x." 2011-10-27 10:47:40 -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
Conley Owens
5071047d7e Merge "HOST_linux-x86: Avoid doubly define macro _FORTIFY_SOURCE" 2011-10-27 10:36:13 -07:00
Ying Wang
d9ed9eba1b am 00d1d614: am b3e6fa5e: Merge "new LOCAL_DEX_PREOPT option "nostripping"" into ics-mr0 
* commit '00d1d614f6e9c29e366b2608cd37814856df5efc':
  new LOCAL_DEX_PREOPT option "nostripping"
 2011-10-27 04:07:59 +00: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
Xavier Ducrohet
5a866004b6 Remove last reference to layoutopt. 
Change-Id: Ifdcf35e0bda41fbb5f04515a4b0f1c60dd130d50
 2011-10-26 17:15:11 -07:00
Xavier Ducrohet
3282e9bb4d Remove references to layoutopt from the build. 
Change-Id: I54a41f47a380531f4b50eb26e67e8f52b63269a5
 2011-10-26 16:47:40 -07:00
Omari Stephens
65216a2d3b Revert "Remove layoutopt; replaced by the more generic "lint" tool." 
This reverts commit 7a23d45cdc.
 2011-10-26 16:14:56 -07:00
Tor Norbye
3015409aae Merge "Remove layoutopt; replaced by the more generic "lint" tool." 2011-10-26 15:47:11 -07:00
Tor Norbye
7a23d45cdc Remove layoutopt; replaced by the more generic "lint" tool. 
Change-Id: I5754d10ec7b3fd03a2eb9a70e5f73201f909e11e
 2011-10-26 13:37:59 -07: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
Nick Kralevich
026a85b129 enable PIE for dynamically linked executables 
Compile all programs on Android with -fPIE and -pie. This enables
PIE (Position Independent Executables), which helps protect Android
applications from exploitation due to memory management bugs.

Stop using the armelf.x linker script. This script hard codes the
load address of the executable, defeating the position independence
PIE requires.

Note: PIE *static* executables are not supported at this time and
require additional linker changes.

Bug: 5323301
Change-Id: Ieafcc9c4f142495847e163881889d371a59d0878
 2011-10-24 11:37:37 -07:00
Jim Huang
59d296623b 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-24 10:23:21 -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
Doug Kwan
2b40757725 Fix build problems with gcc-4.6.x. 
Change-Id: If02f18efde4cec39c97bb0e7226b008cd6b85dd4
 2011-10-13 12:28:34 -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
Doug Zongker
68fbf0fa52 am 49c6a2b5: fix build fingerprint: dev-keys vs test-keys 
* commit '49c6a2b5e4314bd8acfbca88cd43ea49a2c8c30e':
  fix build fingerprint: dev-keys vs test-keys
 2011-10-05 13:06:30 -07:00
Doug Zongker
49c6a2b5e4 fix build fingerprint: dev-keys vs test-keys 
The fingerprint should only say dev-keys if it's actually using custom
keys; builds with the old default (from build/target/product/security)
should still say test-keys.

Change-Id: Ib8c662c348cf63f5db47e2f8f81bc3246cb15fdc
 2011-10-05 12:41:56 -07:00
Doug Zongker
a4bbf24afd am f9ede7e9: Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryrom 
* commit 'f9ede7e925a668cc8c0b44cb69c0795cb6c8c896':
  sign non-PRESIGNED prebuilt apks
 2011-10-05 09:58:05 -07:00
Doug Zongker
f9ede7e925 Merge "sign non-PRESIGNED prebuilt apks" into ics-factoryrom 2011-10-05 09:55:58 -07:00
Doug Zongker
08d79c12de sign non-PRESIGNED prebuilt apks 
Since dev keys can now vary per device, we can't assume they are
checked in with the correct signature.

Change-Id: I7577a3a6bd98d005c15936c99b2944acc4412798
 2011-10-05 09:49:24 -07:00
Ying Wang
0611aeedeb Merge "Install path support for vendor modules." into ics-factoryrom 2011-10-05 09:07:53 -07:00
Ed Heyl
213c1f985d am 81703a19: Merge "Support for product-specific dev keys." into ics-factoryrom 
* commit '81703a19001ec219c35cb0ecf9bafb6e0dbc1e1d':
  Support for product-specific dev keys.
 2011-10-04 16:15:25 -07:00
Ying Wang
3c21fe5b12 Support for product-specific dev keys. 
Change-Id: Id577a72ee9f7cd70e8ca77efcbf10a37885c7d6f
 2011-10-04 10:50:08 -07:00
Ying Wang
6886410210 Enforce no prebuilt apks in PRODUCT_COPY_FILES. 
Bug: 5391935
Change-Id: I106ffc3277914e57cc1a6fb4cd782286d61b8013
 2011-09-29 13:23:25 -07:00
Ying Wang
2a71850eb3 Merge "Generate an empty target if there is no packages" 2011-09-27 11:31:12 -07:00
Ying Wang
f272cd6c22 Generate an empty target if there is no packages 
Generate an empty target even if there is no packages defined in the
source tree. Such case can happen when building in an unbundled branch.

Change-Id: Id8b94bc00557cd5ea2066859e440427474ced5f5
 2011-09-26 12:05:06 -07:00
David 'Digit' Turner
becc3da915 resolved conflicts for merge of 2f2882a0 to master 
Change-Id: Ia07eb9d022a8036c2b1674c591514740aa0d4596
 2011-09-23 11:44:29 +02:00
David 'Digit' Turner
2f2882a04e am fdb13fcc: am 0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread 
* commit 'fdb13fccfecdf526549ad453a20e8136253edb51':
  sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
 2011-09-22 23:01:17 -07:00
David 'Digit' Turner
fdb13fccfe am 0cc5e1ef: Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread 
* commit '0cc5e1ef457f0eda3a3dfadc094b0e796ba9f3f2':
  sdk: Fix broken google_sdk and google_sdk_x86 add-on build.
 2011-09-22 22:59:07 -07:00
David 'Digit' Turner
0cc5e1ef45 Merge "sdk: Fix broken google_sdk and google_sdk_x86 add-on build." into gingerbread 2011-09-22 22:58:04 -07:00
Dianne Hackborn
228fd69eaf Merge "Let's call MR0 4.0.1." 2011-09-21 18:11:44 -07:00
Xavier Ducrohet
4d2b9bf341 Cherrypick 6de7bc61 from master. do not merge. 
Copy notice file in the new system image folder

Change-Id: I66496f382b2d13b030de569b573630f3abe5b9de
 2011-09-21 16:03:19 -07:00
Dianne Hackborn
7766ea2884 Let's call MR0 4.0.1. 
Change-Id: Ie55012702e2cfb1eb247941e8b73519ad9b5c547
 2011-09-21 15:25:37 -07:00
Xavier Ducrohet
6de7bc611b Copy notice file in the new system image folder 
Change-Id: I4fafe5dc9dc1749de56267206a9b847a97e6a14b
 2011-09-21 14:25:52 -07:00
Ying Wang
43e18e0d7b Install path support for vendor modules. 
Bug: 5284764
Set "LOCAL_PROPRIETARY_MODULE := true" to install module to vendor
partition.

Change-Id: I9acdda6b2ff3142628b9849ea534b3ec288545a0
 2011-09-21 13:32:36 -07:00
Ying Wang
99732e2c59 am 04c48584: Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries." into ics-factoryrom 
* commit '04c485843f9fce0f66d18cb96e1051b7382b1f38':
  Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries.
 2011-09-20 20:04:50 -07:00
Ying Wang
415f1f6613 Merge "Install path support for vendor modules." 2011-09-20 20:02:27 -07:00
Ying Wang
04c485843f Merge "Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries." into ics-factoryrom 2011-09-20 20:02:17 -07:00
Doug Zongker
c30e190347 am 7094bf3a: am 25863d73: build the sqlite3 binary for use by the OTA tools 
* commit '7094bf3a5e9d1983d6877f580506d93fd736c437':
  build the sqlite3 binary for use by the OTA tools
 2011-09-20 09:31:54 -07:00
Doug Zongker
7094bf3a5e am 25863d73: build the sqlite3 binary for use by the OTA tools 
* commit '25863d738ca171015a57a2154ff6ebe4ae8f5483':
  build the sqlite3 binary for use by the OTA tools
 2011-09-20 09:27:07 -07:00
Doug Zongker
25863d738c build the sqlite3 binary for use by the OTA tools 
Change-Id: I2c6cc02dec74fdcedd3e2a6f3ddb1dfba657a883
 2011-09-19 16:50:39 -07:00
Dianne Hackborn
14169bcea8 New LOCAL_SDK_RES_VERSION config var. 
This allows an app to target a different SDK level for its resources
than it uses for its Java code.  This is useful because it is generally
safe to use various newer symbols like attribute names, as older versions
of the platform will simply ignore them.

Change-Id: Ida19ec9f259c4ea70de846e9a63546e263b1c91e
 2011-09-19 10:42:04 -07:00
Raphael
514c487dcb Enable building sdk/avdlauncher in the Win SDK. DO NOT MERGE. 
Required by Change-Id Ic651e3c3 in sdk.git

Cherry-pick from master c36df7b12b

Change-Id: Ic51ad7df01ce1bc926ba69f8a031a060edbf0bd1
 2011-09-16 21:35:42 -07:00
Raphael
77fed26921 Don't strip llvm-rs-rc in core/Makefile. DO NOT MERGE. 
This is done in development/build/sdk.atree now.

Cherry-pick from master 469bbdf8c3
 2011-09-16 21:25:49 -07:00
Raphael
cf29731eea Merge "Don't strip llvm-rs-rc in core/Makefile" 2011-09-16 12:25:07 -07:00
Raphael
aae801fb1c Merge "Enable building sdk/avdlauncher in the Win SDK." 2011-09-16 10:59:41 -07:00
Raphael
c36df7b12b Enable building sdk/avdlauncher in the Win SDK. 
Required by Change-Id Ic651e3c3 in sdk.git

Change-Id: I97f389d052ba9abf1c40547abbc6d7c164bdf405
 2011-09-16 09:20:03 -07:00
Ying Wang
c36b450ab1 Fix OVERRIDE_BUILT_MODULE_PATH for prebuilt shared libraries. 
So that prebuilt shared libraries can be referenced with the module name
in other module's Android.mk.

Change-Id: I4c4b471696642694b805b71dd7605b91724ad924
 2011-09-15 16:13:39 -07:00
Ying Wang
704c0c9fca Use LOCAL_REQUIRED_MODULES to add dependency of installed shared libraries 
Bug: 5200343
Before this change the build system assumes that shared libraries will
be installed to $(TARGET_SHARED_LIBRARIES). That's not true if the
module uses custom LOCAL_MODULE_PATH.
With this change we defer the evaluation of the dependency to after all
Android.mks are loaded and all modules have their installed path
determined.

Change-Id: Ib6628ed44154a90e8668d31691fbbac67125be6c
 2011-09-15 14:05:49 -07:00
Raphael
469bbdf8c3 Don't strip llvm-rs-rc in core/Makefile 
This is done in development/build/sdk.atree now.

Change-Id: I2cd8e42192439851e1e42070cf74e6ee7c02ba59
 2011-09-15 11:22:28 -07:00
Ed Heyl
58dcc788b9 Merge commit '4d7ddab160ba29247225e11c2092dcfd68bd6baf' into ics-factoryrom 2011-09-15 06:49:04 -07:00
Ed Heyl
b8fe43be28 default version 
Change-Id: I6ca2be74916b5bebffd910fdbcbefe158fdfc562
 2011-09-15 04:54:20 -07:00
Dianne Hackborn
4d7ddab160 Hello, Android 4.0. 
Change-Id: I0d775bc81e1fb1c3ca0151b15a582035109dc5b5
 2011-09-14 13:52:02 -07:00
Ying Wang
8f77936dd8 Install path support for vendor modules. 
Bug: 5284764
Set "LOCAL_PROPRIETARY_MODULE := true" to install module to vendor
partition.

Change-Id: I1301acc10664a12e313f3b868d9fd6400ac8b133
 2011-09-13 13:57:26 -07:00
Ying Wang
e5e8c5f218 Move forward installed-files.txt in the dependency graph 
Bug: 5265104
- Move installed-files.txt forward to ahead of system.img in the
dependency graph, so that even if the system.img fails to build due to
too large size we can still get the size stats.
- Change the script tools/fileslist.py to sort items in decreasing size.

Change-Id: I5913bc51971e341ffbfcf3fa449c987f126e409b
 2011-09-09 17:07:23 -07:00
Brian Muramatsu
164285e05f am 8658fa51: am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5 
* commit '8658fa51d15290cf43178d0633b53f11ff08a4aa':
  Disable Dexpreopt for generic_arm5
 2011-09-09 12:04:27 -07:00
Ying Wang
8e5b540cff am 41346ae4: am ba35b2d6: resolved conflicts for merge of 162991be to gingerbread-plus-aosp 
* commit '41346ae4077c7dee66a7c04dc91714569dca9303':
  Allow uninstallable APPs.
 2011-09-08 14:48:38 -07:00
Ying Wang
d62de0f884 Merge "Provide LOCAL_RENDERSCRIPT_TARGET_API override." 2011-09-08 14:26:28 -07:00
Ying Wang
f1054bf22e Merge "Discard hidden files when rounding up resource." 2011-09-08 14:16:23 -07:00
Doug Zongker
c29dfcad75 Merge "save uid/gid/mode information of boot and recovery files" 2011-09-08 12:04:27 -07:00
Brian Muramatsu
8658fa51d1 am 9d014e65: am 9353a3be: Disable Dexpreopt for generic_arm5 
* commit '9d014e6570deb3861b503833823e56e1c589626c':
  Disable Dexpreopt for generic_arm5
 2011-09-08 10:26:29 -07:00
Brian Muramatsu
9d014e6570 am 9353a3be: Disable Dexpreopt for generic_arm5 
* commit '9353a3be5fca8a83c3a60e890fbca323f9fb0e04':
  Disable Dexpreopt for generic_arm5
 2011-09-08 10:24:14 -07:00
Raphael
9b73fdabc4 Merge "Enable 'make traceview' under Windows." 2011-09-08 10:16:44 -07:00
Brian Muramatsu
d47da70817 am 3eae5b7c: am 08b8e002: am 2306106d: Use package.apk.unaligned in CTS Build 
* commit '3eae5b7c1b3197bed4c883a671cfea9d5d9570bf':
  Use package.apk.unaligned in CTS Build
 2011-09-08 10:08:27 -07:00
Brian Muramatsu
9353a3be5f Disable Dexpreopt for generic_arm5 
Bug 5267392

After coming across another place where I would have to use
package.apk.unaligned, I decided maybe it is best to just
disable dexpreopt as was previously suggested.

Use package.apks in the CTS Makefile task.

Change-Id: Iec839a72f4b53441337523b8a9cccda657eec8e8
 2011-09-07 18:12:22 -07:00
Ying Wang
d9020c2e9a Add ABI specific include path for NDK. 
Change-Id: I37a935126b9a1e544fc5a7471cf6ca224fc89cf3
 2011-09-07 14:31:47 -07:00
Doug Zongker
23f8bde52d save uid/gid/mode information of boot and recovery files 
Save these in the target_files so we don't have to depend on using the
contents of android_filesystem_config.h at the tip of tree.

Bug: 5266067
Change-Id: Ica5dd43a2013c9db72d7c9434f9d7de1abaf18f9
 2011-09-07 14:11:51 -07:00
Ying Wang
41346ae407 am ba35b2d6: resolved conflicts for merge of 162991be to gingerbread-plus-aosp 
* commit 'ba35b2d61531a071533891307904e6ad7f81fb65':
  Allow uninstallable APPs.
 2011-09-07 11:25:42 -07:00
Ying Wang
ba35b2d615 resolved conflicts for merge of 162991be to gingerbread-plus-aosp 
Change-Id: I06edde6c517b4c4e2bd03e2d1d44da52ee3066d5
 2011-09-07 11:20:28 -07:00
Ying Wang
162991beb5 Allow uninstallable APPs. 
Bug: 5264671
This is needed by cts tests.
It's harmless to existing modules.

Change-Id: I0083471f80d483559b27523d4b88190d7913f6f1
 2011-09-07 10:32:39 -07:00
Raphael
1518506345 Enable 'make traceview' under Windows. 
Change-Id: I2b89d2ee66d0bb4a1b2bb6e4ea15d3b0419cead9
 2011-09-06 16:39:37 -07:00
Justin Ho
0f2e55e47d Merge "Updated dex-preopt BOOTCLASSPATH with values from init.rc Bug: 5032006" 2011-09-06 13:18:22 -07:00
Justin Ho
0279b62d16 Updated dex-preopt BOOTCLASSPATH with values from init.rc 
Bug: 5032006

Change-Id: I6ed7e55ec2b278c0d60ad4e17208480d05af61bc
 2011-09-06 13:04:36 -07:00
Doug Zongker
e1a8e3aef3 allow setting LOCAL_STRIP_MODULE on multi_prebuilts 
Change-Id: I4a58255381ba8a50d8f9512bf9892f5050599393
 2011-09-06 10:31:37 -07:00