Commit Graph

6592 Commits

Author SHA1 Message Date
Chih-Hung Hsieh
9fd8469237 am 736a146c: am 717ebfc1: Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS."
* commit '736a146c3c44b6b753e0b7866d3f0f43e9be76e5':
  Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
2014-10-29 17:11:51 +00:00
Dan Albert
d905ec2ac6 am ef8912d9: am d274e04a: Merge "Don\'t sort shared library link order."
* commit 'ef8912d93f5ca3722d761da6c0b0f05e2480a41d':
  Don't sort shared library link order.
2014-10-29 17:11:50 +00:00
Chih-Hung Hsieh
3b5261ac75 am 6555580d: am ea503d21: Merge "Raise x86 arch requirement to prescott."
* commit '6555580d35ac570005923866fb4035265a0b5b98':
  Raise x86 arch requirement to prescott.
2014-10-29 17:11:49 +00:00
Neil Fuller
c5c60e2c2a am f7ce9508: am 4dfda1fa: Merge "Remove Java 6 build support"
* commit 'f7ce9508dec85c67d3a2ebe84db073a01355eba5':
  Remove Java 6 build support
2014-10-29 17:11:24 +00:00
Chih-Hung Hsieh
bb9b74d88c am 0704df6c: am 54fd82d1: am 660f3c9a: Merge "Set default to Clang integrated assembler."
* commit '0704df6c6182bb7313f2faa5ab64fa4b726f9ad6':
  Set default to Clang integrated assembler.
2014-10-29 16:47:09 +00:00
Chih-Hung Hsieh
0704df6c61 am 54fd82d1: am 660f3c9a: Merge "Set default to Clang integrated assembler."
* commit '54fd82d111113c7969052cd315cc71bd31b4e161':
  Set default to Clang integrated assembler.
2014-10-29 16:42:52 +00:00
Ian Rogers
508e27bfd7 am 93cb8c7d: Merge "Specify -mcpu=krait for clang."
* commit '93cb8c7d951b89eeb1e3cee2433bffecc13fdb11':
  Specify -mcpu=krait for clang.
2014-10-29 12:32:37 +00:00
Ian Rogers
e270873407 Specify -mcpu=krait for clang.
Change-Id: I64682cddf57246341c1727ca16c56f7ce0c6fd0a
2014-10-28 15:50:02 -07:00
Ying Wang
f122cb8151 Merge "Support "LOCAL_FDO_SUPPORT := always"." 2014-10-28 22:47:30 +00:00
Ying Wang
45d0143ab1 Support "LOCAL_FDO_SUPPORT := always".
"LOCAL_FDO_SUPPORT := always" enables FDO without user specifying
"BUILD_FDO_OPTIMIZE := true", i.e. it turns on FDO for a
module in any build configuration.

Change-Id: I05d8db2edb2b3f5db073fa14d5bf1083a04571c0
2014-10-28 14:50:59 -07:00
Adam Lesinski
6143aeead0 am 256ea6ca: Merge "Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings" into lmp-mr1-dev automerge: 708e021
* commit '256ea6cad056df901785b8834c865fbb3f5afa71':
  Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings
2014-10-28 19:18:18 +00:00
Adam Lesinski
256ea6cad0 Merge "Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings" into lmp-mr1-dev
automerge: 708e021

* commit '708e021a319eea4cb549a73745fafb9467776fcf':
  Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings
