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

3561 commits

Author SHA1 Message Date
Ying Wang
6d98d3b942 am a4ad06ac: am 750e0c08: Merge "Prepare upcoming GCC 4.8 release." 
* commit 'a4ad06ac1db1dfc041fe386b76b22233fdc54341':
  Prepare upcoming GCC 4.8 release.
 2013-08-13 15:03:24 -07:00
Ying Wang
a4ad06ac1d am 750e0c08: Merge "Prepare upcoming GCC 4.8 release." 
* commit '750e0c088271315b21741429aa124d7ba616fcc7':
  Prepare upcoming GCC 4.8 release.
 2013-08-13 15:00:55 -07:00
Ben Cheng
aac3f81657 Prepare upcoming GCC 4.8 release. 
o Add -Wno-unused-parameter -Wno-unused-but-set-parameter to suppress
  new warnings.
o Define GCC_COLORS to enable colorful diagnostic messages.

Change-Id: Icbd62300b0e6f39d4e514edec2431a06b4d72421
(cherry picked from internal commit ccd8e6082b)
 2013-08-13 14:52:31 -07:00
Ying Wang
25d64bea75 am 285045bd: Support for LOCAL_HAL_STATIC_LIBRARIES 
* commit '285045bd83548196aa3695423c6cd500ebe6d6c1':
  Support for LOCAL_HAL_STATIC_LIBRARIES
 2013-08-13 14:41:55 -07:00
Ying Wang
285045bd83 Support for LOCAL_HAL_STATIC_LIBRARIES 
Now you can have a board config variable BOARD_HAL_STATIC_LIBRARIES,
which is a list of board-specific HAL static library names with pattern
"lib<library_name>.<board_specific_suffix>". LOCAL_HAL_STATIC_LIBRARIES
is a list of "lib<library_name>" and any matched
BOARD_HAL_STATIC_LIBRARIES will be added to the LOCAL_STATIC_LIBRARIES;
if no match is found, lib<library_name>.default will be used.

Bug: 10262105
Change-Id: Ic89d8d417d1dd65a227e4187a157fd3b77c4af34
 2013-08-13 13:48:04 -07:00
Ying Wang
9039db6171 am 4c3a82fa: am 2863fa7a: Merge "FDO: support linux-x86 target" 
* commit '4c3a82fa62f8bfd4b0553cbd21b439ff2502d639':
  FDO: support linux-x86 target
 2013-08-13 10:48:41 -07:00
Ying Wang
4c3a82fa62 am 2863fa7a: Merge "FDO: support linux-x86 target" 
* commit '2863fa7a9650fa6df38da61329e2f49d5233c3df':
  FDO: support linux-x86 target
 2013-08-13 10:45:05 -07:00
Bjorn Andersson
612e2cd0e8 mkbootimg: Support custom mkbootimg implementation 
Support using custom mkbootimg to allow boards to specify custom
boot image formats. Also export this as the environment variable
MKBOOTIMG to the *_from_target_files releasetools scripts.

Change-Id: I2084273b1175de097fb7da5c4f2264ea8014d74f
Signed-off-by: Bjorn Andersson <bjorn.andersson@sonymobile.com>
 2013-08-09 16:29:02 -07:00
synergydev
6ecf0ef744 FDO: support linux-x86 target 
Change-Id: I4a3a1d298176da109df316cf9128f19e77490bc9
 2013-08-09 22:41:46 +00:00
Ying Wang
5a7a10411c am ad7fd29b: Don\'t bother going through the source tree 
* commit 'ad7fd29b312bf588b2be3f799715f34ff8a6d46b':
  Don't bother going through the source tree
 2013-08-09 15:22:04 -07:00
Ying Wang
6d805753d9 am 01c17f03: am e58868ab: Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries" 
* commit '01c17f031286691abeb157cd26ac1785757f07f0':
  Link PRIVATE_TARGET_FDO_LIB before shared libraries
 2013-08-09 13:38:43 -07:00
Ying Wang
01c17f0312 am e58868ab: Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries" 
* commit 'e58868ab47fc044e9e7985c8357d83fee4df732a':
  Link PRIVATE_TARGET_FDO_LIB before shared libraries
 2013-08-09 13:36:25 -07:00
Ying Wang
e58868ab47 Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries" 2013-08-09 20:33:11 +00:00
Ying Wang
0790dcfd3b am 2e45116d: am 515e0465: Merge "FDO: do not support host modules" 
* commit '2e45116d3a9c1ab055dd7a6a93bb4ab79414c081':
  FDO: do not support host modules
 2013-08-09 12:47:16 -07:00
Ying Wang
2e45116d3a am 515e0465: Merge "FDO: do not support host modules" 
* commit '515e0465d169905e7e454207f3cbb2a57a033ae1':
  FDO: do not support host modules
 2013-08-09 12:45:00 -07:00
Ying Wang
ad7fd29b31 Don't bother going through the source tree 
Don't bother going through the source tree in more circumstances:
all cleaning goals, helping goals, no-deps goals.

Bug: 10244578
Change-Id: Id53a249085c62838e4193962a85e0ac34f46954f
 2013-08-09 10:08:30 -07:00
The Android Automerger
c618d4f100 Fix klp-dev build file 2013-08-08 07:47:58 -07:00
The Android Automerger
2a516ccce5 "KRS39B" 2013-08-08 07:39:23 -07:00
synergydev
cfdb24f1cb Link PRIVATE_TARGET_FDO_LIB before shared libraries 
For global declaration of FDO profile generation and usage,
we need to link PRIVATE_TARGET_FDO_LIB (libgcov.a by default)
prior to linking shared libraries.

TARGET_FDO_LIB is set if feedback directed optimizations
are in use, so we do not need to worry about consistent size
increases from this change.

Change-Id: I543903f58893816f037c9466f31b19dfe822fdf4
 2013-08-08 05:31:12 -07:00
Mike Lockwood
c73018c2e9 Fix typo from previous change to fix the build 
Change-Id: I6cf7217eb81abd794339143b7c23456b68808caf
 2013-08-06 16:15:48 -07:00
Mike Lockwood
6e5d867e30 Add support for overriding default Java libraries on a per-target basis 
Change-Id: I425041554867a7ed7d74e1d603f160b2110bc86b
 2013-08-06 15:07:18 -07:00
synergydev
4a60576029 FDO: do not support host modules 
Summary:
If built with BUILD_FDO_INSTRUMENT alone, host modules will fail at runtime (during build)
due to failing to create /data in most standard unix user permission cases. If the user does
have full permission to /, /data/profile/ will be created and profiles will be generated there.
Any file generation in the Android Build System should be kept to $OUT.

This commit fixes this bug.

Test Plan:
Build with BUILD_FDO_INSTRUMENT without additional configuration, and host modules will no longer generate profiles
at their runtime.
 2013-08-05 02:44:37 -07:00
Ying Wang
4a0929e359 am 38775140: am 08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev 
* commit '387751401ca83e4419444247a176f2ea1f35a50b':
  Remove unnecessary dependencies between host and target modules.
 2013-08-02 17:40:59 -07:00
Ying Wang
387751401c am 08c07c59: Merge "Remove unnecessary dependencies between host and target modules." into jb-mr2-dev 
* commit '08c07c590322e1cbc8464dd371a2e5120b88e38d':
  Remove unnecessary dependencies between host and target modules.
 2013-08-02 17:39:01 -07:00
Ying Wang
2c86e70705 Merge "Don't check build prebuilt modules." 2013-08-02 20:31:53 +00:00
Ying Wang
883071ff1f Don't check build prebuilt modules. 
Change-Id: I35bcd97cf41d1f6e0cdc2676a07127bff4f14e6d
 2013-08-02 13:30:54 -07:00
Ying Wang
ee9e88cf96 am a3827c4b: am 840f9d0a: Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt" 
* commit 'a3827c4b6c1a4c5a1618515ccb8fc6692837ee71':
  Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
 2013-08-02 11:07:44 -07:00
Ying Wang
a3827c4b6c am 840f9d0a: Merge "Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt" 
* commit '840f9d0a274cffbef790dc20cd4f9eec27c3841b':
  Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
 2013-08-02 11:05:23 -07:00
Brian Carlstrom
5c619fcb5f Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt 
Change-Id: I8be48114b43e46255977be1677b0c0bbccdf9163
 2013-08-01 23:31:19 -07:00
Ying Wang
3670c8449a Split the product-graph build commands 
1) As more product configuration files are added to the source tree, the
command line has become too long.
2) Escape "(" and ")" that may may appear in PRODUCT_MODEL.

Change-Id: I08f278dce434050f013498327c7cbf3592512460
 2013-08-01 17:45:35 -07:00
Ying Wang
949c4eb073 Delete the kernel file when build config is changed 
Now we have products of the same device type but with different kernel,
and we want to do incremental build on them.

Bug: 10133257
Change-Id: Iff4aae11e474d2822f02c62822bd028a5ba5b47a
 2013-08-01 15:46:25 -07:00
Ying Wang
16b92edc38 Remove unnecessary dependencies between host and target modules. 
With this change, modules introduced by LOCAL_REQUIRED_MODULES will be
split by host/target: target modules only depend on target modules and
host modules only depend on host modules.

Bug: 9303948
Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
 2013-07-31 20:00:45 -07:00
Ying Wang
a8ae7f787d Error and exit if BUILD_MULTI_PREBUILT is incorrectly used 
Bug: 10114476
Change-Id: Id51e7ca443c3742e17cbe114aefbb7ed3870b0e5
 2013-07-31 16:26:01 -07:00
Ying Wang
172f5f5746 More verbose on what the build system is doing 
Sometimes users get confused for long time of no message printed to the
screen.

Change-Id: I99d3b2954f3dcba47d5ee5dd9fd760578c0e0192
 2013-07-31 12:22:57 -07:00
