Commit graph

3110 commits

Author SHA1 Message Date
Ying Wang
259773656a Merge "mkbootimg: Support custom mkbootimg implementation" 2013-08-19 21:24:07 +00:00
Ying Wang
8f01a3c0ca Merge "Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT." 2013-08-14 01:25:06 +00:00
Elliott Hughes
32d315a399 Add missing LOCAL_ADDITIONAL_DEPENDENCIES dependency to BUILD_PREBUILT.
Change-Id: Id7c0e77110653e618d783026cd4b4aeadb3c45ec
2013-08-13 17:05:34 -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
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
e58868ab47 Merge "Link PRIVATE_TARGET_FDO_LIB before shared libraries" 2013-08-09 20:33:11 +00: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
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
Brian Carlstrom
5c619fcb5f Remove BUILD_HOST_JAVA_LIBRARY dependency on aapt
Change-Id: I8be48114b43e46255977be1677b0c0bbccdf9163
2013-08-01 23:31:19 -07:00
Marie Lennerhagen
9e5efceff9 Added generic hook for loading vendor specific defintions
Change-Id: I6dec9c378ed0aabf9e60f8dcb05c6043bbcc30e5
2013-07-26 18:12:36 +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
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
Chirayu Desai
0564d0ce33 Change build id to OPENMASTER
Change-Id: Ib1b2ea0303619753dace8a776295ad4e1ceab096
2013-07-25 21:26:32 +05:30
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
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
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
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
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
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
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
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
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
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
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
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
Scott Main
af44e90b19 add renderscript to support library javadocs
Bug: 9188088

Change-Id: I7c34a99b73dc01c78174e5b93e5a5d3085ff81ff
2013-05-29 18:42:54 +00: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
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
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
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