2014-10-28 18:09:11 +00:00
Adam Lesinski
708e021a31 Merge "Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings" into lmp-mr1-dev 2014-10-28 17:41:30 +00:00
Andrew Boie
388c04dd6b definitions.mk: look for definitions.mk in device/*/build also
build/core/Makefile looks for build tasks in either device/*/build/tasks
or vendor/*/build/tasks. Do the same with vendor-specific definitions.mk.

Change-Id: Ib4fd00a1d0effe8e347382a922da101ce26bf696
Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
2014-10-28 08:36:00 -07:00
Neil Fuller
acd65c7db0 am 97ef1d46: Merge "Add OpenJDK 8 experimental support"
* commit '97ef1d46cdae3776e49900b2ed92748f6127bbb0':
  Add OpenJDK 8 experimental support
2014-10-28 04:50:49 +00:00
Chih-Hung Hsieh
736a146c3c am 717ebfc1: Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS."
* commit '717ebfc13182202ab38e17c0cd008924e9e5c4e9':
  Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
2014-10-28 04:48:54 +00:00
Dan Albert
ef8912d93f am d274e04a: Merge "Don\'t sort shared library link order."
* commit 'd274e04ac4317d7cfc2de02ca215e064c018c234':
  Don't sort shared library link order.
2014-10-28 04:46:53 +00:00
Chih-Hung Hsieh
6555580d35 am ea503d21: Merge "Raise x86 arch requirement to prescott."
* commit 'ea503d21c7d5ecb3deacbf50f3ec7366bf7bd573':
  Raise x86 arch requirement to prescott.
2014-10-28 04:46:49 +00:00
Ying Wang
83cd45517d Store symbols.zip in apps_only build. automerge: a60fb49
automerge: a73b611

* commit 'a73b611e6b2a626b144170f15509e02f3318976e':
  Store symbols.zip in apps_only build.
2014-10-28 03:36:22 +00:00
Ying Wang
a73b611e6b Store symbols.zip in apps_only build.
automerge: a60fb49

* commit 'a60fb49704946b9d5cf0551ddd56bd1072131b85':
  Store symbols.zip in apps_only build.
2014-10-28 00:15:59 +00:00
Adam Lesinski
b4efae440b Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings
It's better practice to include the minimal set of windows APIs anyways
and we're not doing anything that requires more.

Change-Id: I1b4362be4f707738b9cfbd6a87caabff8b8409ac
2014-10-27 14:26:35 -07:00
Ying Wang
a60fb49704 Store symbols.zip in apps_only build.
Bug: 18103055
Change-Id: I0eb335e944138b0edc3050d19c076891f499a07c
2014-10-27 17:57:11 +00:00
Marcos Marado
a69822cb2b Force colorsheme to SVG, since darkblue doesn't exist on X11
Change-Id: I1b9e13dd4ca63ba27a49a55d95130bdceb187669
2014-10-27 17:41:01 +00:00
Neil Fuller
f7ce9508de am 4dfda1fa: Merge "Remove Java 6 build support"
* commit '4dfda1fa4201e41022396b77054168ffc73b590c':
  Remove Java 6 build support
2014-10-24 20:18:15 +00:00
Ying Wang
da3b972603 Store symbols.zip in apps_only build.
Bug: 18103055
Change-Id: I0eb335e944138b0edc3050d19c076891f499a07c
2014-10-24 11:36:59 -07:00
Chih-Hung Hsieh
54fd82d111 am 660f3c9a: Merge "Set default to Clang integrated assembler."
* commit '660f3c9ae9cb99f428fb62fb6a1256679eb9f138':
  Set default to Clang integrated assembler.
2014-10-24 13:02:00 +00:00
Neil Fuller
97ef1d46cd Merge "Add OpenJDK 8 experimental support" 2014-10-24 08:16:04 +00:00
JP Abgrall
c55943c2f5 am 9bd1c566: am 775b1abb: core: Fixup bad ext4 mount options for recovery (pick common denominator) automerge: 620e409
* commit '9bd1c56603ef7f651508e13af2ffd82b7b192f5a':
  core: Fixup bad ext4 mount options for recovery (pick common denominator)
2014-10-24 03:28:36 +00:00
JP Abgrall
9bd1c56603 am 775b1abb: core: Fixup bad ext4 mount options for recovery (pick common denominator)
automerge: 620e409

* commit '620e409127c6b13d72211251a8a5e92513d04693':
  core: Fixup bad ext4 mount options for recovery (pick common denominator)
2014-10-24 03:24:41 +00:00
JP Abgrall
620e409127 am 775b1abb: core: Fixup bad ext4 mount options for recovery (pick common denominator)
* commit '775b1abb12a5d891ac66b51d28381692bde6ab03':
  core: Fixup bad ext4 mount options for recovery (pick common denominator)
2014-10-24 02:57:34 +00:00
Chih-Hung Hsieh
22b6c5c2c1 Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
BUG: 18108271
Change-Id: Id929cad31340d2946027603c1c8c8fb1cb60f66a
2014-10-23 16:39:09 -07:00
JP Abgrall
775b1abb12 core: Fixup bad ext4 mount options for recovery (pick common denominator)
Some ext4 options were not suitable for all kernel versions.
The current option were checked against kernels 3.0 3.4 3.10.

Bug: 18092222
Change-Id: I30883706e5c8ac7a318f4b448d4becde50de808f
2014-10-23 16:27:03 -07:00
JP Abgrall
78a6a5b38c am 79804fea: am 4f072e14: am 7bd80ca6: Merge "core: Let the build specify mount options for recovery" into lmp-dev
* commit '79804fea52dc6fbf258ed45312a8bfbd2d46fe6f':
  core: Let the build specify mount options for recovery
2014-10-23 22:27:21 +00:00
JP Abgrall
79804fea52 am 4f072e14: am 7bd80ca6: Merge "core: Let the build specify mount options for recovery" into lmp-dev
* commit '4f072e140bba2422eae14270f22174398a86a0ba':
  core: Let the build specify mount options for recovery
2014-10-23 22:20:08 +00:00
Dan Albert
d274e04ac4 Merge "Don't sort shared library link order." 2014-10-23 22:20:01 +00:00
JP Abgrall
4f072e140b am 7bd80ca6: Merge "core: Let the build specify mount options for recovery" into lmp-dev
* commit '7bd80ca6ea2b0c5c39bdb05013fb3d0188fbcfa8':
  core: Let the build specify mount options for recovery
2014-10-23 21:57:11 +00:00
Dan Albert
04eead7e2b Don't sort shared library link order.
Only sort the list of shared libraries used for naming dependencies,
not the order they are actually linked in. The order in which shared
libraries appear to the linker affects which symbols get used if there
is a multiply defined symbol.

Also link system shared libraries _after_ user provided libraries,
since a user will want their functions to override the system's if
they exist.

Change-Id: I071059d940d40a648d69d90e0699073ef520138a
2014-10-23 14:04:02 -07:00
Chih-Hung Hsieh
ea503d21c7 Merge "Raise x86 arch requirement to prescott." 2014-10-23 20:47:30 +00:00
JP Abgrall
6ea5bd626c core: Let the build specify mount options for recovery
Currently recovery install/patch will mount /system++ with only default
options.
The default options are not very suitable for dealing with crashes.
We now use
 TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS
that can specify which mount options to use for a given fs-type.
  # <fstype>=<fstype_opts>[|<fstype_opts>]...
  # fstype_opts := <opt>[,<opt>]...
  #         opt := <name>[=<value>]
If only defaults are to be used, then the BoardConfig.mk can just have
an empty (must have ""):
 TARGET_RECOVERY_FSTYPE_MOUNT_OPTIONS := ""

The default is
 "ext4=match_batch_time=0,commit=1,data=journal,barrier=1,errors=panic,nodelalloc"

The release tools will pick them up with
  https://googleplex-android-review.git.corp.google.com/#/c/573628

Bug: 18092222
Change-Id: Iaa59099b0edf5af8835d1862fada089cff58882c
2014-10-23 17:54:01 +00:00
Jeff Davidson
b8ddd55b55 Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.
If a module is explicitly depending on a versioned protolib, we strip
the dependency and log a warning so the unneeded dependency can be
removed.

Change-Id: I949d32fb5126f1c05e2a6ed48f6636a4a9b15a48
2014-10-23 07:20:16 -07:00
Ying Wang
70b897ced7 am 4cfa9e0e: am f3e4b2c9: am 18cd0225: Merge "Add -Wno-unused-command-line-argument to clang cflags to enable ccache."
* commit '4cfa9e0ef821785ec0c1ca9acf857db39e0cd408':
  Add -Wno-unused-command-line-argument to clang cflags to enable ccache.
2014-10-23 13:25:17 +00:00
Neil Fuller
960f22c11d Add OpenJDK 8 experimental support
Targeting 1.7: just adding support for the tools.

Various issues exist with OpenJDK 8: it doesn't build to completion
yet.

Change-Id: I54942f497264234e4bef488c8d17d243b4ef2f14
2014-10-23 14:07:29 +01:00
Neil Fuller
4dfda1fa42 Merge "Remove Java 6 build support" 2014-10-23 09:00:15 +00:00
Ying Wang
4cfa9e0ef8 am f3e4b2c9: am 18cd0225: Merge "Add -Wno-unused-command-line-argument to clang cflags to enable ccache."
* commit 'f3e4b2c98e91c073e7612adb7adb16530ba00c7b':
  Add -Wno-unused-command-line-argument to clang cflags to enable ccache.
2014-10-23 03:18:11 +00:00
Bill Yi
4ac049b7ec Restore AOSP-style version numbers - DO NOT MERGE 2014-10-22 15:44:51 -07:00
Ying Wang
3e45454569 am 763af239: am e3fe9cf2: am 03eceba1: Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
* commit '763af239d3f9a73ebd18495e301c9465178303bb':
  Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
2014-10-22 22:42:16 +00:00
Chih-Hung Hsieh
c248fa3e01 Raise x86 arch requirement to prescott.
Atomic functions used in external/libcxx/include/atomic when compiled with Clang
will require intrinsic functions exist only for prescott or newer CPUs.

BUG: 17530542
Change-Id: I0c9660ed2ffa75b940981eb8165d88934b39aec5
2014-10-22 15:25:49 -07:00
Ying Wang
763af239d3 am e3fe9cf2: am 03eceba1: Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
* commit 'e3fe9cf21383b0444037358eaf2f207d94a560f2':
  Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
2014-10-22 21:28:02 +00:00
Ying Wang
e3fe9cf213 am 03eceba1: Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
* commit '03eceba1ddfe6cf3ae6eb22bddc889930c097c1a':
  Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
2014-10-22 20:47:46 +00:00
Chih-Hung Hsieh
57c8a15edd Set default to Clang integrated assembler.
BUG: 17820427
Change-Id: I10a6ddd94aad083665164d7939990e148b3b6efb
2014-10-22 09:21:53 -07:00