Jean-Baptiste Queru
8a7cd65585 am 50a402af: am f1534b62: Merge "Added generic hook for loading vendor specific defintions" 
* commit '50a402af7ae550c96b9142ab56d3a23a8a8d22b1':
  Added generic hook for loading vendor specific defintions
 2013-07-30 10:28:17 -07:00
Jean-Baptiste Queru
50a402af7a am f1534b62: Merge "Added generic hook for loading vendor specific defintions" 
* commit 'f1534b6292a609bb5f55c4a617f3cd1054f90a81':
  Added generic hook for loading vendor specific defintions
 2013-07-30 07:33:53 -07:00
Ying Wang
54d9cc3fac am cd9cadbc: am 7768c91c: am 94de1eba: Put a copy of the radio/bootloader files in the dist dir. 
* commit 'cd9cadbcf68bfe07ac994e61aa00969572ae3fd5':
  Put a copy of the radio/bootloader files in the dist dir.
 2013-07-26 13:00:20 -07:00
Ying Wang
cd9cadbcf6 am 7768c91c: am 94de1eba: Put a copy of the radio/bootloader files in the dist dir. 
* commit '7768c91c1c90e7c13390396d895a3afd5fda3e0f':
  Put a copy of the radio/bootloader files in the dist dir.
 2013-07-26 12:57:19 -07:00
Ying Wang
7768c91c1c am 94de1eba: Put a copy of the radio/bootloader files in the dist dir. 
* commit '94de1eba0e87297421789b339c5f26bf3e48eeb1':
  Put a copy of the radio/bootloader files in the dist dir.
 2013-07-26 12:54:11 -07:00
Ying Wang
94de1eba0e Put a copy of the radio/bootloader files in the dist dir. 
Bug: 10035750
Change-Id: I3b51e61ec737899d9264885a1e66c89a7a740d54
 2013-07-26 12:19:20 -07:00
Marie Lennerhagen
9e5efceff9 Added generic hook for loading vendor specific defintions 
Change-Id: I6dec9c378ed0aabf9e60f8dcb05c6043bbcc30e5
 2013-07-26 18:12:36 +00:00
keunyoung
a219bdc0ba fix build 
- PDK_FUSION_OUT_DIR was null inside macro, lead into missing copy

bug: 10023069
Change-Id: I323d2fb6a2e955f9a7c27559701a7af36a89fea8
 2013-07-25 18:22:43 -07:00
Ying Wang
5efaa72ac1 am 51aab877: am 5d1db8b4: Merge "Allow proto builds to pass in java proto params." 
* commit '51aab8775ab86990abef411d00f5686e41022eee':
  Allow proto builds to pass in java proto params.
 2013-07-25 17:04:20 -07:00
Ying Wang
51aab8775a am 5d1db8b4: Merge "Allow proto builds to pass in java proto params." 
* commit '5d1db8b4335d554bfd7e028496f0305b78b0676b':
  Allow proto builds to pass in java proto params.
 2013-07-25 15:36:07 -07:00
Ying Wang
7661c1d6f1 Merge "Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH" 2013-07-25 22:09:32 +00:00
Ulas Kirazci
6e485b545a Allow proto builds to pass in java proto params. 
Change-Id: I65fe0cd96f818f59267da6159e6bd2ad28f07a11
 2013-07-25 13:40:53 -07:00
Ulas Kirazci
fcbc0b7f0b am 5094e33b: Merge "Revert "Allow proto builds to pass in java proto params."" 
* commit '5094e33bddc5bb7ba8c63b725078764450b16973':
  Revert "Allow proto builds to pass in java proto params."
 2013-07-25 13:35:27 -07:00
Ulas Kirazci
5094e33bdd Merge "Revert "Allow proto builds to pass in java proto params."" 2013-07-25 20:31:48 +00:00
Ulas Kirazci
24c7289d24 Revert "Allow proto builds to pass in java proto params." 
This reverts commit 28b46fc16c.

Change-Id: Iaca9fa749c6f460911cc46e08e6b3ae2555b8bcc
 2013-07-25 19:35:28 +00:00
Jean-Baptiste Queru
8959954976 am be581317: Merge "Change build id to OPENMASTER" 
* commit 'be5813170364c382ca2fbc6500d567065449473e':
  Change build id to OPENMASTER
 2013-07-25 09:07:19 -07:00
Chirayu Desai
0564d0ce33 Change build id to OPENMASTER 
Change-Id: Ib1b2ea0303619753dace8a776295ad4e1ceab096
 2013-07-25 21:26:32 +05:30
Ben Murdoch
fc2bad5c36 Revert "Allow proto builds to pass in java proto params." 
This reverts commit 28b46fc16c.

Speculative fix for master builds. I cannot repro the break the bots
are seeing locally, but it seems related to building protobufs and this
CL was in the first broken build.
 2013-07-25 11:44:53 +01:00
Ulas Kirazci
dd3d8f4ca9 am 6a5fc54f: am a825aa13: Merge "Allow proto builds to pass in java proto params." 
* commit '6a5fc54fe9904214a7df1d34c9d48ad0310d867e':
  Allow proto builds to pass in java proto params.
 2013-07-25 00:47:09 -07:00
Ying Wang
9352474dae am 6f9c87ed: am 45339b01: Merge "Use consistent search depth." 
* commit '6f9c87ede60c52a42b107fa5fb06e0f2f654ca9f':
  Use consistent search depth.
 2013-07-25 00:47:08 -07:00
Ulas Kirazci
6a5fc54fe9 am a825aa13: Merge "Allow proto builds to pass in java proto params." 
* commit 'a825aa1329cbf28e23a9f7d96dbbe16f3f7ef9db':
  Allow proto builds to pass in java proto params.
 2013-07-25 00:44:07 -07:00
Ying Wang
6f9c87ede6 am 45339b01: Merge "Use consistent search depth." 
* commit '45339b01d61586aa46c4ca98b37e320879fac050':
  Use consistent search depth.
 2013-07-25 00:44:07 -07:00
Ulas Kirazci
a825aa1329 Merge "Allow proto builds to pass in java proto params." 2013-07-25 03:04:10 +00:00
Ying Wang
45339b01d6 Merge "Use consistent search depth." 2013-07-25 01:54:44 +00:00
Ulas Kirazci
28b46fc16c Allow proto builds to pass in java proto params. 
Also source files which have dependencies need to be bundled together
(at least the way the build system is set up now). Move
--proto_path=$(TOP) to the end so that it does not take precedence
over user-supplied --proto_path flags.

Change-Id: Ia532647fe8811d39230a23ba3671685b0388cbe0
 2013-07-24 18:02:57 -07:00
Scott Main
c3faf216a4 am c5b665ad: am 0ce71df0: Merge "remove renderscript support lib from javadocs" into jb-mr2-ub-dev 
* commit 'c5b665addf7f6a6ca7225b8f75bf419ada2ce74c':
  remove renderscript support lib from javadocs
 2013-07-24 16:27:49 -07:00
Scott Main
c5b665addf am 0ce71df0: Merge "remove renderscript support lib from javadocs" into jb-mr2-ub-dev 
* commit '0ce71df0fccdb10c36823307fad7a71c7cd4d4d4':
  remove renderscript support lib from javadocs
 2013-07-24 16:20:04 -07:00
Ying Wang
0650d1503d Add PRODUCT_BOOT_JARS to derive BOOTCLASSPATH 
- BOOTCLASSPATH now is product-configurable;
- No need to maintain the duplicate values in core/dex_preopt.mk.
- clean up some legacy ALL_PREBUILTs.
Bug: 9990214

Change-Id: Ie3953e66d282e335bb7782b0ebd56102c35ec10e
 2013-07-24 15:15:55 -07:00
Keun-young Park
efc88c0596 Merge "Fix issue with DEBUG_OUT_DIR not properly selected" 2013-07-24 22:06:49 +00:00
Tom Cherry
60767620c3 Fix issue with DEBUG_OUT_DIR not properly selected 
- patch from NVDIA

bug: 9968564

Change-Id: I2082f989d75fb168fb42947d723de093beff4ff1
Reviewed-by: Dan Willemsen <dwillemsen@nvidia.com>
Reviewed-by: Thomas Cherry <tcherry@nvidia.com>
Reviewed-by: Simone Willett <swillett@nvidia.com>
 2013-07-24 13:55:56 -07:00
Scott Main
5b743677eb remove renderscript support lib from javadocs 
Change-Id: I6b06bdcdae79442dbf471816cd1cf6f90873f1b2
 2013-07-23 21:00:50 -07:00
Doug Zongker
1f790c9733 Merge "distinguish signed and unsigned user builds in UI" 2013-07-23 19:10:05 +00:00
Guilhem IMBERTON
58570e7d5e Use consistent search depth. 
AndroidProducts.mk allows for a maxdepth of 4 in device and vendor while
vendorsetup.sh and BoardConfig.mk only allow for smaller depth.

Make search depth consistent for these files.

Change-Id: I406770c1423d4f27fe097956a7c705a0da937e35
Signed-off-by: Beare, Bruce J <bruce.j.beare@intel.com>
Signed-off-by: Laurent Fert <laurent.fert@intel.com>
Signed-off-by: Guilhem Imberton <guilhem.imberton@intel.com>
Author: Laurent Fert <laurent.fert@intel.com>
 2013-07-23 21:02:15 +02:00
