Commit Graph

20391 Commits

Author SHA1 Message Date
Neil Fuller 97ef1d46cd Merge "Add OpenJDK 8 experimental support" 2014-10-24 08:16:04 +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 717ebfc131 Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS." 2014-10-24 00:26:21 +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
Michael Runge 3bd5469025 am 46fe30ef: am fb8886db: get_stage in updater takes one param, not two.
* commit '46fe30eff7c66ce5ec8fd8d6b3aba91b55a5e12f':
  get_stage in updater takes one param, not two.
2014-10-23 22:20:09 +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
Michael Runge 1df3823808 am 10ba5654: am 7cd99bad: Allow info_dict from target_files to specify mount options
* commit '10ba56543175590bdee9e6ab13c63c3ca8beb26b':
  Allow info_dict from target_files to specify mount options
2014-10-23 22:20:07 +00:00
Dan Albert d274e04ac4 Merge "Don't sort shared library link order." 2014-10-23 22:20:01 +00:00
Michael Runge 46fe30eff7 am fb8886db: get_stage in updater takes one param, not two.
* commit 'fb8886db6858388af5082268fd023b8a44fb87ea':
  get_stage in updater takes one param, not two.
2014-10-23 21:57:12 +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
Michael Runge 10ba565431 am 7cd99bad: Allow info_dict from target_files to specify mount options
* commit '7cd99bad210455dc57702b7cbf674a588a5eb028':
  Allow info_dict from target_files to specify mount options
2014-10-23 21:57:10 +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
Michael Runge fb8886db68 get_stage in updater takes one param, not two.
Change-Id: I09a77eda5a1691080b1ae074d2e94d233eca7150
2014-10-23 13:51:04 -07:00
Chih-Hung Hsieh ea503d21c7 Merge "Raise x86 arch requirement to prescott." 2014-10-23 20:47:30 +00:00
Jeff Hamilton dbba7d0ed7 am 5069bd6b: Add a density axis to tapas.
* commit '5069bd6bfa49c0f978ed47d44e0439b15b74cef5':
  Add a density axis to tapas.
2014-10-23 20:28:21 +00:00
smain@google.com 7a258a9141 am 60e80ef6: am f84e045e: Merge "add helpouts script to <head>, behind a condition that can be enabled per page" into lmp-dev
* commit '60e80ef6e7f6a05a654154d0f43bf31ebe8fdae3':
  add helpouts script to <head>, behind a condition that can be enabled per page
2014-10-23 20:28:20 +00:00
Ying Wang 9e4f5326b0 am 9318a22f: am b6f60d57: Use the lowest common denominator 32-bit abi for arm64 cts build.
* commit '9318a22f96dd1d4ffcae76fb20520a303ef10fdf':
  Use the lowest common denominator 32-bit abi for arm64 cts build.
2014-10-23 19:46:53 +00:00
Jeff Hamilton 5069bd6bfa Add a density axis to tapas.
It allows overriding the density the app
is built for. Currently only used in the
GMS core APK's gradle file.

Change-Id: I3606df313a3110208cd8e6acade5f558261c921f
(cherry picked from commit 7e3d2341570681e566872216796dc4f79c8695ef)
2014-10-23 18:30:01 +00:00
JP Abgrall 7bd80ca6ea Merge "core: Let the build specify mount options for recovery" into lmp-dev 2014-10-23 18:15:57 +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
smain@google.com 60e80ef6e7 am f84e045e: Merge "add helpouts script to <head>, behind a condition that can be enabled per page" into lmp-dev
* commit 'f84e045e42f0377c415b2b6fea432ea0f3967f4f':
  add helpouts script to <head>, behind a condition that can be enabled per page
2014-10-23 16:34:39 +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
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
Bill Yi cac6acc9a7 am 13466f0f: Merge commit \'66b3e31936b99436e01c473dca492126eea3e336\' into HEAD
* commit '13466f0f79e42efa17777ffad6c12088c1f3cf62':
2014-10-23 13:04:59 +00:00
Neil Fuller 4dfda1fa42 Merge "Remove Java 6 build support" 2014-10-23 09:00:15 +00:00
Ying Wang 1358703edf am c6a12d77: am 46ba24c4: Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."
* commit 'c6a12d776ae548c4290d76cb157807acb1ffb9f1':
  Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
