Commit graph

1554 commits

Author SHA1 Message Date
Jean-Baptiste Queru
79ee7bf896 Protobuf compiler support in the build system 2011-01-27 12:44:30 -08:00
Jean-Baptiste Queru
2497b6109b A few more grandfathered user tags
Change-Id: I57309b461ec2395da068961f976c904bd3474e88
2011-01-27 12:17:00 -08:00
Jean-Baptiste Queru
020e2fc14a am 928a0304: re-merge from readonly-korg-master - do not merge
* commit '928a03043187b7c4843b2c832b589c57b7541e4a':
  re-merge from readonly-korg-master - do not merge
2011-01-27 09:24:43 -08:00
Jean-Baptiste Queru
928a030431 re-merge from readonly-korg-master - do not merge
Change-Id: Ifc1e39261e1fcaefc1e314d994e71115624643a2
2011-01-27 09:21:58 -08:00
Jean-Baptiste Queru
4fd2ef057a Add a few more legacy modules that can have user tags - do not merge
Change-Id: I198d3eb34958e46ccba145bd05452027cba5e464
2011-01-27 08:18:41 -08:00
Brian Carlstrom
a74f42001a am 56c35da7: am bb219fc3: Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
* commit '56c35da7fbc21acbf7297ffff3b7e474c4ac4198':
  Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
2011-01-26 15:34:10 -08:00
Brian Carlstrom
56c35da7fb am bb219fc3: Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
* commit 'bb219fc3dc29e832f3cd8e435c94a894ef2ee87f':
  Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
