Commit Graph

3330 Commits

Author SHA1 Message Date
Ying Wang
2e65cd5510 Don't install all host modules by default.
Instead we should explicitly set up the dependency, if the module will
be used in the build process; Use LOCAL_MODULE_TAGS with eng, debug or
tests if the module is for testing; or add to PRODUCT_PACKAGES if it's
required by a product.

Change-Id: Ic26319c26c1166bc1062dfbcfb4e006af185249a
2013-03-06 11:47:36 -08:00
Dianne Hackborn
a6e7f28492 Welcome, Key Lime Pie.
Change-Id: I51563ed3622d61a6396246c78b01605ff7a96b02
2013-03-05 10:29:24 -08:00
Torne (Richard Coles)
aace2024d7 Support build rules which generate .o files.
webviewchromium has some build rules which use a custom tool to create
.o files from other input (i.e. they are not prebuilt and so can't be
included in LOCAL_PREBUILT_OBJ_FILES). Support adding .o files to
LOCAL_GENERATED_SOURCES and doing the right thing with them (including
them in the static/dynamic library or executable being built).

Bug: 7714333

Change-Id: I3b1d29eeff30aebeafe33398f9bef2eb6972d997
2013-03-05 10:35:57 +00:00
Ying Wang
4f0d4e9183 am 0410d3ef: Merge "Allow to call dist-for-goals multiple times for the same file" into jb-mr2-dev
* commit '0410d3ef3d9578177bffb06a657b1addab605167':
  Allow to call dist-for-goals multiple times for the same file
2013-03-02 01:47:42 +00:00
Ying Wang
534fcd766e Allow to call dist-for-goals multiple times for the same file
You can dist the same file for multiple goals in multiple calls to
dist-for-goals. The first call will establish the real copy rule, while
the rest call just establishes the goals' dependency on the dest file.
This enable uss to remove the bizarre $(if ..) enclosing the droid and
sdk dist while avoiding make's multiple rules warning.

Change-Id: I76475db76a9e6167e0e606dd582b54e80dfcdd22
2013-03-01 16:51:26 -08:00
Kenny Root
dedb45694e am 3e3a3a2b: am 14567bb0: am 08d56b4a: Merge "CTS: work around ClassLoader limitation"
* commit '3e3a3a2b794531c517064cc115f8f5e00da07b4a':
  CTS: work around ClassLoader limitation
2013-02-28 22:38:30 +00:00
Ying Wang
4ceec4732f am 6f05aa44: Merge "Run e2fsck only when building images with the target files." into jb-mr2-dev
* commit '6f05aa44ecfadc12a9f23a16ecf92b9ffbe0aa04':
  Run e2fsck only when building images with the target files.
2013-02-28 22:37:30 +00:00
Kenny Root
3e3a3a2b79 am 14567bb0: am 08d56b4a: Merge "CTS: work around ClassLoader limitation"
* commit '14567bb00754405fac535bc8be8e46fa8abd7c82':
  CTS: work around ClassLoader limitation
2013-02-28 17:48:59 +00:00
Kenny Root
08d56b4a10 Merge "CTS: work around ClassLoader limitation" 2013-02-28 17:23:55 +00:00
Kenny Root
65307c065f CTS: work around ClassLoader limitation
Trying to use reflection on classes loaded from a different ClassLoader
than the system one caused SecurityException since you can't load
certain packages.

Adding them to the boot classpath forces them to be in the same
ClassLoader.

Change-Id: Id518ab0a99da6defac525c0ad430a63f600ce85f
2013-02-27 16:56:04 -08:00
Ying Wang
6f05aa44ec Merge "Run e2fsck only when building images with the target files." into jb-mr2-dev 2013-02-28 00:46:07 +00:00
Ying Wang
ffa7b27f60 am 45150f8b: Fix function call syntax error.
* commit '45150f8b895d3256e83bc53219e393ab91d2ef20':
  Fix function call syntax error.
2013-02-27 23:32:18 +00:00
Ying Wang
45150f8b89 Fix function call syntax error.
Change-Id: Id40e059ade0c24b62ac407192ed3a67398dfa083
2013-02-27 15:23:42 -08:00
Ying Wang
93a2c91b70 am 4974879c: Merge "Switch target java library dependency file from javalib.jar to classes.jar" into jb-mr2-dev
* commit '4974879c32adc8285fd4407c49919e01b54b09d6':
  Switch target java library dependency file from javalib.jar to classes.jar
2013-02-27 23:23:40 +00:00
Ian Rogers
029eaa88f4 am 25ba3b09: am e2f7bd46: am c148cca6: Merge "Specify -msse3 on host as on target."
* commit '25ba3b0975a623e97c2e6d0601e9590fb36de960':
  Specify -msse3 on host as on target.
2013-02-27 23:23:00 +00:00
Stephen Hines
f6c62d67e6 am ec7d07eb: Merge "Reduce RS build verbosity." into jb-mr2-dev
* commit 'ec7d07ebe822b77e389fd7ae4133b91f5497804c':
  Reduce RS build verbosity.