Doug Zongker
a8608a7f7c distinguish signed and unsigned user builds in UI 
Add "dev-keys" or "test-keys" to the value of ro.build.display.id for
user builds.  (This is the property that is displayed under "Build
number" in the Settings UI.)  Modify the signing script to remove the
keys tag from this value when signing.

Change-Id: I3d9d92056f8567d7f84b1be047619be7c6e4c419
 2013-07-23 11:51:04 -07:00
keunyoung
3939476ca0 Merge "add PDK_PLATFORM_ZIP_PRODUCT_BINARIES to allow adding product specific binaries to platform.zip" 2013-07-22 23:46:10 +00:00
keunyoung
c01780611a add PDK_PLATFORM_ZIP_PRODUCT_BINARIES to allow adding product specific binaries to platform.zip 
- This can be used to deliver stuffs like kernel symbol file.
- Files are added in relative path from the top of android source tree.
- PDK_PLATFORM_ZIP_PRODUCT_BINARIES will be defined in BoardConfig.mk.
- files under out dir will be rejected to prevent possible conflicts.

bug: 9963432
Change-Id: Id1da643534cd86939df4941f39e4414d343bba99
 2013-07-22 15:59:33 -07:00
Michael Runge
065ab7f0df Merge "Revert "Update OTA to understand SELinux filesystem labels"" 2013-07-22 21:57:00 +00:00
Michael Runge
fb9bb205fc Revert "Update OTA to understand SELinux filesystem labels" 
This reverts commit fbbd79530a.

All incremental auto OTAs broken b/9964074

Change-Id: I500d2ac194804abd20a0e01d9862fd42e8f5d2de
 2013-07-22 20:42:44 +00:00
Ying Wang
15cbe8e3d4 Add framework2 to the java pdk package. 
To fix pdk fusion build.

Change-Id: I5989f38e48614faa742f8362bde841fe084d9c13
 2013-07-19 14:37:25 -07:00
Nick Kralevich
f771d64bcb Merge "Update OTA to understand SELinux filesystem labels" 2013-07-18 22:25:59 +00:00
Jeff Brown
4e361bf692 Merge "Split framework jar." 2013-07-18 22:12:37 +00:00
Nick Kralevich
fbbd79530a Update OTA to understand SELinux filesystem labels 
Make fs_config aware of SELinux contexts, and output the context
whenever we output the UID / GID / file perms.

Pass the selinux context to the set_perm2() and set_perm2_recursive()
calls. When the OTA script fixes up filesystem permissions, it will
also fix up the SELinux context on the files.

Bug: 8985290
Change-Id: I6419b64c06309a93ac6b2f2cf9fc7f8815adeaf3
 2013-07-18 15:04:22 -07:00
Ying Wang
8bf79bb081 am 8bb3306b: am a1f8cdf7: Merge "Allow several system property files" 
* commit '8bb3306b76bf3a20fc0f0634a492c5c18550c8e3':
  Allow several system property files
 2013-07-18 10:07:09 -07:00
Ying Wang
8bb3306b76 am a1f8cdf7: Merge "Allow several system property files" 
* commit 'a1f8cdf74bcc35110bd306d633e019a6279fc7fe':
  Allow several system property files
 2013-07-18 10:02:45 -07:00
Jeff Brown
ae859f9b64 Split framework jar. 
Change-Id: I38c68ac169a4ea10e4640b5d8e24298a6caaf441
 2013-07-17 21:08:18 -07:00
Johan Redestig
674a27ddaf Allow several system property files 
TARGET_SYSTEM_PROP now is a list of files and all of them
are included in the build.prop.

Change-Id: I494f86412b0a299ee4c066e49ab4f4686bc2178a
 2013-07-16 15:15:16 +02:00
Brian Carlstrom
8abff76d8f Add LOCAL_ADDITIONAL_DEPENDENCIES support to BUILD_PHONY_PACKAGE 
Change-Id: I0211600ebb554b55f3823a4cb3d119b95cb49733
 2013-07-15 16:44:26 -07:00
Ying Wang
6e9151b1a7 am 988251c9: Fix error. 
* commit '988251c92269676c891dcb548fecdc100755b431':
  Fix $(so_suffix) error.
 2013-07-15 09:01:59 -07:00
Ying Wang
988251c922 Fix $(so_suffix) error. 
Change-Id: I32cb4d4efe0a473e67a54c035df4dd82b6e4a3f0
(cherry picked from commit 80b71fa326)
 2013-07-15 15:57:25 +00:00
Ying Wang
80b71fa326 Fix $(so_suffix) error. 
Change-Id: I32cb4d4efe0a473e67a54c035df4dd82b6e4a3f0
 2013-07-15 08:47:33 -07:00
Ying Wang
3aa8eb6810 am ba9636d4: Establish the built module dependencies on prebuilt shared library 
* commit 'ba9636d47fdc91c4caca6c9e0ad618956ddbb98b':
  Establish the built module dependencies on prebuilt shared library
 2013-07-12 22:34:46 -07:00
Ying Wang
ba9636d47f Establish the built module dependencies on prebuilt shared library 
This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.

Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
(cherry picked from commit ada8f29657)
 2013-07-13 05:31:11 +00:00
Ying Wang
ada8f29657 Establish the built module dependencies on prebuilt shared library 
This is needed because the linker command line uses -rpath-link with
built module path ($(*_OUT_INTERMEDIATE_LIBRARIES)) to search for indirect
dependency libraries.

Change-Id: I21d537c7c697dfb18df25d3d2bb7bffe2f9d370f
 2013-07-12 22:05:14 -07:00
JP Abgrall
1390cac3ce core: don't hardcode "out" during findleaves.py invocations. 
"out" can be $OUT_DIR

Bug: 7183057
Change-Id: I7b52d40de4398f481e47f6d6d719fb550d874f73
 2013-07-11 19:08:06 -07:00
Jeff Brown
85fe0c5446 am 9d80f708: am a3d60ae8: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev 
* commit '9d80f7085707abd8f088c4f0c4d66cd666a6feb0':
  Revert "Remove mediarouter v7 support library from SDK."
 2013-07-11 10:17:00 -07:00
Ying Wang
fd30db5f29 Merge "Bring in runtime-specific product variables in a more general way." 2013-07-11 01:23:29 +00:00
Ying Wang
22ef79850e Bring in runtime-specific product variables in a more general way. 
Change-Id: Ibd0e0e8e3e0ca6afd125db8035ce08a7399b7547
 2013-07-10 18:14:40 -07:00
Ying Wang
6238cd9185 Demultiplex the coretests description rules 
Previously for each target generate-core-test-description will be called
6 times that end in 6x6 calls of the function.
That's unnecessary and unsafe.

Change-Id: I03eef89b61c552b5f47f0a478feb9687fd9717da
 2013-07-10 16:58:52 -07:00
Ying Wang
51a1ae1d24 Clean up files' dependencies on phony targets. 
Module names are phony targets, which make always sees as obsolete,
so a nothing-to-do build won't do nothing.
Also file target $(DEFAULT_TEST_PLAN) was never created in its rule.
Here it's fixed with a stamp file.

Bug:9761012
Change-Id: Ic82df70cc22643d902017b5bec1022404d9bbfce
 2013-07-10 11:33:27 -07:00
Jeff Brown
9d80f70857 am a3d60ae8: Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev 
* commit 'a3d60ae86f112388c27b4a164f269efd5f6d1c72':
  Revert "Remove mediarouter v7 support library from SDK."
 2013-07-09 16:48:17 -07:00
Jeff Brown
a3d60ae86f Merge "Revert "Remove mediarouter v7 support library from SDK."" into jb-mr2-dev 2013-07-09 23:44:41 +00:00
Jeff Brown
9977ddf0cd Revert "Remove mediarouter v7 support library from SDK." 
This reverts commit 0eacd936b7.

Bug: 9425325
Change-Id: Idf81e6721fb4361a38ffd73d39c574c2cb2b1155
 2013-07-09 00:35:00 +00:00
Ying Wang
f755fa0d8c am d235ed2a: Respect DISABLE_PROGUARD 
* commit 'd235ed2afb29101cc3e03e7bb692637ad67b48ad':
  Respect DISABLE_PROGUARD
 2013-06-28 13:43:25 -07:00
Ying Wang
d235ed2afb Respect DISABLE_PROGUARD 
The flag is only used by unbundled build currently.

Change-Id: I8e9bab69dd7accae52ec8cdd627fc4e24178a790
 2013-06-28 13:37:27 -07:00
Brian Carlstrom
1aeee8bb66 Move from WITH_ART to PRODUCT_RUNTIMES 
Change-Id: I3a9217b4aafc1f59d095169deb9eaeae17320505
 2013-06-27 16:49:15 -07:00
Ying Wang
fcec57a116 Allow to run checkbuild in sdk build. 
Bug: 9594464
Change-Id: Ia02e7d8fc157cdfe2e065ce9e42a3800457f89f6
 2013-06-26 18:00:17 -07:00
Ying Wang
4c4b6b2a0b am f84bf8d0: Fix use of LOCAL_CLASSPATH in droiddoc.mk 
* commit 'f84bf8d0ca954e7a0768cb5c0d1024fa26a72756':
  Fix use of LOCAL_CLASSPATH in droiddoc.mk
 2013-06-25 14:13:09 -07:00
Ying Wang
f84bf8d0ca Fix use of LOCAL_CLASSPATH in droiddoc.mk 
Remove the unnecessary use of LOCAL_STATIC_JAVA_LIBRARIES.
You should use LOCAL_JAVA_LIBRARIES in that case.

Change-Id: I0b51b5b22530722e48193e5b4e964e8835f193af
(cherry picked from commit 8578cab066)
 2013-06-25 21:05:11 +00:00
Ying Wang
8578cab066 Fix use of LOCAL_CLASSPATH in droiddoc.mk 
Remove the unnecessary use of LOCAL_STATIC_JAVA_LIBRARIES.
You should use LOCAL_JAVA_LIBRARIES in that case.

Change-Id: I0b51b5b22530722e48193e5b4e964e8835f193af
 2013-06-25 12:34:11 -07:00
Ying Wang
10e41c3275 am c012edbc: am 42aaacf1: am a90d7eb6: Merge "Do not use -msynci flag for Xburst 4780 cores" 
* commit 'c012edbc519b74456530c26719133f96d4574de3':
  Do not use -msynci flag for Xburst 4780 cores
 2013-06-21 10:44:47 -07:00
Ying Wang
c012edbc51 am 42aaacf1: am a90d7eb6: Merge "Do not use -msynci flag for Xburst 4780 cores" 
* commit '42aaacf183b0ee7af989d2fce1d8b29401dfb61a':
  Do not use -msynci flag for Xburst 4780 cores
 2013-06-21 10:42:32 -07:00
Ying Wang
42aaacf183 am a90d7eb6: Merge "Do not use -msynci flag for Xburst 4780 cores" 
* commit 'a90d7eb64fc3155c6558d9c307e0bc4a2d84dff9':
  Do not use -msynci flag for Xburst 4780 cores
 2013-06-21 10:37:38 -07:00
Raghu Gandham
6faf71647a Do not use -msynci flag for Xburst 4780 cores 
synci does not provide coherency between CPU's on this device

Change-Id: I10e73fa49859e55d018884c6682b5a00b887e0a1
Signed-off-by: Chris Dearman <chris.dearman@imgtec.com>
 2013-06-20 13:29:49 -07:00
Jeff Brown
c39063df9b am bd1c3a21: am 0eacd936: Remove mediarouter v7 support library from SDK. 
* commit 'bd1c3a2112d023e9f0aab115c64ba345c666ebe5':
  Remove mediarouter v7 support library from SDK.
 2013-06-14 16:43:23 -07:00
Jeff Brown
bd1c3a2112 am 0eacd936: Remove mediarouter v7 support library from SDK. 
* commit '0eacd936b7d6dabd380ecd6f1d25d39625b37495':
  Remove mediarouter v7 support library from SDK.
 2013-06-14 16:42:09 -07:00
Jeff Brown
0eacd936b7 Remove mediarouter v7 support library from SDK. 
Bug: 9425325
Change-Id: Iba64455cf8bcf4892ff9bf10628e7b5272787a1e
 2013-06-14 15:46:29 -07:00
Mike Lockwood
051a1740eb Add support for WITHOUT_CLANG 
Change-Id: I12e776e44c69649bca34c35eff2ee7c75cfe62cd
 2013-06-14 10:52:50 -07:00
Ying Wang
951e0f1e8d am fe365531: am 1e1241ce: Dist static Java library modules. 
* commit 'fe365531b0ee363640fb50d5a230c0b999fbbe4d':
  Dist static Java library modules.
 2013-06-12 15:41:57 -07:00
Ying Wang
fe365531b0 am 1e1241ce: Dist static Java library modules. 
* commit '1e1241ce3d4259bcc4a0039ed68fc5b3fc8069b5':
  Dist static Java library modules.
 2013-06-12 15:38:05 -07:00
Ying Wang
1e1241ce3d Dist static Java library modules. 
With this change, we can build and dist static jar files, as well as
apks.

Bug: 9386024
Change-Id: Iab4660d8dfd7a2d164714a2124445de298075901
 2013-06-12 15:29:38 -07:00
Ying Wang
8f5868057c am 38cdd442: Tweak proguard flags in the 2 files. 
* commit '38cdd4429f23d9a0d27a6d8cfe318c29b604afbf':
  Tweak proguard flags in the 2 files.
 2013-06-12 11:09:33 -07:00
Ying Wang
38cdd4429f Tweak proguard flags in the 2 files. 
So all most commonly-used flags go to proguard_basic_keeps.flags
and they will still be applied when LOCAL_PROGUARD_ENABLED=nosystem.
Bug: 9203442

Change-Id: If018076dc625ac1efe31898b179dbba850218aaf
 2013-06-12 11:04:49 -07:00
Torne (Richard Coles)
4297ce7d0e Merge "Add webviewchromium to the preopt jar list." 2013-06-11 13:13:45 +00:00
Ying Wang
d72db32f84 Remove unnecessary dependencies between host and target modules. 
With this change, modules introduced by LOCAL_REQUIRED_MODULES will be
split by host/target: target modules only depend on target modules and
host modules only depend on host modules.

Bug: 9303948
Change-Id: I4078a7983aa3c00e99534f3f170dfe4b66b12287
 2013-06-06 18:05:53 -07:00
Torne (Richard Coles)
ef5d599600 Add webviewchromium to the preopt jar list. 
The default BOOTCLASSPATH now includes webviewchromium.jar, so also add
it to the dex_preopt list.

Change-Id: I67b87cb0bf997c74596c276314a5196f8cf0d1b4
 2013-06-06 14:57:42 +01:00
Torne (Richard Coles)
d919c7a314 Add proper deps for jarjar rules files. 
Changes to the jarjar rules file for a module were not causing
rebuilds; add the missing dependency.

Change-Id: Ib78fa708681cbc414218fe84cc2c4282c619f45f
 2013-06-05 14:25:47 +01:00
Ying Wang
8216f3228f Merge "Tweak proguard flags in the 2 files." 2013-05-31 15:24:56 +00:00
Stephen Hines
1e18897689 am 6c380fe5: am 1dd9f19e: Merge "add renderscript to support library javadocs" into jb-mr2-dev 
* commit '6c380fe5da492c526f81c894a069e63ab62613de':
  add renderscript to support library javadocs
 2013-05-30 15:34:00 -07:00
Stephen Hines
6c380fe5da am 1dd9f19e: Merge "add renderscript to support library javadocs" into jb-mr2-dev 
* commit '1dd9f19e8f020e691f08361668a1132181c267c5':
  add renderscript to support library javadocs
 2013-05-30 14:14:29 -07:00
Ying Wang
1b28087a58 Tweak proguard flags in the 2 files. 
So all most commonly-used flags go to proguard_basic_keeps.flags
and they will still be applied when LOCAL_PROGUARD_ENABLED=nosystem.
Bug: 9203442

Change-Id: If018076dc625ac1efe31898b179dbba850218aaf
 2013-05-30 10:45:46 -07:00
Scott Main
af44e90b19 add renderscript to support library javadocs 
Bug: 9188088

Change-Id: I7c34a99b73dc01c78174e5b93e5a5d3085ff81ff
 2013-05-29 18:42:54 +00:00
Ying Wang
bba6263203 Enable Proguard for eng build too. 
With this change, all build variants are now with Proguard enabled,
unless you explicitly set DISABLE_PROGUARD to true.

Change-Id: I0f9b566b5ab3c3d961ffd6ab696e573bc59553b0
 2013-05-23 10:26:49 -07:00
Brian Carlstrom
6901768e36 Add WITH_ART 
(cherry picked from commit 6b7a0d2f1ff90d24e3ade9ccf82a084f5f999c1f)

Change-Id: If6e208f9fc859f31da2cd71fdc1ddbe1fc1ed7aa
 2013-05-22 10:49:57 -07:00
Ying Wang
a25b9b83bf am 210aee35: am fa29872a: Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs." 
* commit '210aee35a9dec3b94ab0cfc247e6c89c1e387f19':
  [MIPS] Disabled madd support for Ingenic Xburst CPUs.
 2013-05-21 12:31:57 -07:00
Ying Wang
210aee35a9 am fa29872a: Merge "[MIPS] Disabled madd support for Ingenic Xburst CPUs." 
* commit 'fa29872ae08408f90e1282bff36a0bdba13d0fdc':
  [MIPS] Disabled madd support for Ingenic Xburst CPUs.
 2013-05-21 12:25:39 -07:00
Pete Delaney
90ce453470 [MIPS] Disabled madd support for Ingenic Xburst CPUs. 
1. Added xburst ARCH_VARIANT file 'mips32r2-fp-xburst.mk'.
   a) Added -mno-fused-madd GCC option.

