Commit graph

2985 commits

Author SHA1 Message Date
The Android Automerger
1935014378 JWQ78 2013-03-19 05:56:36 -07:00
Ying Wang
d7321d31ac Skip userdata.img only if partition size is not give for extfs.
We still build yaffs2 images which don't need partition size.

Change-Id: I9c7f45069f25868666a257cee044faecf1a8781a
2013-03-15 10:32:29 -07:00
Ying Wang
4ac826b6d3 Don't build userdata.img if no partition size
And retire BOARD_DONT_BUILD_USERDATA_IMG.
This unifies the logic in build/core/Makefile and
build/tools/releasetools/img_from_target_files.

Change-Id: Ib6b4e8e0d8279ed7deaf047e9dc30eb65aba013f
2013-03-15 09:03:39 -07:00
Ben Cheng
ea871a0649 Link libgcc.a before shared libraries (especially libc.so).
BUG: 8247455
Change-Id: Ia8816536ca95a7084e80c7f425f81658afea9609
2013-03-14 13:39:29 -07:00
Raphael Moll
cdfb5bac3a resolved conflicts for merge of a3aea5b6 to jb-mr2-dev
Change-Id: I4ff0adb3f9d9b5ae293c4903569e871ac5f2e9ae
2013-03-14 12:42:04 -07:00
Raphael Moll
8a2b7707dd Build SDK using prebuilts/devtools.
Cleans up some unused/renamed files:
- sdk_only_whitelist is better named windows_sdk_whitelist.
- a few product.mk dependencies should not be listed here
  any more but in the sdk/product.mk instead (which they were.)

Change-Id: Ifad3049321c8ec4edd8b94b83e570eebba442e7d
2013-03-13 15:30:35 -07:00
Stephen Hines
6e2d53a5cd Merge "We need to use the ARM EABI to pass vector registers properly (i.e. float2)." into jb-mr2-dev 2013-03-13 01:20:15 +00:00
Stephen Hines
408733b15c We need to use the ARM EABI to pass vector registers properly (i.e. float2).
Given the following function signature:
void rsDebug(const char *s, float2 f2);

Under the regular ARM ABI, the arguments would be passed as follows:
r0 <- s
r1 <- f2.x
r2 <- f2.y

Under the ARM EABI, the arguments would be passed as follows:
r0 <- s
r1 <- UNUSED due to alignment padding for vector operation
r2 <- f2.x
r3 <- f2.y

Change-Id: I2332c8555c00003ae900f299fa3aee1b3ccac439
2013-03-12 17:10:19 -07:00
Dianne Hackborn
870d5f16a5 Merge "Add LOCAL_APK_LIBRARIES argument." into jb-mr2-dev 2013-03-12 19:31:11 +00:00
Dianne Hackborn
a1fece009f Add LOCAL_APK_LIBRARIES argument.
This allows you to build apks that link against other
apks using the framework's new shared library apk feature.

Also if you are using LOCAL_APK_LIBRARIES, then LOCAL_DEX_PREOPT
will not be allowed.  This is because using preopt means the
apk is stripped of its dex file, so the pre-installed apk can't
be redexed if its associated library changes.  (Even if the build
system didn't strip the dex, Dalvik still has issues because it
assumes a pre-odex file is always valid.)

Change-Id: I952c0d24f8975f75aff67f78b5faeec91144c3e7
2013-03-12 10:50:28 -07:00
Torne (Richard Coles)
71f8b245ce Don't try to group static libraries on mac.
Mac's linker doesn't support --start-group and --end-group; it scans
libraries repeatedly even without these options, so it's not necessary.

Change-Id: If22527e75470f7fa9452dc33efe4d40a60d0919a
2013-03-11 14:59:42 +00:00
Stephen Hines
9f66959e3b Mips needs to be marked little-endian explicitly.
Change-Id: Id4a08124b6c809c29a5e338d7aa0741db3ac57a3
2013-03-08 09:02:52 -08:00
Ying Wang
512b9628b0 Remove nonexisting module names.
Change-Id: I825de45f1b982e4aa391b11bf18ba90432272fa7
2013-03-07 18:29:56 -08:00
Tim Murray
c08eceee8e Merge "Add support for multiple architectures with RS compat lib." into jb-mr2-dev 2013-03-07 23:34:11 +00:00
Doug Zongker
07e9fbb241 Merge "recovery: choose between available fonts based on device density" into jb-mr2-dev 2013-03-07 22:34:00 +00:00
Tim Murray
1a6f09a48c Add support for multiple architectures with RS compat lib.
Change-Id: I310f6f72e1124c06e9c59b0f59d33f168dc1e632
2013-03-06 17:15:26 -08:00
Doug Zongker
e12973258a recovery: choose between available fonts based on device density
Change-Id: I39aded4e1fb310d7e4b9c9ed3356686fcf62c002
2013-03-06 15:30:29 -08:00
Ben Cheng
af21f7c3e7 Stash TARGET_CPU_VARIANT and print it in dumpvar.
Bug:7961327

Merged from internal master.

Change-Id: Ia78472ba53ae1221de4572119aa5c63246941eeb
2013-03-06 21:43:17 +00:00
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
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
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
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
45150f8b89 Fix function call syntax error.
Change-Id: Id40e059ade0c24b62ac407192ed3a67398dfa083
2013-02-27 15:23:42 -08: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
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
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
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
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
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