2013-02-27 23:22:56 +00:00
Ying Wang
4974879c32 Merge "Switch target java library dependency file from javalib.jar to classes.jar" into jb-mr2-dev 2013-02-27 23:10:12 +00:00
Ying Wang
6a42a25429 Run e2fsck only when building images with the target files.
With this change, e2fsck is run only when you build the update.zip file,
which is built when "dist" is among the make command.

Bug: 7591683
Change-Id: I446b71d5aa9295aff3af622f115175f769746615
2013-02-27 13:54:02 -08:00
Ying Wang
087d4ee3ed Switch target java library dependency file from javalib.jar to classes.jar
Previously, any target Java code that depends on framework.jar has to
wait for the library's javalib.jar.
To build javalib.jar we have to run dx, which is quite slow.
Actually when code links against framework.jar, only classes.jar is
needed.
This improves the potential parallelism of the build system.

Change-Id: I82c5926ef282a3a6096bbf49b54ef4f2a0c2c0e7
2013-02-27 12:11:37 -08:00
Ian Rogers
25ba3b0975 am e2f7bd46: am c148cca6: Merge "Specify -msse3 on host as on target."
* commit 'e2f7bd46fc7b9aa746ae46e551727c4db0356d37':
  Specify -msse3 on host as on target.
2013-02-27 19:03:54 +00:00
Stephen Hines
ec7d07ebe8 Merge "Reduce RS build verbosity." into jb-mr2-dev 2013-02-27 18:56:24 +00:00
Ian Rogers
c148cca661 Merge "Specify -msse3 on host as on target." 2013-02-27 18:15:50 +00:00
Stephen Hines
9ac9b53dc6 Reduce RS build verbosity.
Change-Id: I9d04198ed1b9025abd60080c5ef23b3ce5ef9e22
2013-02-27 00:51:08 -08:00
Ian Rogers
35a6b4fb65 Specify -msse3 on host as on target.
Make the host and the target x86 build more uniform by using the same machine flags.
Its unlikely Android has ever been built on a machine without SSE3 support.