2. Removing -mno-fused-madd GCC option for LLVM.


Change-Id: I947a74eb89c05ae321417533c3c40241abc6f965
Signed-off-by: Pete Delaney <piet.delaney@imgtec.com>
 2013-05-20 15:27:20 -07:00
Jean-Baptiste Queru
64dbf369a8 Fake version number for AOSP master - do not merge 
Change-Id: Ib605660f5baabf791bbbefb5d73dbe90e85ad51d
 2013-05-20 09:50:39 -07:00
Ying Wang
a34a0030b8 am 82574cb1: am 57453519: Split out proguard_basic_keeps.flags 
* commit '82574cb101d34981bccd56513059b3d0bd3267a0':
  Split out proguard_basic_keeps.flags
 2013-05-17 10:35:48 -07:00
Ying Wang
82574cb101 am 57453519: Split out proguard_basic_keeps.flags 
* commit '57453519084feb13f8a2c00b6985b32427a06b5a':
  Split out proguard_basic_keeps.flags
 2013-05-17 10:33:11 -07:00
Ying Wang
5745351908 Split out proguard_basic_keeps.flags 
For 'LOCAL_PROGUARD_ENABLED := nosystem' we still include
proguard_basic_keeps.flags.

Change-Id: I43ee7e98d2aaeb84879441f90ab6839c0e8f4e65
 2013-05-17 10:02:00 -07:00
Rom Lemarchand
8805930b6f core: combo: arm: add cortex-a8 target 
Change-Id: I83e409dd048762acbd2e2dec9b0095933141cff0
 2013-05-14 20:16:16 -07:00
Brian Carlstrom
7358390697 Merge "add a fake data target." 2013-05-14 20:42:53 +00:00
Tim Murray
311605bc2e am 5861448a: am 205aaf16: Merge "Don\'t build librs.*.so in bundled branches since we\'ll use native RS." into jb-mr2-dev 
* commit '5861448a2d85cbfdc814621095889978060dd0de':
  Don't build librs.*.so in bundled branches since we'll use native RS.
 2013-05-14 12:49:22 -07:00
Tim Murray
5861448a2d am 205aaf16: Merge "Don\'t build librs.*.so in bundled branches since we\'ll use native RS." into jb-mr2-dev 
* commit '205aaf16e77edbdb4ea4a2f2edcc6d6a6b6f9c4c':
  Don't build librs.*.so in bundled branches since we'll use native RS.
 2013-05-14 12:46:08 -07:00
Tsu Chiang Chuang
40da8832c9 add a fake data target. 
(cherry picked from commit 3ba7baf14875d3cd360006be7dffe7e4e0cf1882)

