summaryrefslogtreecommitdiffstats
path: root/core
Commit message (Collapse)AuthorAgeFilesLines
* core: combo: arm: use appropriate mcpu flags for cortex-a7Dima Zavin2013-03-231-0/+4
| | | | | Change-Id: If00577d36257e4d03f63f36b159bb2e015958d6a Signed-off-by: Dima Zavin <dima@android.com>
* Delete icu4j from pathmap.mkYing Wang2013-03-221-1/+0
| | | | | | frameworks/base/icu4j is gone in jb-mr2-dev. Change-Id: I078c8ac3db85598a9b30f8220f251eb7631151e0
* am e874f3ab: am 55c06f75: Merge "Duplicate libgcc.a in front of *so"Andrew Hsieh2013-03-192-4/+8
|\ | | | | | | | | * commit 'e874f3ab7c3f70582f877e762c13c1943ed0e398': Duplicate libgcc.a in front of *so
| * Duplicate libgcc.a in front of *soAndrew Hsieh2013-03-192-4/+8
| | | | | | | | | | | | Also see 6c7bc550adb917157a9f53ebf8898110e37294b2 Change-Id: Iade6cd6b40cd4840a148098e1d8fc7a0c97e2f66
| * Link libgcc.a before shared libraries (especially libc.so).Ben Cheng2013-03-181-2/+4
| | | | | | | | | | | | [cherry-picked from internal master] Change-Id: I53d19754d0d40e9ca2f3d043001cc77e39e5d795
* | Skip userdata.img only if partition size is not give for extfs.Ying Wang2013-03-151-2/+11
| | | | | | | | | | | | We still build yaffs2 images which don't need partition size. Change-Id: I9c7f45069f25868666a257cee044faecf1a8781a
* | Don't build userdata.img if no partition sizeYing Wang2013-03-151-2/+2
| | | | | | | | | | | | | | | | 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
* | Link libgcc.a before shared libraries (especially libc.so).Ben Cheng2013-03-141-2/+4
| | | | | | | | | | BUG: 8247455 Change-Id: Ia8816536ca95a7084e80c7f425f81658afea9609
* | resolved conflicts for merge of a3aea5b6 to jb-mr2-devRaphael Moll2013-03-141-2/+2
|\ \ | |/ | | | | Change-Id: I4ff0adb3f9d9b5ae293c4903569e871ac5f2e9ae
| * Build SDK using prebuilts/devtools.Raphael Moll2013-03-131-2/+2
| | | | | | | | | | | | | | | | | | 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
| * Remove nonexisting module names.Ying Wang2013-03-071-1/+1
| | | | | | | | Change-Id: I825de45f1b982e4aa391b11bf18ba90432272fa7
| * Stash TARGET_CPU_VARIANT and print it in dumpvar.Ben Cheng2013-03-062-0/+2
| | | | | | | | | | | | | | | | Bug:7961327 Merged from internal master. Change-Id: Ia78472ba53ae1221de4572119aa5c63246941eeb
| * Don't install all host modules by default.Ying Wang2013-03-064-20/+0
| | | | | | | | | | | | | | | | | | 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
* | Merge "We need to use the ARM EABI to pass vector registers properly (i.e. ↵Stephen Hines2013-03-131-1/+1
|\ \ | | | | | | | | | float2)." into jb-mr2-dev
| * | We need to use the ARM EABI to pass vector registers properly (i.e. float2).Stephen Hines2013-03-121-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Add LOCAL_APK_LIBRARIES argument." into jb-mr2-devDianne Hackborn2013-03-124-0/+19
|\ \ \ | |/ / |/| |
| * | Add LOCAL_APK_LIBRARIES argument.Dianne Hackborn2013-03-124-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Don't try to group static libraries on mac.Torne (Richard Coles)2013-03-111-4/+0
| | | | | | | | | | | | | | | | | | | | | 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
* | | Mips needs to be marked little-endian explicitly.Stephen Hines2013-03-081-1/+1
| | | | | | | | | | | | Change-Id: Id4a08124b6c809c29a5e338d7aa0741db3ac57a3
* | | Merge "Add support for multiple architectures with RS compat lib." into ↵Tim Murray2013-03-074-21/+14
|\ \ \ | | | | | | | | | | | | jb-mr2-dev
| * | | Add support for multiple architectures with RS compat lib.Tim Murray2013-03-064-21/+14
| |/ / | | | | | | | | | Change-Id: I310f6f72e1124c06e9c59b0f59d33f168dc1e632
* | | Merge "recovery: choose between available fonts based on device density" ↵Doug Zongker2013-03-071-0/+12
|\ \ \ | |/ / |/| | | | | into jb-mr2-dev
| * | recovery: choose between available fonts based on device densityDoug Zongker2013-03-061-0/+12
| | | | | | | | | | | | Change-Id: I39aded4e1fb310d7e4b9c9ed3356686fcf62c002
* | | Support build rules which generate .o files.Torne (Richard Coles)2013-03-051-2/+11
|/ / | | | | | | | | | | | | | | | | | | | | | | 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
* | Allow to call dist-for-goals multiple times for the same fileYing Wang2013-03-013-22/+14
| | | | | | | | | | | | | | | | | | | | 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
* | am 14567bb0: am 08d56b4a: Merge "CTS: work around ClassLoader limitation"Kenny Root2013-02-281-0/+1
|\ \ | |/ | | | | | | * commit '14567bb00754405fac535bc8be8e46fa8abd7c82': CTS: work around ClassLoader limitation
| * Merge "CTS: work around ClassLoader limitation"Kenny Root2013-02-281-0/+1
| |\
| | * CTS: work around ClassLoader limitationKenny Root2013-02-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | Merge "Run e2fsck only when building images with the target files." into ↵Ying Wang2013-02-281-3/+5
|\ \ \ | | | | | | | | | | | | jb-mr2-dev
| * | | Run e2fsck only when building images with the target files.Ying Wang2013-02-271-3/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | Fix function call syntax error.Ying Wang2013-02-271-1/+1
| | | | | | | | | | | | | | | | Change-Id: Id40e059ade0c24b62ac407192ed3a67398dfa083
* | | | Merge "Switch target java library dependency file from javalib.jar to ↵Ying Wang2013-02-271-1/+1
|\ \ \ \ | | | | | | | | | | | | | | | classes.jar" into jb-mr2-dev
| * | | | Switch target java library dependency file from javalib.jar to classes.jarYing Wang2013-02-271-1/+1
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | am e2f7bd46: am c148cca6: Merge "Specify -msse3 on host as on target."Ian Rogers2013-02-271-1/+2
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'e2f7bd46fc7b9aa746ae46e551727c4db0356d37': Specify -msse3 on host as on target.
| * | | Merge "Specify -msse3 on host as on target."Ian Rogers2013-02-271-1/+2
| |\ \ \ | | |_|/ | |/| |
| | * | Specify -msse3 on host as on target.Ian Rogers2013-02-261-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | | Run zipalign after classes.dex is removed from the apkYing Wang2013-02-251-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | If LOCAL_DEX_PREOPT is enabled. Change-Id: Ie2a706fbb77bc31c9fdb01c8435819c5de97ea28
* | | | Merge "Reduce RS build verbosity." into jb-mr2-devStephen Hines2013-02-272-2/+1
|\ \ \ \ | |_|_|/ |/| | |
| * | | Reduce RS build verbosity.Stephen Hines2013-02-272-2/+1
| | | | | | | | | | | | | | | | Change-Id: I9d04198ed1b9025abd60080c5ef23b3ce5ef9e22
* | | | Use $(my_prefix)DEPENDENCIES_ON_SHARED_LIBRARIESYing Wang2013-02-251-4/+10
| | | | | | | | | | | | | | | | | | | | | | | | To disentangle the host/target shared library dependencies. Change-Id: I3122b370a7c24425861ab6dba91e6d8d84b27249
* | | | Run zipalign after classes.dex is removed from the apkYing Wang2013-02-251-2/+4
|/ / / | | | | | | | | | | | | | | | If LOCAL_DEX_PREOPT is enabled. Change-Id: Ie2a706fbb77bc31c9fdb01c8435819c5de97ea28
* | | Merge "Build rs_compatibility_jni_libs into product-specific dir" into ↵Ying Wang2013-02-261-5/+6
|\ \ \ | | | | | | | | | | | | jb-mr2-dev
| * | | Build rs_compatibility_jni_libs into product-specific dirYing Wang2013-02-251-5/+6
| | | | | | | | | | | | | | | | | | | | | | | | They can't be shared across products. Change-Id: I2e2b9126f2e78eb28866978d58cf6eb8c52f3d09
* | | | am 757e212c: am 0426da29: Merge "Fixed error message for using OpenJDK."Jean-Baptiste Queru2013-02-251-3/+11
|\ \ \ \ | |/ / / |/| / / | |/ / | | | * commit '757e212ca2eb5584efb1631c3b26241ffb06e3c6': Fixed error message for using OpenJDK.
| * | Fixed error message for using OpenJDK.Tim Roes2013-02-231-3/+11
| |/ | | | | | | | | | | | | | | | | | | | | 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>
* | Don't run cleanspecs if you are using mm/mmm.Ying Wang2013-02-223-34/+7
| | | | | | | | | | | | | | | | 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
* | Untwist the target/host shared library dependencies.Ying Wang2013-02-223-5/+29
| | | | | | | | | | | | | | | | 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
* | resolved conflicts for merge of 40ab92d0 to masterYing Wang2013-02-221-3/+14
|\ \ | |/ | | | | Change-Id: I400c1655c57237687a21a017b9c2065d166e3097
| * Merge "[MIPS] Update build rules"Ying Wang2013-02-221-4/+15
| |\
| | * [MIPS] Update build rulesChris Dearman2013-02-191-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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>