Bug: 8068608
Change-Id: I19635528b61bf2c6faf02c2e575b1d9bf8025d3a
2013-02-26 15:10:22 -08:00
Ying Wang
a875ff3958 am b9d22596: Merge "Use DEPENDENCIES_ON_SHARED_LIBRARIES" into jb-mr2-dev
* commit 'b9d22596a87c438cb5a2f4bdbdc1026ce7601e0a':
  Use $(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES
2013-02-26 02:26:54 +00:00
Ying Wang
6c86a133c7 Use $(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIES
To disentangle the host/target shared library dependencies.

Change-Id: I3122b370a7c24425861ab6dba91e6d8d84b27249
2013-02-25 18:12:11 -08:00
Ying Wang
befb2623c9 am f7084ca9: Run zipalign after classes.dex is removed from the apk
* commit 'f7084ca9218b35b41523d7fb0926a8773ecf2ef4':
  Run zipalign after classes.dex is removed from the apk
2013-02-26 01:05:39 +00:00
Ying Wang
f7084ca921 Run zipalign after classes.dex is removed from the apk
If LOCAL_DEX_PREOPT is enabled.

Change-Id: Ie2a706fbb77bc31c9fdb01c8435819c5de97ea28
2013-02-25 16:58:05 -08:00
Ying Wang
6da14e3d26 am 48b6e18f: Merge "Build rs_compatibility_jni_libs into product-specific dir" into jb-mr2-dev
* commit '48b6e18f1f27ca57c89879c00fae516243231354':
  Build rs_compatibility_jni_libs into product-specific dir
2013-02-26 00:25:18 +00:00
Ying Wang
48b6e18f1f Merge "Build rs_compatibility_jni_libs into product-specific dir" into jb-mr2-dev 2013-02-26 00:19:04 +00:00
Ying Wang
370fa673b5 Build rs_compatibility_jni_libs into product-specific dir
They can't be shared across products.

Change-Id: I2e2b9126f2e78eb28866978d58cf6eb8c52f3d09
2013-02-25 16:06:42 -08:00
Ying Wang
7f7d4d93b8 Run zipalign after classes.dex is removed from the apk
If LOCAL_DEX_PREOPT is enabled.

Change-Id: Ie2a706fbb77bc31c9fdb01c8435819c5de97ea28
2013-02-25 16:02:42 -08:00
Jean-Baptiste Queru
12c498ef2f am 4dbbd8a3: am 757e212c: am 0426da29: Merge "Fixed error message for using OpenJDK."
* commit '4dbbd8a37efb93922bc7bc62f341fd29d739383e':
  Fixed error message for using OpenJDK.
2013-02-25 21:26:09 +00:00
Jean-Baptiste Queru
4dbbd8a37e am 757e212c: am 0426da29: Merge "Fixed error message for using OpenJDK."
* commit '757e212ca2eb5584efb1631c3b26241ffb06e3c6':
  Fixed error message for using OpenJDK.
2013-02-25 21:21:03 +00:00
Torne (Richard Coles)
77a4a7a91d Support build rules which generate .o files.
webviewchromium has some build rules which use a custom tool to create
.o files from other input (i.e. they are not prebuilt and so can't be
included in LOCAL_PREBUILT_OBJ_FILES). Support adding .o files to
LOCAL_GENERATED_SOURCES and doing the right thing with them (including
them in the static/dynamic library or executable being built).

Bug: 7714333

Change-Id: I3b1d29eeff30aebeafe33398f9bef2eb6972d997
2013-02-25 13:56:51 +00:00
Tim Roes
304f5194fd Fixed error message for using OpenJDK.
Output a meaningful error message, when OpenJDK is detected
instead of giving the "wrong java version" output.
That output confused several users (from experiences in IRC)
since it gives you an output like "You are using java
version 1.6.0, right version would be Java SE 1.6".

Change-Id: I31ceeb03f1f98524b2b7de9b8be45231985fdb9e
Signed-off-by: Tim Roes <tim.roes88@googlemail.com>
2013-02-23 20:25:00 +01:00
Ying Wang
50e52fa11e Don't run cleanspecs if you are using mm/mmm.
There is lurky bug in the previous logic I believe:
in rare cases, people saw almost all cleansteps rerun.
Anyway, it's very rare that you need to run cleansteps when you run mm/mmm.

Change-Id: I42e84b3bf01590712ba1b167fe9a500f4ae1ddde
2013-02-22 18:15:29 -08:00
Ying Wang
9485a57bb2 Untwist the target/host shared library dependencies.
Before this, if there are duplicate module names in both the host and
target spaces, LOCAL_SHARED_LIBRARIES results in mixed dependencies.

Bug: 7026946
Change-Id: I5407e3d078a8903c94978cc6d3e256851c52340f
2013-02-22 14:32:30 -08:00
Ying Wang
00b2811e66 resolved conflicts for merge of 40ab92d0 to master
Change-Id: I400c1655c57237687a21a017b9c2065d166e3097
2013-02-22 11:02:03 -08:00
Ying Wang
b303d5d7d4 Merge "[MIPS] Update build rules" 2013-02-22 18:03:15 +00:00
Ying Wang
514cc4d25e We shouldn't use temporary variable in the build recipe.
Use $@ instead.

Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
2013-02-22 10:01:33 -08:00
Ying Wang
e5d6d900c2 Merge "We shouldn't use temporary variable in the build recipe." 2013-02-22 18:00:56 +00:00
Ying Wang
b8a256a1fa We shouldn't use temporary variable in the build recipe.
Use $@ instead.

Change-Id: Ida0960a453b3701383a31f698c3163a297c4bce5
2013-02-22 09:59:17 -08:00
Ken Sumrall
14c63cf678 Merge "Start producing target files using the unified fstab." 2013-02-22 06:23:02 +00:00
Ying Wang
3126831621 Support for ANDROID_BUILD_EVERYTHING_BY_DEFAULT
Set ANDROID_BUILD_EVERYTHING_BY_DEFAULT to true to build everything by
default. You can set it in your .bashrc or buildspec.mk.

Change-Id: I0bc2461d0e17c63a6f1c439cdfaaa94e36483a02
2013-02-21 18:42:28 -08:00
Ken Sumrall
31ce31f607 Start producing target files using the unified fstab.
Change-Id: I6d9783fba3fcb4617323071bf924f50b66ad6935
2013-02-21 16:27:25 -08:00
Ying Wang
9c3aa053f5 Order-only deps on LOCAL_C/CXX and BCC_COMPAT
So if the host binaries are updated, we don't run the rules again.
Bug: 8234097

Change-Id: I6c888d2b3ae39db1f91411da630ac098273f139d
2013-02-20 13:34:05 -08:00
Ying Wang
b9a4e1eeea Merge "Use BUILD_PREBUILT to install the cmds." 2013-02-20 01:15:31 +00:00
Chris Dearman
6cc0c334fc [MIPS] Update build rules
Add  -D_FORTIFY_SOURCE=1 to the default cflags
Update build rule for executable with PRIVATE_ALL_WHOLE_STATIC_LIBRARIES
Use single dash version of -print-whatever
compile everything with relro / bind_now
Enable NX protections

Some other cleanups to reduce differences between ARM and MIPS config files

Change-Id: I30b4de449e6353b581ef7f9437a3bb9be53d5bbf
Signed-off-by: Chris Dearman <chris@mips.com>
2013-02-19 17:04:57 -08:00
Ying Wang
d3aab738de Use BUILD_PREBUILT to install the cmds.
Change-Id: Idd7308d653653387ee3ff4384ee428bc3c663c8b
2013-02-19 16:43:12 -08:00