Change-Id: I691d4dda65437d3f57e77ed207da406fd1f53355
 2013-05-14 10:58:26 -07:00
Tim Murray
8e0567ae77 Don't build librs.*.so in bundled branches since we'll use native RS. 
bug 8939828

Change-Id: I3f991ad7b6b1590063a9048326fd95edc483af13
 2013-05-13 15:46:37 -07:00
Ying Wang
5338fbfaca Install to TARGET_OUT_APPS_PRIVILEGED if LOCAL_PRIVILEGED_MODULE is true 
Change-Id: I268b8652f18034aa3fdd3126ebf6196f78c4bbb2
 2013-05-08 15:49:08 -07:00
Ying Wang
560f7099a8 am a1c0206c: am 0eb35626: Add extra libgcc.a only for unbundled build. 
* commit 'a1c0206c31e9373e712792a62bc07f609822bca9':
  Add extra libgcc.a only for unbundled build.
 2013-05-06 12:20:30 -07:00
Ying Wang
a1c0206c31 am 0eb35626: Add extra libgcc.a only for unbundled build. 
* commit '0eb35626da3e16d8db7756913433ee37f7ec2f49':
  Add extra libgcc.a only for unbundled build.
 2013-05-06 11:10:54 -07:00
Igor Murashkin
7e6362cc37 am b71b2905: Merge "DO NOT MERGE: Change build id to JB_MR2" into jb-mr2-dev 
* commit 'b71b290587a1c64c89745fa730bcbb0c4d69f6cc':
  DO NOT MERGE: Change build id to JB_MR2
 2013-05-06 08:44:42 -07:00
Ying Wang
0eb35626da Add extra libgcc.a only for unbundled build. 
We can save some space for platform build with this.
Previously an extra libgcc.a was put before libc.so so libraries built
against new platform can run on old platforms. This is needed only for
unbundled build.

Bug: 8805022
Bug: 8247455

Change-Id: I3c3e0092b06ec3804659d5cae048d29e0d2bf7ad
 2013-05-03 14:38:36 -07:00
Igor Murashkin
b71b290587 Merge "DO NOT MERGE: Change build id to JB_MR2" into jb-mr2-dev 2013-05-03 20:18:58 +00:00
Igor Murashkin
3095dd7737 DO NOT MERGE: Change build id to JB_MR2 
Change-Id: I5c87f83e53ca534e816083a639c6798deb1d93f2
 2013-05-03 12:18:07 -07:00
Torne (Richard Coles)
273bb05358 am 10dca3c4: am 278bbf12: Don\'t concatenate the NOTICE file for a single module. 
* commit '10dca3c41111f362fcd6acb519b45847817f75c9':
  Don't concatenate the NOTICE file for a single module.
 2013-04-30 16:49:59 -07:00
Torne (Richard Coles)
10dca3c411 am 278bbf12: Don\'t concatenate the NOTICE file for a single module. 
* commit '278bbf126321304e125c8226b0cb8b51f25f3f0e':
  Don't concatenate the NOTICE file for a single module.
 2013-04-30 16:42:46 -07:00
Dianne Hackborn
8def4f37cf Merge "Bump up to API 18 to match jbmr2." 2013-04-30 22:06:59 +00:00
Dianne Hackborn
6198be83d8 Bump up to API 18 to match jbmr2. 
Change-Id: I84755411b6688edc373a8fbd44af0dbc8e89d2ac
 2013-04-30 14:47:15 -07:00
Kenny Root
47c185d724 am dfaf3843: Track change to JSSE provider 
* commit 'dfaf384309d523a30bedcb9fe6da1074bafbe990':
  Track change to JSSE provider
 2013-04-30 09:01:43 -07:00
Nick Kralevich
633b992042 am 3d660f2a: am 042723c0: Merge "x86/mips: enable _FORTIFY_SOURCE=2" 
* commit '3d660f2a7c8a69a33825cb05ffe8667c99138000':
  x86/mips: enable _FORTIFY_SOURCE=2
 2013-04-30 08:53:59 -07:00
Torne (Richard Coles)
278bbf1263 Don't concatenate the NOTICE file for a single module. 
When the NOTICE file for a module changed, the new NOTICE was being
concatenated onto the end of the old one in non-clean builds, taking up
more and more space and presumably duplicating most of the content. Only
one set of rules for a given file can exist in make, so there cannot be
a case where more than one $(notice_file) was intentionally being
concatenated together as this would be an error.

Change-Id: I0f5fae498225eaee5cc75d854223b5ba790fcebe
 2013-04-30 16:26:58 +01:00
Kenny Root
b4314f1534 Merge "Track change to JSSE provider" 2013-04-30 04:02:20 +00:00
Mike Lockwood
fe1a83cbc0 Remove obsolete OMA-DRM support 
Change-Id: Ie460730f3ec42e2208e4df685250f7b95a77b4c7
 2013-04-29 16:11:00 -07:00
Kenny Root
dfaf384309 Track change to JSSE provider 
Change-Id: I130b137f8ba62a3cf1b915dcf6a0cf3dc25043eb
 2013-04-29 15:58:54 -07:00
Kenny Root
13611990f6 Track change to JSSE provider 
Change-Id: I130b137f8ba62a3cf1b915dcf6a0cf3dc25043eb
 2013-04-29 14:58:54 -07:00
Nick Kralevich
3d660f2a7c am 042723c0: Merge "x86/mips: enable _FORTIFY_SOURCE=2" 
* commit '042723c0151980fee315678736751f7385977d90':
  x86/mips: enable _FORTIFY_SOURCE=2
 2013-04-29 14:12:50 -07:00
Nick Kralevich
fb45baa7e7 x86/mips: enable _FORTIFY_SOURCE=2 
Enable _FORTIFY_SOURCE=2 for x86 and MIPS.

Currently, this change is a no-op, as Android's libc doesn't
support _FORTIFY_SOURCE > 1, yet.

The ARM change was made in 316f720b91

Change-Id: Iafe90beadf9b6a41ea294b7107cf4f18141acf3a
 2013-04-29 12:41:53 -07:00
Jeff Brown
ff9c15e6b7 am 96cea40f: am 9d461e30: Merge "Add v7 support libs to path map." into jb-mr2-dev 
* commit '96cea40fce3939716cfcf1bc8aaeddd99fa396ac':
  Add v7 support libs to path map.
 2013-04-26 11:34:58 -07:00
Jeff Brown
96cea40fce am 9d461e30: Merge "Add v7 support libs to path map." into jb-mr2-dev 
* commit '9d461e3080375a701c61b29d1901928e7272f4df':
  Add v7 support libs to path map.
 2013-04-26 11:32:59 -07:00
Jeff Brown
9d461e3080 Merge "Add v7 support libs to path map." into jb-mr2-dev 2013-04-26 18:31:05 +00:00
Ying Wang
2777c6f182 am c665ece6: am 2dc245b9: Clean yacc version check 
* commit 'c665ece64a489f855749afa6e3266a9368cc8086':
  Clean yacc version check
 2013-04-26 11:18:08 -07:00
Ying Wang
c665ece64a am 2dc245b9: Clean yacc version check 
* commit '2dc245b9cb1a3ef52d38d704776fe3a9942b6af1':
  Clean yacc version check
 2013-04-26 11:16:09 -07:00
Ying Wang
2dc245b9cb Clean yacc version check 
We don't rely on host preinstalled bison/yacc now.

Change-Id: Iac0a7f1c12fe9d33baa53e48297ecb41ad89792d
 2013-04-26 11:13:22 -07:00
Jeff Brown
fcf2a11387 Add v7 support libs to path map. 
This is necessary to ensure that we correctly generate
documentation for these packages.

Bug: 8175766
Change-Id: Ia1c359c744d68f9b9423fd0e9df5516890792936
 2013-04-26 00:20:17 -07:00
Nick Kralevich
d6ca1e46c8 am 1d7bebca: am 835816ae: Merge "arm: upgrade to _FORTIFY_SOURCE=2" 
* commit '1d7bebca7e09e282828fe99baab76c738bde7cd2':
  arm: upgrade to _FORTIFY_SOURCE=2
 2013-04-25 21:26:46 -07:00
Nick Kralevich
1d7bebca7e am 835816ae: Merge "arm: upgrade to _FORTIFY_SOURCE=2" 
* commit '835816ae9eb9de2ae7b75e2318d5eba596f1275c':
  arm: upgrade to _FORTIFY_SOURCE=2
 2013-04-25 21:22:26 -07:00
Nick Kralevich
316f720b91 arm: upgrade to _FORTIFY_SOURCE=2 
Enable _FORTIFY_SOURCE=2 for ARM.

Currently, this change is a no-op, as Android's libc doesn't
support _FORTIFY_SOURCE > 1, yet.

Change-Id: Ib4c8e44e6949a37352c153e3c52a4fa001f18738
 2013-04-25 16:52:02 -07:00
Matthew Xie
f012cfe792 am e78c0b8c: am b1f10133: Remove DBUS from make files 
* commit 'e78c0b8c359910815171ee61952ddeff834699f1':
  Remove DBUS from make files
 2013-04-24 14:24:30 -07:00
Matthew Xie
e78c0b8c35 am b1f10133: Remove DBUS from make files 
* commit 'b1f1013321e1f64fd43a3e9fa008ac38845b773f':
  Remove DBUS from make files
 2013-04-24 14:21:52 -07:00
Matthew Xie
b1f1013321 Remove DBUS from make files 
DBUS had been needed by bluetooth bluz stack. It is not needed after
we replaced bluez stack with bluedroid stack.
bug 6872904

Change-Id: I952624e61c1e570c7e8d5a23937ab93a173d135c
 2013-04-23 14:01:23 -07:00
Dianne Hackborn
6007ddadc9 am 3bad5540: Here lies JB MR2: In with a whimper, out with a bang. 
* commit '3bad5540018f191ce61ce8c8df4e096275044d14':
  Here lies JB MR2: In with a whimper, out with a bang.
 2013-04-23 03:51:38 -07:00