2014-10-23 03:18:55 +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
Michael Runge 7cd99bad21 Allow info_dict from target_files to specify mount options
This will allow safer mount options to be added per mount FS
type, to better ensure data is written during an OTA.
Bug: 18079773, 18092222

Change-Id: I1e3e4fd4639c6fd263e550b770cc3c858ef1e03b
2014-10-22 18:38:49 -07:00
Ying Wang 9318a22f96 am b6f60d57: Use the lowest common denominator 32-bit abi for arm64 cts build.
* commit 'b6f60d57e3e5ccb89145cd2513a9a35077c025a5':
  Use the lowest common denominator 32-bit abi for arm64 cts build.
2014-10-23 00:14:19 +00:00
smain@google.com f84e045e42 Merge "add helpouts script to <head>, behind a condition that can be enabled per page" into lmp-dev 2014-10-22 23:58:07 +00:00
Bill Yi 4ac049b7ec Restore AOSP-style version numbers - DO NOT MERGE 2014-10-22 15:44:51 -07: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
Chih-Hung Hsieh 660f3c9ae9 Merge "Set default to Clang integrated assembler." 2014-10-22 21:07:47 +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
smain@google.com 8df21b19c4 add helpouts script to <head>, behind a condition that can be enabled per page
Change-Id: Ifa2364ed77a86efd6bec69dbe4f15d7f69569504
2014-10-22 09:55:04 -07:00
Chih-Hung Hsieh 57c8a15edd Set default to Clang integrated assembler.
BUG: 17820427
Change-Id: I10a6ddd94aad083665164d7939990e148b3b6efb
2014-10-22 09:21:53 -07:00
Bill Yi 13466f0f79 Merge commit '66b3e31936b99436e01c473dca492126eea3e336' into HEAD 2014-10-22 08:45:57 -07:00
Clay Murphy 8fa65e6a65 am 238964e1: am f7b231b7: Docs: Making source.android.com headers match those of developer.android.com
* commit '238964e1e22df2be4c2c193867c4c0300b5f3a38':
  Docs: Making source.android.com headers match those of developer.android.com
2014-10-22 15:34:34 +00:00
Clay Murphy 238964e1e2 am f7b231b7: Docs: Making source.android.com headers match those of developer.android.com
* commit 'f7b231b7a64c2ab953c9f4a2eb5390f0b3a2f296':
  Docs: Making source.android.com headers match those of developer.android.com
2014-10-22 14:53:29 +00:00
Ying Wang c6a12d776a am 46ba24c4: Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."
* commit '46ba24c4a00156d6149be78928de962bf52e9502':
  Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
2014-10-22 13:12:13 +00:00
Neil Fuller 46e00ea4ba Remove Java 6 build support
Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
2014-10-22 10:53:59 +01:00
Ying Wang b6f60d57e3 Use the lowest common denominator 32-bit abi for arm64 cts build.
So the 32-bit code can be run any supported 32-bit arm devices.

Bug: 18038310
Change-Id: Ie8864cfdb87a4759d1a775d43cb5316b1f022e2b
2014-10-21 21:20:41 -07:00
Ying Wang 46ba24c4a0 Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it." 2014-10-22 01:37:16 +00:00
Ying Wang 85f24a406b Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Change-Id: I9182ce1efe09609100d19c9fae2bc4fe7358dfc0
2014-10-21 18:36:43 -07:00
Ying Wang 03eceba1dd Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Change-Id: I9182ce1efe09609100d19c9fae2bc4fe7358dfc0
2014-10-21 18:34:30 -07:00
Ying Wang f3e4b2c98e am 18cd0225: Merge "Add -Wno-unused-command-line-argument to clang cflags to enable ccache."
* commit '18cd02257d7045543ba435aa1efa497c8a780f27':
  Add -Wno-unused-command-line-argument to clang cflags to enable ccache.
2014-10-21 20:20:56 +00:00
Ying Wang 18cd02257d Merge "Add -Wno-unused-command-line-argument to clang cflags to enable ccache." 2014-10-21 19:19:16 +00:00