2011-01-26 15:32:03 -08:00
Brian Carlstrom
bb219fc3dc Add LOCAL_JARJAR_RULES support for BUILD_HOST_JAVA_LIBRARY
Bug: 3086427
Change-Id: Ibe73dfa70d4c3d82968c43e74ced38cd74f60e0f
2011-01-26 15:13:42 -08:00
Ying Wang
80e6cce93e Correct misuse of target/host vars.
Change-Id: Ide41aeddc44ca05d85a36035c2d55ea453cfd216
2011-01-24 23:25:36 -08:00
Ying Wang
3d85bbd288 Merge "Add modifier goal incrementaljavac" 2011-01-24 10:59:15 -08:00
The Android Automerger
97f3f08622 resolved conflicts for merge of b5952289 to master
Change-Id: I792d34aed36200b85512aadc212503a3c1da140f
2011-01-23 23:34:23 -08:00
The Android Automerger
b5952289e2 resolved conflicts for merge of 733ce0d0 to honeycomb-plus-aosp
Change-Id: Ic962c4e2611c31af1da96269d70216b27aa3a18d
2011-01-23 23:25:47 -08:00
Brian Swetland
7cc2440994 make TINY_ANDROID build without the presence of frameworks/* and development/*
Change-Id: I795e27a9ce837b193c6d8d0516e2f523c17214e2
2011-01-23 18:56:08 -08:00
Brian Swetland
72bf09d333 tiny android: include su
Change-Id: Ib8162c0f8171114ffafcac48d482fd3acd5d5956
2011-01-23 17:06:58 -08:00
Dianne Hackborn
733ce0d0cc DO NOT MERGE. Hello, Android 3.0 API 11.
Change-Id: Id859b752fc87fd050005c32665f2f019e177cf95
2011-01-23 14:49:02 -08:00
Ying Wang
015edd2c1b Add modifier goal incrementaljavac
With "incrementaljavac" on your make command line, you will recompile
only Java source files that have been changed since last build.
Nothing is changed if "incrementaljavac" is not among your make goals.

Change-Id: Iae591459827df81ac91e95292464db5e9828343a
2011-01-21 17:49:30 -08:00
Ed Heyl
1d4e3fdeb4 am 7e1ce27c: Merge commit \'50738779\' into gingerbread-plus-aosp
* commit '7e1ce27c08ec57032520613488ec2fe5b3795126':
  DO NOT MERGE Fix issue #3373438: Update GBMR versions
2011-01-21 17:41:23 -08:00
Jean-Baptiste Queru
43b1bb5be1 (Re-)Set version names for AOSP master - do not merge
Change-Id: I0973090ebf00a9e0deb8ec2beb0f39fa93bc03c1
2011-01-21 07:59:40 -08:00
Jean-Baptiste Queru
fce88928fe Revert "Merge commit '50738779' into gingerbread-plus-aosp" - do not merge
This reverts commit 7e1ce27c08, reversing
changes made to 7dfc127096.

Change-Id: I2b4c33ad56a12612f2fc05845428409d7023f683
2011-01-21 07:50:36 -08:00
Ed Heyl
7e1ce27c08 Merge commit '50738779' into gingerbread-plus-aosp
Conflicts:
	core/version_defaults.mk

Change-Id: I69ae9d5b3e0532c67c401a8320e69aab5ee66b0f
2011-01-20 18:08:34 -08:00
Brian Swetland
4d9fee9e9c am cb6fbf88: am a7600364: fix tiny android build
* commit 'cb6fbf88db9e29f761045dbe9ece975f178ff71e':
  fix tiny android build
2011-01-20 17:12:33 -08:00
Brian Swetland
cb6fbf88db am a7600364: fix tiny android build
* commit 'a7600364feb0eff313374e9dd0502ea7e15085f6':
  fix tiny android build
2011-01-20 17:07:27 -08:00
Brian Swetland
a7600364fe fix tiny android build
Change-Id: Ifa6cda67f54969588b5c4e9f900ac2d4ba607e71
Signed-off-by: Brian Swetland <swetland@google.com>
2011-01-20 15:34:39 -08:00
Dianne Hackborn
50738779d9 DO NOT MERGE Fix issue #3373438: Update GBMR versions
Change-Id: Ia334babece0d3cecb19da8ddd240ee300d0ac3ac
2011-01-20 12:17:41 -08:00
Ying Wang
ea482c78e3 am 4d3ac24d: am 84ed6fa2: Disable "-t" for acp.
* commit '4d3ac24dafab161a44fddb1039159b1b484f5841':
  Disable "-t" for acp.
2011-01-19 14:41:25 -08:00
Ying Wang
4d3ac24daf am 84ed6fa2: Disable "-t" for acp.
* commit '84ed6fa27b883de8ba7b41ddecaa2179e7f4b321':
  Disable "-t" for acp.
2011-01-19 14:38:00 -08:00
Ying Wang
84ed6fa27b Disable "-t" for acp.
Acp can not handle high resolution file timestamp on ext4.
We need this to fix incremental build on ext4.

Change-Id: I54e45c73ffa44c4253c7a431375d419fa4dccfd9
2011-01-19 12:15:38 -08:00
Ying Wang
49086372f7 am df3a8ab5: am 85aa5ded: Add external/clang/lib/Headers as llvm-rs-cc\'s system header search path
* commit 'df3a8ab5aa32ca470774939b0fde5111faf5320b':
  Add external/clang/lib/Headers as llvm-rs-cc's system header search path
2011-01-19 12:05:32 -08:00
Ying Wang
df3a8ab5aa am 85aa5ded: Add external/clang/lib/Headers as llvm-rs-cc\'s system header search path
* commit '85aa5ded4ca0338f7c0c8d4256143364ca2cea38':
  Add external/clang/lib/Headers as llvm-rs-cc's system header search path
2011-01-19 12:03:22 -08:00
Ying Wang
85aa5ded4c Add external/clang/lib/Headers as llvm-rs-cc's system header search path
Change-Id: I30257631d484491d9a8346205e411013c76c5a91
Bug: 2943524
2011-01-19 11:50:09 -08:00
Kristian Monsen
b3acbc3195 am def863f7: am da7575bc: Making more space for libwebcore.so
* commit 'def863f719be1a6a1f4725b77f64df2f2526584b':
  Making more space for libwebcore.so
2011-01-19 03:24:54 -08:00
Kristian Monsen
def863f719 am da7575bc: Making more space for libwebcore.so
* commit 'da7575bc70ace95aba75f40f79ed46b4ab1a9913':
  Making more space for libwebcore.so
2011-01-19 03:22:36 -08:00
Rebecca Schultz Zavin
88005e9746 am 1ec15e1e: am d64f0edd: Merge "Include batch in legacy prebuilts with tcmd and ftmipcd." into honeycomb
* commit '1ec15e1e837212f1e90e0b1b52b05f35a8024c94':
  Include batch in legacy prebuilts with tcmd and ftmipcd.
2011-01-18 21:52:44 -08:00
Kristian Monsen
da7575bc70 Making more space for libwebcore.so
Taking half the space of libexpat.so and libbinder.so so there
is still room to grow (webkit mergers tend to make libwebcore
larger)

Change-Id: I6d5bf385221c8e199e587c3a7c8c9425a15a5bb6
2011-01-18 22:02:11 +00:00
Rebecca Schultz Zavin
1ec15e1e83 am d64f0edd: Merge "Include batch in legacy prebuilts with tcmd and ftmipcd." into honeycomb
* commit 'd64f0edd649880cb7de769f0f373ddf520dd22d3':
  Include batch in legacy prebuilts with tcmd and ftmipcd.
2011-01-18 13:48:42 -08:00
Rebecca Schultz Zavin
d64f0edd64 Merge "Include batch in legacy prebuilts with tcmd and ftmipcd." into honeycomb 2011-01-18 13:46:47 -08:00
James Wilson
4e74e30a6a Include batch in legacy prebuilts with tcmd and ftmipcd.
Change-Id: Iad6d7974bfadd3467270033f982de0642657d472
Signed-off-by: James Wilson <james.wilson@motorola.com>
2011-01-18 13:40:05 -08:00
Shih-wei Liao
3ed1dd8af0 am 500c0537: am 10aab0ef: Merge "Remove libbcc and libLLVM* from the grand-fathered modules." into honeycomb
* commit '500c053777494927929999d48df6aa5b01847ec8':
  Remove libbcc and libLLVM* from the grand-fathered modules.
2011-01-18 11:18:27 -08:00
Shih-wei Liao
500c053777 am 10aab0ef: Merge "Remove libbcc and libLLVM* from the grand-fathered modules." into honeycomb
* commit '10aab0ef97efc626c5bb2b239061a38924fc6a13':
  Remove libbcc and libLLVM* from the grand-fathered modules.
2011-01-18 11:15:36 -08:00
Shih-wei Liao
10aab0ef97 Merge "Remove libbcc and libLLVM* from the grand-fathered modules." into honeycomb 2011-01-18 11:04:00 -08:00
Ying Wang
b346a7e4fd am fa2aca54: am 4162f45c: Merge "Don\'t increase image sizes for the release tools." into honeycomb
* commit 'fa2aca54b215c51e4d5cf21f1e16b26adbbe57d2':
  Don't increase image sizes for the release tools.
2011-01-18 09:56:20 -08:00
Ying Wang
fa2aca54b2 am 4162f45c: Merge "Don\'t increase image sizes for the release tools." into honeycomb
* commit '4162f45c90c083b55b8c8d134faad6e1817ea960':
  Don't increase image sizes for the release tools.
2011-01-18 09:54:53 -08:00
Ying Wang
4162f45c90 Merge "Don't increase image sizes for the release tools." into honeycomb 2011-01-18 09:52:07 -08:00
Shih-wei Liao
0c71bf7ac6 Remove libbcc and libLLVM* from the grand-fathered modules.
Change-Id: I7030cdbe6e51c42a4053d7ab8a47a705bff72be7
2011-01-17 01:13:42 -08:00
Dianne Hackborn
1ff250d486 am a24ed68e: am 68404ba4: Bump API version up to 10, thus resource version up to 11.
* commit 'a24ed68eee3465565a8d1251e7339eadecc2969a':
  Bump API version up to 10, thus resource version up to 11.
2011-01-16 22:59:26 -08:00
David 'Digit' Turner
755bed4cc8 Merge "Add support for custom Linux host toolchains when building the SDK." 2011-01-16 14:30:34 -08:00
Dianne Hackborn
a24ed68eee am 68404ba4: Bump API version up to 10, thus resource version up to 11.
* commit '68404ba40ef52b7c5da5425fd51f99ae3434bfa0':
  Bump API version up to 10, thus resource version up to 11.
2011-01-16 12:46:03 -08:00
Dianne Hackborn
68404ba40e Bump API version up to 10, thus resource version up to 11.
Change-Id: I305999c2ff71cc5985d0fc50e496c40e789d3af0
2011-01-16 11:07:28 -08:00
David 'Digit' Turner
60a1e88052 Add support for custom Linux host toolchains when building the SDK.
This is needed in order to build Linux SDK binaries that can run
properly on Ubuntu 8.04 (Hardy). By default, the host toolchain
on 10.04 (Lucid) generates machine code that won't run on Hardy
due to GLibc ABI mistmatches.

Note that nothing happens if the new toolchain is not in the
prebuilt tree.

Change-Id: I914f5a303f16b6871759ce5a7178585ed3060870
2011-01-16 19:14:04 +01:00
Jean-Baptiste Queru
27016763c7 merge from gingerbread
Change-Id: I05a6bed8b7275114ce545a7a45f2e13bf5469ec0
2011-01-14 17:09:18 -08:00
Jesse Wilson
aea85c1f9b Merge "Move apache-xml to external. (project 3 of 4)" 2011-01-14 16:22:26 -08:00
Jean-Baptiste Queru
163c718228 am 4125d8ee: am a4781e86: Merge from open-source gingerbread
* commit '4125d8ee68bec37fe471faeca7dfade73a7a1592':
  CTS: pass vogar expectation location to CollectAllTests.
2011-01-14 13:44:17 -08:00
Jean-Baptiste Queru
4125d8ee68 am a4781e86: Merge from open-source gingerbread
* commit 'a4781e867f2e9115ce5b8085576bebf6505bfd00':
  CTS: pass vogar expectation location to CollectAllTests.
2011-01-14 13:43:02 -08:00
Jean-Baptiste Queru
a4781e867f Merge from open-source gingerbread
Change-Id: I7dce3075bab5831b48a66ef43a32a2be82eda19a
2011-01-14 13:27:48 -08:00
Ying Wang
008367111e Don't increase image sizes for the release tools.
So it keeps consistent with the command run in the makefile.

Change-Id: Id26fa3387aa9bbab88c4ef3fbd26aff0d039c2e1
2011-01-14 11:30:56 -08:00
Jesse Wilson
7eff81df2a Move apache-xml to external. (project 3 of 4)
Change-Id: Ib65348e4203e6ac653e9fe81369b21dad06b5b58
http://b/3351604
2011-01-13 17:21:58 -08:00
Raphael
d3e6fcbe6c Add llvm-rs-cc to the tools buildable under Windows.
To be able to "make llvm-rs-cc" as a Windows SDK tool, we
first need to let the build system know which folders can be
built.

Once this is done, building can be done using the mingw32
package to do cross-compiling under Linux:
  $ USE_MINGW=1 make llvm-rs-cc

Change-Id: I5538f4c52c74dad18dd50b59c9bdbcd6de3fd191
2011-01-12 13:33:04 -08:00
Ying Wang
94978cf495 Disable dexpreopt for unbundled build.
Change-Id: Iad0cc41cfad2533703a0dddad743720c43ddb667
2011-01-12 11:12:06 -08:00
Brett Chabot
fdb400cf20 CTS: pass vogar expectation location to CollectAllTests.
Bug 3181338

Change-Id: I740ab73bee39975ad859b5e11b987ca74fd42658
2011-01-07 16:19:02 -08:00
Ying Wang
79609e3588 am a712543e: Don\'t prepend ./ before the dirs to be removed
* commit 'a712543ec35bd834ad52d47375ab7ec04b8ed3f7':
  Don't prepend ./ before the dirs to be removed
2011-01-07 09:23:03 -08:00
Dianne Hackborn
7e41e31038 We. Are. Honeycomb!
Change-Id: Ife02e57541fe6be14d62619b98fddba57a8132f4
2011-01-06 12:47:43 -08:00
Raphael Moll
ce7b1d5827 am e503fcd5: am 7e27c8e1: Merge "Pass OUT_DIR variable to atree."
* commit 'e503fcd52ec8bbcc9fd4ea4b242f73c6c2cae3d3':
  Pass OUT_DIR variable to atree.
2011-01-05 15:50:22 -08:00
Raphael Moll
e503fcd52e am 7e27c8e1: Merge "Pass OUT_DIR variable to atree."
* commit '7e27c8e15507d62a0ac0b094bc7cfca15f6cc509':
  Pass OUT_DIR variable to atree.
2011-01-05 15:48:24 -08:00
Raphael Moll
7558ad55ce Pass OUT_DIR variable to atree.
Change-Id: Iabbe905341dfe970448682a9dcbb170a04ad5222
2011-01-05 14:58:17 -08:00
Jing Yu
7fcc6d6a00 Merge "Remove global inline options." 2011-01-05 11:56:25 -08:00
Jeff Brown
3781dcfc26 Merge "Add libinput to prelink map." 2011-01-04 17:30:46 -08:00
Ying Wang
096bb3dd00 Don't prepend ./ before the dirs to be removed
So that installclean can be done properly when OUT_DIR is set to an
obsolute path, such as /buildbot/out_dirs/git_gingerbread.
Bug: 3321625

Change-Id: I87667355aa03f31613a8f6a5e17d7e469bf5335f
2011-01-04 17:11:59 -08:00
Jeff Brown
1537529f15 Add libinput to prelink map.
Change-Id: I26998d4799d26165b3f528d1cd292b212eaaab9d
2011-01-04 16:01:15 -08:00
Ying Wang
a712543ec3 Don't prepend ./ before the dirs to be removed
So that installclean can be done properly when OUT_DIR is set to an
obsolute path, such as /buildbot/out_dirs/git_gingerbread.
Bug: 3321625

Change-Id: Ibb9c86e514ebc5f1f821ca04ed9a0a83b37787df
2011-01-04 12:57:58 -08:00
Ying Wang
b1db5a9d90 Merge "Enhance product vars examining." 2010-12-29 14:31:27 -08:00
Ying Wang
f9953b4a61 Enhance product vars examining.
Change-Id: I348629aa6e63ad24d457e91af8f75712dcf91b27
2010-12-29 14:23:06 -08:00
Mike Lockwood
95e3d95280 Add libmtp and libusbhost to prelink map
Change-Id: I7e81edcbb24778143a01039e9cb12f22a922e00a
Signed-off-by: Mike Lockwood <lockwood@android.com>
2010-12-29 09:07:38 -05:00
Jean-Baptiste Queru
54c5e5b18b am 1b8c01db: Merge "Product-configurable sparse ext images."
* commit '1b8c01dbee93366e31b67529a26e1a7b6198c876':
  Product-configurable sparse ext images.
2010-12-28 13:51:53 -08:00
Ying Wang
085a14698b Product-configurable sparse ext images.
Also pass extfs sparse image flag to the release tool.

Change-Id: I79a6a71873634a231aa8990cee22374259601505
2010-12-28 13:41:33 -08:00
Ying Wang
8b07ed87fa LOCAL_AAPT_INCLUDE_ALL_RESOURCES
Set this flag to include all the resources in the given dirs.
Bug: 3313179

Change-Id: I68c02b24174bebe41a5948810cc2f49cc916e51c
2010-12-28 13:16:06 -08:00
Jing Yu
a83b769566 Remove global inline options.
The purpose of removing global inline options is to give
compiler the opportunity to do inline optimizations and inline
tunings for Android native codes.

By removing these global inline options now, the size of
almost all native libraries are reduced. And there is no
noticable performance degradation on webkit, gcstone and
skia benchmarks.

Change-Id: I31e71f51e4f29fa6286fddb89e9eab227581c7b3
2010-12-21 16:33:48 -08:00
Ying Wang
085ff6a8ac am 098826bf: am 099fecd7: Use PRIVATE_CXX in HOST modules.
* commit '098826bf61cba2b14a0538100878bdb029f50790':
  Use PRIVATE_CXX in HOST modules.
2010-12-20 11:42:35 -08:00
Ying Wang
098826bf61 am 099fecd7: Use PRIVATE_CXX in HOST modules.
* commit '099fecd759ce54168fe4094880d1ca748e8906b9':
  Use PRIVATE_CXX in HOST modules.
2010-12-20 11:40:33 -08:00
Ying Wang
099fecd759 Use PRIVATE_CXX in HOST modules.
This fixes the build error:
out/host/linux-x86/obj/SHARED_LIBRARIES/libneo_util_intermediates/neo_err.o:
file not recognized: File format not recognized
See also CL #84578

Change-Id: Ib91230c7a5c9809eb1935959eaa9be8fa7c596b9
2010-12-20 11:18:28 -08:00
Jean-Baptiste Queru
76aa8d0a8b update API version to 9
Change-Id: Ia573996bb910e19c8f7017ca13cf9d9d77083404
2010-12-14 16:16:44 -08:00
Jean-Baptiste Queru
3463d0e102 resolved conflicts for merge of c1b33081 to gingerbread-plus-aosp - DO NOT MERGE
Change-Id: I785e36efe89cc11e2dacfb4a30901be93453f221
2010-12-14 16:12:23 -08:00
Dianne Hackborn
c1b330818e (DO NOT MERGE) Issue #3255640: Need to bump GB to API 10 version name "2.4"
We are now version 2.4, API 10.

Change-Id: I5876ee7cdd1c6e4115dbe79d426f678e8d354449
2010-12-14 11:30:43 -08:00
Ying Wang
1214aeb75f Add framework includes for any aidl source.
Before this change, only aidl in apps gets the framework directories in
their include path.

Change-Id: Ieeaa162f577ea280fe71e4959cc73176b4dfd8ad
2010-12-14 10:57:54 -08:00
David 'Digit' Turner
02e172e892 am efc5d814: am 15f4980d: Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread
* commit 'efc5d81428a8c7d9cf7cb7b3a5f1a8344b02a700':
  Add support for custom Linux host toolchains when building the SDK.
2010-12-14 02:45:58 -08:00
David 'Digit' Turner
efc5d81428 am 15f4980d: Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread
* commit '15f4980d510824113a4d2b71d70de9c67715f3dc':
  Add support for custom Linux host toolchains when building the SDK.
2010-12-14 02:42:10 -08:00
David 'Digit' Turner
15f4980d51 Merge "Add support for custom Linux host toolchains when building the SDK." into gingerbread 2010-12-14 02:37:05 -08:00
Brian Carlstrom
b531c0b44c Merge "Unify target and host Java compilation" 2010-12-13 13:20:21 -08:00
Brian Carlstrom
782695112d Unify target and host Java compilation
This changes tries to reconcile drift between
transform-java-to-classes.jar which is used to build java for the
target with transform-host-java-to-package which is used for the
host. Several packages such as libcore are built both ways and the
drift between these rules was making it hard to make common changes to
things such as warning options.

The new compile-javac definition tries to include as much as possible
from the two previous definitions. Some conflicts it sorts out:
- hardwired -g vs PRIVATE_JAVAC_DEBUG_FLAGS
- consistent order of arguments
- moving PRIVATE_JAVAC_FLAGS to end to allow override of arguments
- xlint_unchecked is always conditional based on LOCAL_WARNINGS_ENABLE

Now what differs between the two is clear in the
transform-java-to-classes and transform-host-java-to-package
definitions. Notable differences:
- the target case supplies a bootclasspath while the host case does not.
- .class files are cleaned up after jaring in the target case,
  but in the cost case they are left for the sake of the vm-tests target
  which expects them to be present. That should probably be fixed in the future.
- PRIVATE_EXTRA_JAR_ARGS used to package resources into the jar only
  happens for the host. Its handled by add-java-resources-to-package for the
  target after dxing.

Change-Id: I2fb28f688fbb632102ca63448c2ac911db0477ae
2010-12-13 11:29:58 -08:00
David 'Digit' Turner
0960ca7488 Add support for custom Linux host toolchains when building the SDK.
This is needed in order to build Linux SDK binaries that can run
properly on Ubuntu 8.04 (Hardy). By default, the host toolchain
on 10.04 (Lucid) generates machine code that won't run on Hardy
due to GLibc ABI mistmatches.

Note that nothing happens if the new toolchain is not in the
prebuilt tree.

Change-Id: I45c1f68e37e15a0032f885df1c5c0f297b3d8642
2010-12-13 11:52:03 +01:00
Ying Wang
953b64f48a am 1f22360f: am c7973678: Merge "Default uninstallable modules\' tag to optional" into gingerbread
* commit '1f22360f60455ff9a486a6c757d1b974341c1895':
  Default uninstallable modules' tag to optional
2010-12-10 16:26:59 -08:00
Ying Wang
1f22360f60 am c7973678: Merge "Default uninstallable modules\' tag to optional" into gingerbread
* commit 'c79736785716d56768998d64317ff90a62073868':
  Default uninstallable modules' tag to optional
2010-12-10 16:21:43 -08:00
Ying Wang
c797367857 Merge "Default uninstallable modules' tag to optional" into gingerbread 2010-12-10 16:17:59 -08:00
Ying Wang
2fd81cf11e Default uninstallable modules' tag to optional
Change-Id: I31faee42c807b3b6d7b85feea6c74860c89d45de
2010-12-10 11:17:28 -08:00
android-merger
1840de544b 2.3.1
Change-Id: I9096a5b7a8e85274cac23d88635d3f49e6698cd8
2010-12-10 07:42:24 -08:00
android-merger
0c3d5d9541 2.3.1
Change-Id: I64c7f35bb6cdfdfef01ce396798a0235642c0486
2010-12-09 16:11:38 -08:00
Ying Wang
228fcef025 Change phony target name dist_libraries to dist_files.
Any module that does not build in apps_only build should not dist for the
default goal "droid" -- they sould dist for "dist_files" instead.

Change-Id: I8696f1ea803fbd8554ec03352e0ef369f5d7be0d
2010-12-08 20:07:48 -08:00
Jean-Baptiste Queru
1ee80eefc7 am dbd43691: am 3ef1d674: am 4985f06f: Merge "Make image-size-from-data-size not use hard coded values."
* commit 'dbd43691870fa64d1ad79371e3d796ed8e63b3b9':
  Make image-size-from-data-size not use hard coded values.
2010-12-06 16:45:01 -08:00
Jean-Baptiste Queru
dbd4369187 am 3ef1d674: am 4985f06f: Merge "Make image-size-from-data-size not use hard coded values."
* commit '3ef1d674806734c2e237a54815ea5c077ce8c344':
  Make image-size-from-data-size not use hard coded values.
2010-12-06 15:12:02 -08:00
Jean-Baptiste Queru
3ef1d67480 am 4985f06f: Merge "Make image-size-from-data-size not use hard coded values."
* commit '4985f06f4e96351c77b88b20bc9ded65daefcd3e':
  Make image-size-from-data-size not use hard coded values.
2010-12-06 15:10:35 -08:00
Brian Muramatsu
1cf9e0ef16 Change from @ to $(hide) in CTS Build
Change-Id: Ibda485105f750e971260088785904ea420cbaa03
2010-12-06 12:49:13 -08:00
Lars Svensson
9cb8c28352 Make image-size-from-data-size not use hard coded values.
The function image-size-from-data-size was using hard
coded values. The size of spare area and pages has become
configurable so we need to read from the variables.

Change-Id: I9461d34400ffc2cc5920860d8aa78750d559e397
2010-12-06 16:18:46 +01:00
Kenny Root
696180ecda Add installd to PRODUCT_PACKAGES
Another change adds the "optional" tag to installd, so moving it here
and removing it from the grandfathered list.

Change-Id: I035ffd527d007cf104c15890509976fc9b99d216
2010-12-03 11:00:40 -08:00
Sriram Raman
ff83c8593e resolved conflicts for merge of 064a4562 to master
Change-Id: I795e2b6ba842541fc941c1da396734198a12ea72
2010-11-30 15:09:19 -05:00
Sriram Raman
064a4562a4 am c647aeca: Add mkuserimg.sh, make_ext4fs to otatools
* commit 'c647aecabb9cf03d73cfc34836e3bfc886b54c2e':
  Add mkuserimg.sh, make_ext4fs to otatools
2010-11-30 11:45:14 -08:00
Sriram Raman
c647aecabb Add mkuserimg.sh, make_ext4fs to otatools
Change-Id: Id48d6643f4579d695685fe2595bd86a80a5083c3
2010-11-29 18:55:39 -05:00
Jean-Baptiste Queru
3f43f96280 am 29ead582: am d2dd8652: Merge "Added generic hook for loading vendor specific tasks."
* commit '29ead58259d47997d7caedf9080f4a2f9c9bd358':
  Added generic hook for loading vendor specific tasks.
2010-11-24 09:35:29 -08:00
Jean-Baptiste Queru
29ead58259 am d2dd8652: Merge "Added generic hook for loading vendor specific tasks."
* commit 'd2dd86529982cd05b4010248cea368fbef763ef2':
  Added generic hook for loading vendor specific tasks.
2010-11-24 09:33:25 -08:00
Claes Elgemark
e22ad6784c Added generic hook for loading vendor specific tasks.
With this change it is possible for vendors to create rules that depend on
targets defined in Android.mk files.

This makes it easier to decouple functionality from the core buildsystem.
Very much as is done within the build git for tasks like creating SDK addon,
Generating eclipse .classpath file etc can then be done for vendors as well.

You can add targets that could perform poststeps on produced modules.
E.g. Do static verification or documentation on modules of a certain type.
You can e.g. create a target that would resign and upload all apks to a
binary repository.

Change-Id: Ic0fa7b60b919ede3c59fa2885d1fd4be1e928c04
2010-11-24 15:40:24 +01:00
Jeff Brown
cbc0f4442e Delete the tuttle keymaps.
These files have been obsolete for years.

Change-Id: I489d22799dd0fd476b6afe296e24434d437ea75b
2010-11-23 16:48:26 -08:00
Jean-Baptiste Queru
493ab6449c am ce5d7e04: am 7fbeda2b: Merge "Adding all\' to INTERNAL_MODIFIER_TARGETS to fix make all\'"
* commit 'ce5d7e04a8550724b3c7dc54f84e68fbcbdb3fcb':
  Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
2010-11-23 10:54:22 -08:00
Jean-Baptiste Queru
ce5d7e04a8 am 7fbeda2b: Merge "Adding all\' to INTERNAL_MODIFIER_TARGETS to fix make all\'"
* commit '7fbeda2b1ed2872b2e2ab2f7faf386a3755502df':
  Adding `all' to INTERNAL_MODIFIER_TARGETS to fix `make all'
2010-11-23 10:51:44 -08:00
Magnus Bäck
6ba4ebf272 Adding all' to INTERNAL_MODIFIER_TARGETS to fix make all'
Commit e334d255 added the `all' pseudo-goal (aka internal modifier
target) to have make dex all Java modules. Unfortunately the new
pseudo-goal wasn't added to INTERNAL_MODIFIER_TARGETS so no actual
phony goal was added, resulting in the obvious

   make: *** No rule to make target `all'.  Stop.

error message when running `make all'. This commit changes
INTERNAL_MODIFIER_TARGETS to also include `all' so that the
pseudo-goal is treated just like `showcommands' and `checkbuild'.

Change-Id: I7905c1e27d1b17bdc1b4331744bf06e18937406f
2010-11-23 10:36:50 -08:00
Jean-Baptiste Queru
cdfcc05897 am 6c7b6fb3: resolved conflicts for merge of b2028868 to gingerbread-plus-aosp
* commit '6c7b6fb3d2fda5cc5b881e01eb8bb0936ef0eeaf':
  IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings
2010-11-19 16:56:31 -08:00
Jean-Baptiste Queru
1607ba1c87 am 554eeb6c: am 493306f7: Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"
* commit '554eeb6c7426c8c1df551516cff903d69ae94f26':
  Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
2010-11-19 16:56:26 -08:00
Jean-Baptiste Queru
6c7b6fb3d2 resolved conflicts for merge of b2028868 to gingerbread-plus-aosp
Change-Id: Ibe616c0bdf8e36aaee42279292a2dbe03c5643c2
2010-11-19 12:35:33 -08:00
Jean-Baptiste Queru
b20288680e Merge "IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings" 2010-11-19 11:15:56 -08:00
Bruce Beare
ccec9c45d9 IA: enable SSE fpmath, Separate ARCH_VARIANT and ARCH makefile settings
Change-Id: I60b8121c92b39a60b513bc2496a1e0a21015c586
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-11-19 11:15:40 -08:00
Jean-Baptiste Queru
554eeb6c74 am 493306f7: Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures"
* commit '493306f7c318d632186bebd732708d4299e66a62':
  Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures
2010-11-19 11:15:19 -08:00
Jean-Baptiste Queru
493306f7c3 Merge "Fix TARGET_PREBUILT_TAG so that get_build_var can retrieve the correct value across architectures" 2010-11-19 11:01:22 -08:00
Bruce Beare
885b6b99d3 Correct makefile test for stagefright build
Change-Id: Ia79b97d43e3fad82491e7d6197ffef2e764a63e3
Signed-off-by: Bruce Beare <bruce.j.beare@intel.com>
2010-11-19 10:45:11 -08:00
Jean-Baptiste Queru
1804025f53 am f41934fc: am 26d8c589: Merge "Display the TARGET_ARCH_VARIANT"
* commit 'f41934fcd42c56a02742014e8e24520a85166117':
  Display the TARGET_ARCH_VARIANT
2010-11-19 10:38:49 -08:00
Jean-Baptiste Queru
f41934fcd4 am 26d8c589: Merge "Display the TARGET_ARCH_VARIANT"
* commit '26d8c5896e937ed677007c23d46d6759845fe91f':
  Display the TARGET_ARCH_VARIANT
2010-11-19 10:37:07 -08:00
Jean-Baptiste Queru
26d8c5896e Merge "Display the TARGET_ARCH_VARIANT" 2010-11-19 10:29:14 -08:00
Ying Wang
cc6c8cb856 am 92cc4c07: am b26a65b5: Merge "Restrict make version to 3.81"
* commit '92cc4c07475bd77ffb058f430c27b04f8cc9dfef':
  Restrict make version to 3.81
2010-11-19 10:27:47 -08:00
Ying Wang
92cc4c0747 am b26a65b5: Merge "Restrict make version to 3.81"
* commit 'b26a65b59ff5ed777accaf34ac06ab6a86dc37c6':
  Restrict make version to 3.81
2010-11-19 10:24:57 -08:00
Jeff Brown
0c3909aacd Merge "Revert change removing AVRCP.kl and cpcap-key.kl" 2010-11-18 14:32:19 -08:00
Jeff Brown
b96e34066a Revert change removing AVRCP.kl and cpcap-key.kl
Cannot remove these legacy prebuilts yet because they are
referenced in the SDK.

Change-Id: I87b6d1145932edc9335b9a800672e7f653ce5521
2010-11-18 14:29:59 -08:00
Kenny Root
824d7b2f02 Fix typo in ALL_PREBUILT error message
Change-Id: Ib59047e5c63950c84a6518a91ab6e5060c46ff21
2010-11-18 14:27:00 -08:00
Jeff Brown
fbc4018d63 Merge "Use prebuilt keymaps in frameworks/base/data/keyboards." 2010-11-18 14:20:53 -08:00
Ying Wang
4f9269ef75 Restrict make version to 3.81
Bug: 3209290
It turns out that gmake 3.82 on Mac OSX crashes with segmentation fault
at some point.

Change-Id: I7b632abe1cafc5f0ff2ea45611d8ccf0aa3f976a
2010-11-18 11:18:52 -08:00
Jeff Brown
99aacc211e Use prebuilt keymaps in frameworks/base/data/keyboards.
Change-Id: I847167abaf5538a45f40df0ed5d69c9848284871
2010-11-18 00:08:24 -08:00
Ying Wang
c5a07ce038 Pass extfs sparse image flag to the release tool.
Change-Id: Icb2a1c4fddb2b6153298ba1b849016aa3d792773
2010-11-17 17:45:36 -08:00
Ying Wang
7ca5c91389 Merge "Product-configurable sparse ext images." 2010-11-17 16:07:40 -08:00
Ying Wang
542903a27b Product-configurable sparse ext images.
Change-Id: Ifd0ac14d7df331c9f6f1e3eee0722e07b4ab199a
2010-11-17 16:01:31 -08:00
Jean-Baptiste Queru
75220495d0 am 766a2a21: am 48ec6d6f: Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."
* commit '766a2a2125d41e8bfb88112601a34af08f47f7f1':
  Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
2010-11-17 15:52:09 -08:00
Jean-Baptiste Queru
766a2a2125 am 48ec6d6f: Merge "Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build."
* commit '48ec6d6f814a70068c4632b468cd7872f34295ad':
  Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
2010-11-17 15:27:13 -08:00
Johnnie Birch
a4716b2618 Enables x86-atom as a valid TARGET_ARCH_VARIANT for the simulator build.
Change-Id: Idbceb6c7d4117fbecd35e4261330e6405666189e
2010-11-17 15:15:08 -08:00
Ficus Kirkpatrick
16e2f98395 Fix a spelling error.
Change-Id: If89847fa16db4e2b30372678ab8f7117ad5fa0c6
2010-11-12 17:38:20 -08:00
Xavier Ducrohet
8d458ab320 am f5f81fc7: am 01a9840b: Merge "Rename layoutlib_utils into ide_common"
* commit 'f5f81fc75e6f4ab598fab8876efc892243287def':
  Rename layoutlib_utils into ide_common
2010-11-11 15:01:52 -08:00
Xavier Ducrohet
f5f81fc75e am 01a9840b: Merge "Rename layoutlib_utils into ide_common"
* commit '01a9840ba7545d9175575cc3d95b2584b2dee31c':
  Rename layoutlib_utils into ide_common
2010-11-11 14:59:57 -08:00
Xavier Ducrohet
2e5ee27e9e Rename layoutlib_utils into ide_common
Change-Id: Iaa8275881dd1ee7d41c30f8b0d481253a6635271
2010-11-11 12:44:16 -08:00
Patrick Scott
e39dd6b048 Merge "Replace grep | head | awk | tr | tr with awk." 2010-11-10 04:52:42 -08:00
Joe Onorato
25939e224e Set ro.build.characteristics to the value from PRODUCT_CHARACTERISTICS that's also passed to aapt.
Bug: 3144768
Change-Id: Ic1724c64d015de7a5c4f13709b91db51b8f10872
2010-11-09 08:53:01 -08:00
Patrick Scott
fa30f5b8c4 Replace grep | head | awk | tr | tr with awk.
Head was causing a SIGPIPE in grep that only appeared when using
distss.  This wasn't causing any build problems but spewed a lot
of warnings.

However, this change trims the command from 5 proccesses to 1 which is
nice.

Change-Id: Iac846ec1d01a022976cfc5fd28091a720ab161e7
2010-11-08 09:24:37 -05:00
Wink Saville
c2da70dbc5 Merge "Rename protoc to aprotoc." 2010-11-05 15:38:37 -07:00
Ying Wang
33c0d952fc Allow module-specific protoc flags.
You can add local protoc flags via LOCAL_PROTOC_FLAGS.

Change-Id: If246a4edafe1edcec6a7f193bde8ce3c83de745b
2010-11-05 11:30:58 -07:00
Wink Saville
e789083c06 Rename protoc to aprotoc.
With gLucid protoc is installed in the base system, by renaming
our version there will be no confusion about which compiler is
being used.

Change-Id: Id6900baacc7d57abee5dc5f694b013d7a42b35c6
2010-11-05 11:28:51 -07:00
Ying Wang
60293914c1 Set the correct proto intermediate dir for native modules.
Change-Id: I008778de2b81ed0c029979a7865827a96bf44b51
2010-11-05 11:20:03 -07:00
Ying Wang
3d6bf975bd Merge "Integrate protocol buffer compiler into the build system." 2010-11-05 17:33:41 +00:00
Ying Wang
5cf0b2cf83 Merge "'make dump-products' to dump products." 2010-11-04 13:21:20 -07:00