Dianne Hackborn
3bad554001 Here lies JB MR2: In with a whimper, out with a bang. 
Change-Id: Id75e084b8447234cf5d2c26ccd0e13111dde6684
 2013-04-22 13:07:44 -07:00
Ying Wang
9c27153999 am c5cd2c6d: am b1578404: Merge "Fix /system/app/.odex not updated issue" 
* commit 'c5cd2c6ddb9cfdb7938c46362682fc41fd2e9ab1':
  Fix /system/app/$app.odex not updated issue
 2013-04-17 10:43:46 -07:00
Ying Wang
c5cd2c6ddb am b1578404: Merge "Fix /system/app/.odex not updated issue" 
* commit 'b1578404624f2369bb92a1e69c02f2ef15372002':
  Fix /system/app/$app.odex not updated issue
 2013-04-17 10:30:42 -07:00
Chih-Wei Huang
868e0c5a00 Fix /system/app/$app.odex not updated issue 
$(built_odex) depends on $(LOCAL_BUILT_MODULE) but doesn't have any build
recipe. It is built by the rules of $(LOCAL_BUILT_MODULE) that results in
a subtle bug: $(built_odex) is always newer than $(LOCAL_BUILT_MODULE)
if $(LOCAL_BUILT_MODULE) rebuilt. Therefore 'make' thinks the targets
(/system/app/$app.odex) depending on $(built_odex) don't need to be updated.
It seems an allegedly optimization bug of 'make'.

The simple fix is to explicitly add $(LOCAL_BUILT_MODULE) as a dependency
of $(installed_odex).
 2013-04-17 16:00:40 +08:00
Ying Wang
237770761f am 8150cfcb: am 9592af96: Merge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES" into jb-mr2-dev 
* commit '8150cfcb209dfb6ad86413cf3d4373d074f54062':
  Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES
 2013-04-16 09:02:55 -07:00
Ying Wang
8150cfcb20 am 9592af96: Merge "Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES" into jb-mr2-dev 
* commit '9592af96a7ab330b537a4d65474177805bba2ac1':
  Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES
 2013-04-16 09:01:11 -07:00
Ying Wang
d6b1d61d84 Do vendor check on modules installed by LOCAL_SHARED_LIBRARIES 
Since commit 6c86a1 we have split LOCAL_SHARED_LIBRARIES out of
LOCAL_REQUIRED_MODULES and the vendor check does no longer cover the
installed modules introduced by LOCAL_SHARED_LIBRARIES.
This change brings back the coverage.

Change-Id: Ie78692e48f173a3350792eb2fee8127ff9433caa
 2013-04-15 17:41:55 -07:00
Ying Wang
b036e955fc Allow to set BUILD_EMULATOR outside the core build system. 
For example, you can set it as enviromental variable, command line
makefile variable, or board config variable.

Change-Id: I5a4dbb70270cb4952109b5d96fbbf61eb2603502
 2013-04-12 14:14:36 -07:00
Ying Wang
47290a238f am f59e2624: am 14ae6e87: Merge "Get rid of the liblog hack." into jb-mr2-dev 
* commit 'f59e2624b33a428bbe484168ac4f96ca36a6c32e':
  Get rid of the liblog hack.
 2013-04-11 16:03:48 -07:00
Ying Wang
f59e2624b3 am 14ae6e87: Merge "Get rid of the liblog hack." into jb-mr2-dev 
* commit '14ae6e87c9822018e7fc139f66e60b4db6b08edb':
  Get rid of the liblog hack.
 2013-04-11 16:00:58 -07:00
Ying Wang
14ae6e87c9 Merge "Get rid of the liblog hack." into jb-mr2-dev 2013-04-11 22:56:20 +00:00
Ying Wang
f5a9d4f119 am c9bdff96: am 3e556091: Support to dist unbundled files for bundled build 
* commit 'c9bdff96ca4270cc6f626298b05e13f92ad00551':
  Support to dist unbundled files for bundled build
 2013-04-10 22:12:53 -07:00
Ying Wang
c9bdff96ca am 3e556091: Support to dist unbundled files for bundled build 
* commit '3e55609134381cadfc3b69657a5598dc3d8f2e35':
  Support to dist unbundled files for bundled build
 2013-04-10 22:09:47 -07:00
Ying Wang
3e55609134 Support to dist unbundled files for bundled build 
Usage:
LOCAL_DIST_BUNDLED_BINARIES := true
The dist files will include the jni shared libraries and the apk with
jni libraries stripped.

Bug: 8181626
Change-Id: I4a047d786ad35b948b4ad7a51adf37321dbe395c
 2013-04-10 22:06:02 -07:00
Ying Wang
fea1ffeff3 Get rid of the liblog hack. 
Bug: 8580410
Change-Id: I3ece860673eb52a2db1421db4492c9b1807dda6e
 2013-04-10 17:34:57 -07:00
Ying Wang
6ddac1fbff am a752c965: am c04a8282: Revert "Get rid of the liblog hack." 
* commit 'a752c965fe5d77ae6488a39685269db757dbf4f7':
  Revert "Get rid of the liblog hack."
 2013-04-10 15:16:51 -07:00
Ying Wang
a752c965fe am c04a8282: Revert "Get rid of the liblog hack." 
* commit 'c04a8282229b624eb3aff506fb72e5fcf27b258f':
  Revert "Get rid of the liblog hack."
 2013-04-10 15:14:23 -07:00
Ying Wang
c04a828222 Revert "Get rid of the liblog hack." 
This reverts commit 7636578729

Change-Id: I32f2acce5f99cb97eae986dfeba6d5d25378aefa
 2013-04-10 22:11:43 +00:00
Ying Wang
c8b5d4b207 am 43d5f927: am 76365787: Get rid of the liblog hack. 
* commit '43d5f927c1c8f7f1a7fad431560044565b5415b9':
  Get rid of the liblog hack.
 2013-04-10 10:13:08 -07:00
Ying Wang
43d5f927c1 am 76365787: Get rid of the liblog hack. 
* commit '7636578729ffcd02bfb5158db884f559a52d8905':
  Get rid of the liblog hack.
 2013-04-10 10:09:06 -07:00
Ying Wang
7636578729 Get rid of the liblog hack. 
Bug: 8580410
Change-Id: I4b437d10522ee66c7883faacfaf7e30abede394c
 2013-04-09 23:27:57 -07:00
Ying Wang
0efc226aac am bbb058ab: am fd068148: Merge "Revert "Add liblog"" into jb-mr2-dev 
* commit 'bbb058abc5e4870d09ed795a11a81576c20337f5':
  Revert "Add liblog"
 2013-04-09 23:25:30 -07:00
Ying Wang
bbb058abc5 am fd068148: Merge "Revert "Add liblog"" into jb-mr2-dev 
* commit 'fd068148d64cabd318a7d426840c5127f7a91160':
  Revert "Add liblog"
 2013-04-09 22:37:04 -07:00
Ying Wang
cd3190a9f5 Revert "Add liblog" 
This reverts commit 8722580d90

Change-Id: Iafdbb7f540a53ddc9dc2e21c0afddb62c44c4af8
 2013-04-10 05:32:21 +00:00
Ying Wang
30b2f529e9 am c54a1845: am 134ec88c: Merge "Add liblog" into jb-mr2-dev 
* commit 'c54a184547994f698a7b24d98bb3d46577e4ccce':
  Add liblog
 2013-04-09 22:25:07 -07:00
Ying Wang
c54a184547 am 134ec88c: Merge "Add liblog" into jb-mr2-dev 
* commit '134ec88c943ad0453d5716edceacca46a621e026':
  Add liblog
 2013-04-09 22:17:07 -07:00
Ying Wang
8722580d90 Add liblog 
Bug: 8580410
Change-Id: I45e17b786b8d221a071b5de2432bb1367e245fb4
 2013-04-09 21:41:48 -07:00
Ying Wang
66a68857a1 Fix the win_sdk build. 
Change-Id: Ia6a300dcee084d79960aba4fba552dd7fd9c2dee
 2013-04-05 19:03:58 -07:00
Ying Wang
4d18730567 am 31e588e4: am dd75a03d: Fix the win_sdk build. 
* commit '31e588e4e1f7fa4223d01999150c7e2a71c797ac':
  Fix the win_sdk build.
 2013-04-05 19:00:00 -07:00
Ying Wang
31e588e4e1 am dd75a03d: Fix the win_sdk build. 
* commit 'dd75a03d35499c34db913e886dbed5c37f5ce6d8':
  Fix the win_sdk build.
 2013-04-05 18:57:06 -07:00
Ying Wang
dd75a03d35 Fix the win_sdk build. 
Change-Id: Ia6a300dcee084d79960aba4fba552dd7fd9c2dee
 2013-04-05 18:51:32 -07:00
Ying Wang
ced0e1b834 Switch to prebuilt bison 
Bug: 8517572
Change-Id: Iad91b1db9472712899c4b46e2a8da5ba34ccb1cd
 2013-04-05 18:35:51 -07:00
Ying Wang
eccc9a5723 am adf3e7fb: am 854be683: Switch to prebuilt bison 
* commit 'adf3e7fb301eaddecdd949f83a3e4cf288635879':
  Switch to prebuilt bison
 2013-04-05 18:29:16 -07:00
Ying Wang
adf3e7fb30 am 854be683: Switch to prebuilt bison 
* commit '854be683636892eed455100d0c20b0f7dd8c5076':
  Switch to prebuilt bison
 2013-04-05 18:25:57 -07:00
Ying Wang
854be68363 Switch to prebuilt bison 
Bug: 8517572
Change-Id: Iad91b1db9472712899c4b46e2a8da5ba34ccb1cd
 2013-04-05 18:02:16 -07:00
Brian Carlstrom
1bcbf3593d am 71267677: resolved conflicts for merge of 5ec66d15 to jb-mr2-dev-plus-aosp 
* commit '712676772b0d6e32bdce3430eed0a4d9771aac7e':
  Add OkHttp to the platform.
 2013-04-03 15:03:48 -07:00
Brian Carlstrom
712676772b resolved conflicts for merge of 5ec66d15 to jb-mr2-dev-plus-aosp 
Change-Id: I0ef1665600f78527d0a98c7b36c4c2ef1a8182e3
 2013-04-03 14:19:26 -07:00
Ulas Kirazci
bde274ef83 Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE. 
Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
 2013-04-03 13:37:07 -07:00
jwilson
190dde0b1a Add OkHttp to the platform. 
Change-Id: I18716683632249573295cb2eb5229a1188ed0f17
 2013-04-02 16:24:04 -07:00
Jeff Brown
4a00745f15 am b528116b: am dd243370: apicheck: Suppress certain changes in final qualifier. 
* commit 'b528116bba0e690f620ee2a150560ce8217490de':
  apicheck: Suppress certain changes in final qualifier.
 2013-04-02 11:03:40 -07:00
Jeff Brown
b528116bba am dd243370: apicheck: Suppress certain changes in final qualifier. 
* commit 'dd243370f509115a9e3bd263dcf31e74ae448bd5':
  apicheck: Suppress certain changes in final qualifier.
 2013-04-02 08:24:12 -07:00
Wink Saville
69babbdc38 am 061604bd: am 0262d0f7: Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE." 
* commit '061604bdadd797a5371248c177e77c942c2c44f6':
  Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
 2013-04-01 18:04:14 -07:00
Wink Saville
061604bdad am 0262d0f7: Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE." 
* commit '0262d0f74725f8a165b20eeac323cdd8ca31df03':
  Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE.
 2013-04-01 18:02:06 -07:00
Wink Saville
0262d0f747 Merge "Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE." 2013-04-02 00:43:39 +00:00
Jeff Brown
dd243370f5 apicheck: Suppress certain changes in final qualifier. 
It is safe for a class to become final if it was not previously
instantiable since applications could not declare subclasses
of their own.

Likewise it is always safe to remove final.

Change-Id: I9a72fee7b25ccceca2024112812b97872ba2ec6b
 2013-04-01 14:24:49 -07:00
Ying Wang
f94ace13bd am 6686497b: am 51f7dcb9: Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev 
* commit '6686497ba38eec4b1ec62fc40b25b111a3653643':
  Default install path of shared Java library with tag tests
 2013-04-01 12:06:02 -07:00
Ying Wang
51f7dcb9ad Merge "Default install path of shared Java library with tag tests" into jb-mr2-dev 2013-04-01 19:00:13 +00:00
keunyoung
69e8d67768 am aa0d1a17: am 6f79520b: Merge "find pdk platform.zip from full_ directory as well for aosp_ products" into jb-mr2-dev 
* commit 'aa0d1a173787bdc766a0fa48052c0cf796f91602':
  find pdk platform.zip from full_ directory as well for aosp_ products
 2013-03-28 17:15:40 -07:00
keunyoung
6f79520bf7 Merge "find pdk platform.zip from full_ directory as well for aosp_ products" into jb-mr2-dev 2013-03-29 00:11:23 +00:00
Devin Kim
7a9967ac83 am e8ca0a6f: am 60b9efc0: Do not disable factory build under PDK 
* commit 'e8ca0a6f06a480322c40bd13e605885248b1ef1a':
  Do not disable factory build under PDK
 2013-03-28 16:43:56 -07:00
Ulas Kirazci
76e3a39061 Add a "nano" option to LOCAL_PROTOC_OPTIMIZE_TYPE. 
Change-Id: I7429015b3c5f7f38b7be01eb2d4927f7a9999c80
 2013-03-28 16:28:09 -07:00
keunyoung
3b4856e842 find pdk platform.zip from full_ directory as well for aosp_ products 
Change-Id: I85f8c26e055958b6fa93c375f1080e297795a417
 2013-03-28 15:20:38 -07:00
Devin Kim
60b9efc060 Do not disable factory build under PDK 
This is related to commit a1712e.
Some PDKs need the factory build under PDK. If you want to disable the factory
build under PDK, use TARGET_NO_FACTORY in your device's BoardConfig.mk

Change-Id: I5e208836918ffd737951d3fb1f54c560d2b93641
 2013-03-28 14:38:11 -07:00
Brian Carlstrom
6e24674530 am fd642ed5: am d76ff19a: Merge "resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev" into jb-mr2-dev 
* commit 'fd642ed55349dbb482f27f339e2a3509e05fdf25':
  Added local variable info output to javac command for host build.
 2013-03-27 17:16:48 -07:00
Stephen Hines
c519284395 am 92b82aa2: am ffbeac3f: Merge "Link RS compatibility files with libc and make bcc_compat a regular dep." into jb-mr2-dev 
* commit '92b82aa2eeb9f3867e2d381e8324da4ebc35658e':
  Link RS compatibility files with libc and make bcc_compat a regular dep.
 2013-03-27 17:16:47 -07:00
Brian Carlstrom
d76ff19a0f Merge "resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev" into jb-mr2-dev 2013-03-28 00:11:20 +00:00
Brian Carlstrom
8c374054b3 resolved conflicts for merge of 9a3b17d1 to jb-mr2-dev 
Change-Id: I7699f3c6ef3fcf1f16bbfff05f7b238328f8fbd6
 2013-03-27 17:04:05 -07:00
Stephen Hines
8db4ccea4a Link RS compatibility files with libc and make bcc_compat a regular dep. 
If we don't do "-lc", we end up missing symbols like "memset" on our non-NEON
builds. It also makes more sense to have bcc_compat as a standard dependency
for now, since it occasionally changes the way we compile/link our source
files.

Change-Id: I4b0ead66caa7c72fb7733db8804a33faa5350930
 2013-03-27 16:51:38 -07:00
jeffhao
dc6757a4ce Added local variable info output to javac command for host build. 
The host java files weren't being compiled with -g.

(cherry-picked from 3a971f734060d19fc023ccf82e39d956a31b7cfb)

Change-Id: I4274910c64ebf52ec955e30e800b34fc309db27b
 2013-03-26 22:26:44 -07:00
gcondra@google.com
9e1c80445d am 4ae7a261: am d3e01c15: Merge commit \'e8c9e82d\' into manualmerge 
* commit '4ae7a26166ada636da42e5e5c8ecf5cd655da617':
  Add sepolicy and mac_perms to installclean
 2013-03-26 17:32:02 -07:00
repo sync
d3e01c1577 Merge commit 'e8c9e82d' into manualmerge 
Change-Id: Iaf02a0ab32918064248410aab95facac6a2b9675
 2013-03-26 17:21:01 -07:00
Ying Wang
0abb0fd409 Default install path of shared Java library with tag tests 
To $(PRODUCT_OUT)/data/framework/.

Change-Id: Iff6bbada47258344c13853d4fd71c7ad4b709c2c
 2013-03-26 16:01:02 -07:00
William Roberts
a8b3d54101 Add sepolicy and mac_perms to installclean 
Remove the output files for SELinux policy
and mac_permissions.xml mapping for changes
between user and eng build.

Change-Id: Ie27dcedde0c22ce917d90466a763698c86919530
 2013-03-26 14:54:51 -07:00
Ying Wang
1671c74be6 am e78893d3: am ba71aba9: Allow to run Proguard on static Java library 
* commit 'e78893d3e0106f70adccac773cf08c23aa2fda3e':
  Allow to run Proguard on static Java library
 2013-03-26 14:11:31 -07:00
Ying Wang
ba71aba939 Allow to run Proguard on static Java library 
1. Let aapt output the proguard_options file
2. If proguard is enabled, switch the dependency from
$(full_classes_jar) to $(full_classes_proguard_jar).

Change-Id: Idc641a1515b8899a4623a2aeec5cd494f6c1c1c5
 2013-03-26 14:05:10 -07:00
Ying Wang
0810498018 am a5b29e21: am 1579e231: Merge "Support to build vendor.img" into jb-mr2-dev 
* commit 'a5b29e212a847fc285fc72c2e13c37b133e09119':
  Support to build vendor.img
 2013-03-25 20:55:54 +00:00
Ying Wang
1579e23178 Merge "Support to build vendor.img" into jb-mr2-dev 2013-03-25 20:48:53 +00:00
Dima Zavin
63143019f1 am 0cfdb4e9: am 47e27a4f: Merge "core: combo: arm: use appropriate mcpu flags for cortex-a7" into jb-mr2-dev 
* commit '0cfdb4e9650975077a74bb5c812e79556ac67421':
  core: combo: arm: use appropriate mcpu flags for cortex-a7
 2013-03-25 19:44:53 +00:00
Dima Zavin
47e27a4f9c Merge "core: combo: arm: use appropriate mcpu flags for cortex-a7" into jb-mr2-dev 2013-03-25 19:42:45 +00:00
Ying Wang
a0febe5e6d Support to build vendor.img 
Bug: 8341435
Change-Id: I2db7970936984d38aed35054e3f695d298f4e512
 2013-03-25 09:53:16 -07:00
Dima Zavin
bdbd716eff core: combo: arm: use appropriate mcpu flags for cortex-a7 
Change-Id: If00577d36257e4d03f63f36b159bb2e015958d6a
Signed-off-by: Dima Zavin <dima@android.com>
 2013-03-23 02:08:38 -07:00
Ying Wang
c77e220987 am c170360d: am b2c79174: am ca983c08: am 97c280ec: Merge "We have to use := instead of +=" 
* commit 'c170360d964fe83e0f1b58c6f7369daaf9aebdd8':
  We have to use := instead of +=
 2013-03-23 02:53:51 +00:00
Ying Wang
b2c7917463 am ca983c08: am 97c280ec: Merge "We have to use := instead of +=" 
* commit 'ca983c08fbc49b36eb0d71476842a86afbdcb8ed':
  We have to use := instead of +=
 2013-03-22 19:50:09 -07:00
Ying Wang
4d063410a3 We have to use := instead of += 
If we use +=, the right side may be deferred to evaluate,
if that target-specific variable is not defined yet.
That's a mistke.

Change-Id: I1635ee4791473f407866e010d612948c02cdebf6
 2013-03-22 18:52:57 -07:00
Ying Wang
df7265532d am e104179b: am 9b93f37c: Delete icu4j from pathmap.mk 
* commit 'e104179b4a0fe432f859c2bebf0513c30efe671e':
  Delete icu4j from pathmap.mk
 2013-03-22 19:40:04 +00:00
Ying Wang
9b93f37c89 Delete icu4j from pathmap.mk 
frameworks/base/icu4j is gone in jb-mr2-dev.

Change-Id: I078c8ac3db85598a9b30f8220f251eb7631151e0
 2013-03-22 12:32:50 -07:00
Andrew Hsieh
f44fa0828b am 726bfa57: am 79a6b76e: am e874f3ab: am 55c06f75: Merge "Duplicate libgcc.a in front of *so" 
* commit '726bfa57d82e4214bbca5b64b93ee06a9436799c':
  Duplicate libgcc.a in front of *so
 2013-03-19 18:21:42 +00:00
Andrew Hsieh
79a6b76ec8 am e874f3ab: am 55c06f75: Merge "Duplicate libgcc.a in front of *so" 
* commit 'e874f3ab7c3f70582f877e762c13c1943ed0e398':
  Duplicate libgcc.a in front of *so
 2013-03-19 11:17:07 -07:00
Andrew Hsieh
8725b941b0 Duplicate libgcc.a in front of *so 
Also see 6c7bc550ad

Change-Id: Iade6cd6b40cd4840a148098e1d8fc7a0c97e2f66
 2013-03-19 07:51:52 -07:00
Ben Cheng
6c7bc550ad Link libgcc.a before shared libraries (especially libc.so). 
[cherry-picked from internal master]

Change-Id: I53d19754d0d40e9ca2f3d043001cc77e39e5d795
 2013-03-18 14:00:44 -07:00
Ying Wang
c2749e90e6 am ddc85a1c: am d7321d31: Skip userdata.img only if partition size is not give for extfs. 
* commit 'ddc85a1cfbcc3003560c010ab69fa29d3e83b8c5':
  Skip userdata.img only if partition size is not give for extfs.
 2013-03-15 17:38:56 +00: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
fbe469936d am f4659048: am 4ac826b6: Don\'t build userdata.img if no partition size 
* commit 'f4659048f9a4157f59ea5d31c7063ba8e5641d2a':
  Don't build userdata.img if no partition size
 2013-03-15 16:50:30 +00: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
75acee5312 am 45542d1f: am ea871a06: Link libgcc.a before shared libraries (especially libc.so). 
* commit '45542d1fc813f05fea76d23572512803864b7542':
  Link libgcc.a before shared libraries (especially libc.so).
 2013-03-14 20:50:28 +00: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
fc0d3f13bb am 85754ea5: am cdfb5bac: resolved conflicts for merge of a3aea5b6 to jb-mr2-dev 
* commit '85754ea5f2ebd118d621a9b553edb4e8763001c4':
  Build SDK using prebuilts/devtools.
 2013-03-14 19:49:54 +00: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
34247824d8 am a06f7456: am 6e2d53a5: Merge "We need to use the ARM EABI to pass vector registers properly (i.e. float2)." into jb-mr2-dev 
* commit 'a06f74566af00d19d33248213a32fe60b96f5eea':
  We need to use the ARM EABI to pass vector registers properly (i.e. float2).
 2013-03-13 01:23:25 +00: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
0f07f3cdd6 am 649490e8: am 870d5f16: Merge "Add LOCAL_APK_LIBRARIES argument." into jb-mr2-dev 
* commit '649490e868bc0606b98458cad8f09c5c8d84bd48':
  Add LOCAL_APK_LIBRARIES argument.
 2013-03-12 19:37:58 +00: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)
5a8721bb03 am 7a3231b5: am a8d89e15: Merge "Don\'t try to group static libraries on mac." into jb-mr2-dev 
* commit '7a3231b5fcdeababe20f883044480b257d305282':
  Don't try to group static libraries on mac.
 2013-03-11 16:36:56 +00: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
ab58a79f8a am d80152f6: am 6b151013: Merge "Mips needs to be marked little-endian explicitly." into jb-mr2-dev 
* commit 'd80152f6f9663ac94e4f010b61690bfde1cbd6ce':
  Mips needs to be marked little-endian explicitly.
 2013-03-08 19:06:00 +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
deb2a8d509 am 0aa50b0d: am c08eceee: Merge "Add support for multiple architectures with RS compat lib." into jb-mr2-dev 
* commit '0aa50b0d5391be46cd08536b12c9e6a669d21718':
  Add support for multiple architectures with RS compat lib.
 2013-03-07 23:38:59 +00: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
97e0e545bd am ff2a0b52: am 07e9fbb2: Merge "recovery: choose between available fonts based on device density" into jb-mr2-dev 
* commit 'ff2a0b5266b9838b4054df2d79c28930f10eed3c':
  recovery: choose between available fonts based on device density
 2013-03-07 22:40:25 +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
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
Stephen Hines
d1f4e18574 Fix duplicate build rule warning. 
Change-Id: Ieb90af933bff162cd1ed5aa36fc1efd2b4ca7e04
 2013-02-19 14:31:59 -08:00
Stephen Hines
ec02b4f8d5 Switch to librs.FOO.so instead of libFOO.so to prevent collisions. 
Change-Id: Ifda68f3d416d87d6f4916e44a350f15b68994536
 2013-02-15 23:02:20 -08:00
Ying Wang
5938039677 am 7ce7473f: am 5e12e60b: Merge "For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang." 
* commit '7ce7473f866fc5356291f38a3437a071ea5fd00d':
  For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang.
 2013-02-15 14:48:01 -08:00
Ying Wang
5e12e60b47 Merge "For the current MIPS compiler __builtin___clear_cache() generates synci instruction only with -msynci option So, add -msynci to all mips32r2 makefiles. Also add msynci to the list flags not recognized by clang." 2013-02-15 19:33:59 +00:00
Elliott Hughes
b2bbff7cba am ea852f6e: am f6b670b7: Merge "Remove more always-true ARCH_ARM_HAVE_ flags." 
# Via Android Git Automerger (1) and others
* commit 'ea852f6ed3e9f251eaef4f041fbc0b09229ac924':
  Remove more always-true ARCH_ARM_HAVE_ flags.
 2013-02-14 17:31:40 -08:00
Elliott Hughes
03d2aa4dd0 Remove more always-true ARCH_ARM_HAVE_ flags. 
All the remaining flags appear to be actually used.

Change-Id: I0e3d84915487eda4f0e97809fc36624fef5f1848
 2013-02-14 12:04:48 -08:00
Elliott Hughes
14a2d978df am d0fb6930: am 07a58f8f: Merge "Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS." 
# Via Android Git Automerger (1) and others
* commit 'd0fb693024b88a713fe95296db451a0e6c17ec66':
  Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS.
 2013-02-13 17:11:36 -08:00
Elliott Hughes
d0542498a0 Nothing uses ARCH_ARM_HAVE_CLZ or ARCH_ARM_HAVE_FFS. 
Because every ARM architecture we've ever supported has had both.

Change-Id: I607b56416e65073c5ac1b85fb17c092516e02573
 2013-02-13 16:44:21 -08:00
Stephen Hines
4cc701480c Merge "Remove dependency on libcompiler_rt.so for RS compatibility." 2013-02-13 22:36:15 +00:00
Stephen Hines
4404433876 Remove dependency on libcompiler_rt.so for RS compatibility. 
We are now using libcompiler_rt.a, so we don't need the shared version.

Change-Id: I1d35238581dc344de6918e037e89aa0362885e0e
 2013-02-13 14:13:40 -08:00
Ying Wang
59c8b6d122 Merge "Dont' write out the clean_steps.mk if" 2013-02-13 19:58:23 +00:00
Ying Wang
4a2f173339 Dont' write out the clean_steps.mk if 
If this is mm/mmm and there is no pre-existing clean_steps.mk.
Otherwise, the build system will run almost all the clean steps in the
sourcet tree if you do a full build next.

Change-Id: I5fe1e99c4f09629e4455319ea664cfba4ac634ea
 2013-02-13 11:57:45 -08:00
Ying Wang
8392284a70 Disable LOCAL_RENDERSCRIPT_COMPATIBILITY for non-arm builds 
This fixes the x86 build.

Change-Id: I370063fc83915c4c20cee08cc4feae68c7d7292b
 2013-02-13 10:48:28 -08:00
Ying Wang
32cca7eab4 Merge "Allow user to override the linux host toolchain." 2013-02-12 22:14:02 +00:00
Ying Wang
90397c1029 Add deps on LOCAL_SHARED_LIBRARIES for prebuilts. 
This is necessary for prebuilt build cache to work properly.

Change-Id: Ica28ce4d245a948142e067d82ff84ce1aef2134e
 2013-02-12 12:28:45 -08:00
Ying Wang
79e3f77996 Allow user to override the linux host toolchain. 
Bug: 8181840
Change-Id: Ib2a90d33414758e95b1a3c60db62c4188944dfdd
 2013-02-12 11:48:37 -08:00
Stephen Hines
6adffc196f Remove libcompiler_rt.so dependency for RS compat lib. 
Change-Id: I0d871c9c7d7946b8551fdefd201603bb59ea010e
 2013-02-11 20:03:38 -08:00
Ying Wang
bfa5fb145f Merge "mma and mmma" 2013-02-12 01:52:10 +00:00
Stephen Hines
7b3c71d1be Add libcompiler_rt.so as a JNI dependency for RS compatibility. 
Change-Id: I8840faaa86ae31abc3d78553eecdd1e642c6d15d
 2013-02-11 11:11:22 -08:00