OSDN Git Service
Iliyan Malchev [Fri, 31 Oct 2014 22:59:59 +0000 (22:59 +0000)]
am
2b756f79: am
248f4d53: envsetup.sh: add functions to enable and generate core dumps
* commit '
2b756f79461c3cc5c227dc83e6dd3f360ad3f247':
envsetup.sh: add functions to enable and generate core dumps
Iliyan Malchev [Fri, 31 Oct 2014 21:02:59 +0000 (21:02 +0000)]
am
248f4d53: envsetup.sh: add functions to enable and generate core dumps
* commit '
248f4d53b306bd3baddb1534d3d06076460e83d4':
envsetup.sh: add functions to enable and generate core dumps
Iliyan Malchev [Wed, 29 Oct 2014 01:00:42 +0000 (18:00 -0700)]
envsetup.sh: add functions to enable and generate core dumps
The shell functions in this patch enable crashing processes with the core limit
set correctly to dump core in directory /cores. They do so by remounting the
root partition, which is RAM-backed, and by creating the 0777-chmodded /cores
under it. They also set the core file pattern in /proc/sys/kernel/core_pattern
to be /cores/core.%p, such that a core dump will have the crashing process' PID
appended to it. You enable core-dump generation once per boot, as follows:
coredump-setup
If a process does not have its core-size rlimit set (as most do not), you can
either set it manually by typing "adb shell prlimit <pid> 4 -1 -1", or by
typing coredump-enable <name>, e.g.
coredump-enable $(pid mediaserver)
Alternatively, you can cause a running process to dump core by sending it a
SIGSEGV via the shell function core <name>, e.g.:
core $(pid mediaserver)
Change-Id: Ib174e7ee95515fb9866fa6bf0d5b5bf23f3ec61b
Signed-off-by: Iliyan Malchev <malchev@google.com>
Nick Kralevich [Fri, 31 Oct 2014 18:34:12 +0000 (18:34 +0000)]
am
54e18379: am
36084e64: Merge "Label goldfish block devices with their own types."
* commit '
54e1837910cb3c40d22436bc40a7c0469df184b0':
Label goldfish block devices with their own types.
Nick Kralevich [Fri, 31 Oct 2014 18:31:34 +0000 (18:31 +0000)]
am
36084e64: Merge "Label goldfish block devices with their own types."
* commit '
36084e64a1b603f0ca848bba5ca91938f853dc4c':
Label goldfish block devices with their own types.
Nick Kralevich [Fri, 31 Oct 2014 18:27:17 +0000 (18:27 +0000)]
Merge "Label goldfish block devices with their own types."
Stephen Smalley [Fri, 31 Oct 2014 18:19:55 +0000 (14:19 -0400)]
Label goldfish block devices with their own types.
This assigns block device types as per device/generic/goldfish/fstab.goldfish.
Eliminates (permissive) avc: denied messages for fsck.
Change-Id: Ia72bdfb16975f051548b6b2c0636e4f907295789
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Nick Kralevich [Fri, 31 Oct 2014 17:40:47 +0000 (17:40 +0000)]
am
4fe702e4: am
dfa2f8a6: Merge "Mark qemu_device as a mlstrustedobject."
* commit '
4fe702e4dcf5ff3e6dcc4dea1e842d7977ff3393':
Mark qemu_device as a mlstrustedobject.
Nick Kralevich [Fri, 31 Oct 2014 17:36:28 +0000 (17:36 +0000)]
am
dfa2f8a6: Merge "Mark qemu_device as a mlstrustedobject."
* commit '
dfa2f8a6e309bca516a11d83abd1aa8733acce69':
Mark qemu_device as a mlstrustedobject.
Nick Kralevich [Fri, 31 Oct 2014 17:30:14 +0000 (17:30 +0000)]
Merge "Mark qemu_device as a mlstrustedobject."
Stephen Smalley [Fri, 31 Oct 2014 17:28:09 +0000 (13:28 -0400)]
Mark qemu_device as a mlstrustedobject.
Allow apps running with any level to write to it.
Change-Id: I8fca1f377e14c624db5273bdacf8400addc6210d
Signed-off-by: Stephen Smalley <sds@tycho.nsa.gov>
Ying Wang [Fri, 31 Oct 2014 00:13:50 +0000 (00:13 +0000)]
am
f5672925: Add support for prebuilt AARs.
* commit '
f56729250448200834c5c95c86c937e887d73623':
Add support for prebuilt AARs.
Ying Wang [Thu, 30 Oct 2014 23:46:08 +0000 (23:46 +0000)]
am
7f18adc2: am
871b8df1: Merge "Add -fcolor-diagnostics to global clang cflags."
* commit '
7f18adc240ca311d225ee9164e6d982f9a005d62':
Add -fcolor-diagnostics to global clang cflags.
Ying Wang [Thu, 30 Oct 2014 23:43:02 +0000 (23:43 +0000)]
am
871b8df1: Merge "Add -fcolor-diagnostics to global clang cflags."
* commit '
871b8df128b144f39d40889e463722a032c4d246':
Add -fcolor-diagnostics to global clang cflags.
Ying Wang [Thu, 30 Oct 2014 21:18:02 +0000 (21:18 +0000)]
Merge "Add -fcolor-diagnostics to global clang cflags."
Ying Wang [Thu, 30 Oct 2014 19:22:29 +0000 (12:22 -0700)]
Add -fcolor-diagnostics to global clang cflags.
Bug:
18187181
Change-Id: Ifcbe34b685b1dfd7ffc801bcdad7bd8208e45f86
Michael Runge [Thu, 30 Oct 2014 19:01:43 +0000 (19:01 +0000)]
am
63f01de8: Add post-install verification phase
automerge:
c9594af
* commit '
c9594afa930e5400d35bbf24a17cb9be8d978888':
Add post-install verification phase
Chih-hung Hsieh [Thu, 30 Oct 2014 16:08:20 +0000 (16:08 +0000)]
am
51e55c1d: Revert "Continue to use march=i686 before fix of g++ ICE."
* commit '
51e55c1d22576de38ca4b65deaded7b3a1af8387':
Revert "Continue to use march=i686 before fix of g++ ICE."
Chih-hung Hsieh [Thu, 30 Oct 2014 01:55:45 +0000 (01:55 +0000)]
Revert "Continue to use march=i686 before fix of g++ ICE."
This reverts commit
f70f009ca8b4779cc3a5f44e7d92b1c297e16c8b.
Change-Id: I3e1b18cf342e747c8a8405f1fc2513e5ebafc4b6
Ying Wang [Wed, 29 Oct 2014 22:48:32 +0000 (15:48 -0700)]
Add support for prebuilt AARs.
- You can give a .aar as source file to a prebuilt static Java library
module. The build system will set up dependencies and rules to extract
classes.jar and other resource files.
- To build against a prebuilt AAR module, use:
LOCAL_STATIC_JAVA_AAR_LIBRARIES := <module names of aar prebuilt AARs>
The build system will set up rules to merge the library's
AndroidManifest.xml with the main AndroidManifest.xml, add the AAR's
resource dirs and link/merge the AAR's classes.jar.
Bug:
18168693
Change-Id: I478913d5d498f800b322529d7c2c2c0ea78425e5
Chih-Hung Hsieh [Wed, 29 Oct 2014 22:07:26 +0000 (22:07 +0000)]
am
f70f009c: Continue to use march=i686 before fix of g++ ICE.
* commit '
f70f009ca8b4779cc3a5f44e7d92b1c297e16c8b':
Continue to use march=i686 before fix of g++ ICE.
Chih-Hung Hsieh [Wed, 29 Oct 2014 21:46:15 +0000 (14:46 -0700)]
Continue to use march=i686 before fix of g++ ICE.
BUG:
18174291
BUG:
18171557
Change-Id: Ica9e420e3cc1904a4298e2ab1c6201a254cbf6d1
Jeff Davidson [Wed, 29 Oct 2014 20:42:11 +0000 (20:42 +0000)]
am
ed9981d9: am
427d1e98: Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE."
* commit '
ed9981d927cb24b106df9b3c350b6b63e570026f':
Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.
Ian Rogers [Wed, 29 Oct 2014 19:43:16 +0000 (19:43 +0000)]
am
508e27bf: am
93cb8c7d: Merge "Specify -mcpu=krait for clang."
* commit '
508e27bfd7f470a945978c2b24403b0827dcde18':
Specify -mcpu=krait for clang.
Michael Runge [Wed, 29 Oct 2014 18:51:51 +0000 (18:51 +0000)]
am
63f01de8: Add post-install verification phase
* commit '
63f01de81892aa4e40b517464b3d9ca7db666c9d':
Add post-install verification phase
Jeff Davidson [Wed, 29 Oct 2014 17:40:05 +0000 (17:40 +0000)]
am
427d1e98: Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE."
* commit '
427d1e98eceb78f5cb8f1e50d00d342fc7f359c6':
Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE.
Jeff Davidson [Wed, 29 Oct 2014 17:35:16 +0000 (17:35 +0000)]
Merge "Pull in latest protolib when using LOCAL_PROTOC_OPTIMIZE_TYPE."
Neil Fuller [Wed, 29 Oct 2014 17:11:52 +0000 (17:11 +0000)]
am
acd65c7d: am
97ef1d46: Merge "Add OpenJDK 8 experimental support"
* commit '
acd65c7db0212bff2b7b1878a26b7a105522cd44':
Add OpenJDK 8 experimental support
Chih-Hung Hsieh [Wed, 29 Oct 2014 17:11:51 +0000 (17:11 +0000)]
am
736a146c: am
717ebfc1: Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS."
* commit '
736a146c3c44b6b753e0b7866d3f0f43e9be76e5':
Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
Dan Albert [Wed, 29 Oct 2014 17:11:50 +0000 (17:11 +0000)]
am
ef8912d9: am
d274e04a: Merge "Don\'t sort shared library link order."
* commit '
ef8912d93f5ca3722d761da6c0b0f05e2480a41d':
Don't sort shared library link order.
Chih-Hung Hsieh [Wed, 29 Oct 2014 17:11:49 +0000 (17:11 +0000)]
am
6555580d: am
ea503d21: Merge "Raise x86 arch requirement to prescott."
* commit '
6555580d35ac570005923866fb4035265a0b5b98':
Raise x86 arch requirement to prescott.
Neil Fuller [Wed, 29 Oct 2014 17:11:24 +0000 (17:11 +0000)]
am
f7ce9508: am
4dfda1fa: Merge "Remove Java 6 build support"
* commit '
f7ce9508dec85c67d3a2ebe84db073a01355eba5':
Remove Java 6 build support
Chih-Hung Hsieh [Wed, 29 Oct 2014 16:42:52 +0000 (16:42 +0000)]
am
54fd82d1: am
660f3c9a: Merge "Set default to Clang integrated assembler."
* commit '
54fd82d111113c7969052cd315cc71bd31b4e161':
Set default to Clang integrated assembler.
Ian Rogers [Wed, 29 Oct 2014 12:32:37 +0000 (12:32 +0000)]
am
93cb8c7d: Merge "Specify -mcpu=krait for clang."
* commit '
93cb8c7d951b89eeb1e3cee2433bffecc13fdb11':
Specify -mcpu=krait for clang.
Bill Yi [Wed, 29 Oct 2014 07:01:01 +0000 (07:01 +0000)]
am
4ac049b7: (-s ours) Restore AOSP-style version numbers - DO NOT MERGE
* commit '
4ac049b7ec188161dccf6fa9b1f23c76f8330857':
Restore AOSP-style version numbers - DO NOT MERGE
Michael Runge [Wed, 29 Oct 2014 02:24:19 +0000 (19:24 -0700)]
Add post-install verification phase
Verify the SHA sum of all patched and extracted files after
a file system remount.
Bug:
18145574
Change-Id: I2f053d085543e10e39153a774542d37ee0a238bd
Ian Rogers [Tue, 28 Oct 2014 23:03:36 +0000 (23:03 +0000)]
Merge "Specify -mcpu=krait for clang."
Ian Rogers [Tue, 28 Oct 2014 22:50:02 +0000 (15:50 -0700)]
Specify -mcpu=krait for clang.
Change-Id: I64682cddf57246341c1727ca16c56f7ce0c6fd0a
Adam Lesinski [Tue, 28 Oct 2014 18:09:11 +0000 (18:09 +0000)]
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
Adam Lesinski [Tue, 28 Oct 2014 17:41:29 +0000 (17:41 +0000)]
Merge "Add -DWIN32_LEAN_AND_MEAN build flag to get rid of winsock2.h warnings" into lmp-mr1-dev
Neil Fuller [Tue, 28 Oct 2014 04:50:49 +0000 (04:50 +0000)]
am
97ef1d46: Merge "Add OpenJDK 8 experimental support"
* commit '
97ef1d46cdae3776e49900b2ed92748f6127bbb0':
Add OpenJDK 8 experimental support
Chih-Hung Hsieh [Tue, 28 Oct 2014 04:48:54 +0000 (04:48 +0000)]
am
717ebfc1: Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS."
* commit '
717ebfc13182202ab38e17c0cd008924e9e5c4e9':
Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
Dan Albert [Tue, 28 Oct 2014 04:46:53 +0000 (04:46 +0000)]
am
d274e04a: Merge "Don\'t sort shared library link order."
* commit '
d274e04ac4317d7cfc2de02ca215e064c018c234':
Don't sort shared library link order.
Chih-Hung Hsieh [Tue, 28 Oct 2014 04:46:49 +0000 (04:46 +0000)]
am
ea503d21: Merge "Raise x86 arch requirement to prescott."
* commit '
ea503d21c7d5ecb3deacbf50f3ec7366bf7bd573':
Raise x86 arch requirement to prescott.
Ying Wang [Tue, 28 Oct 2014 03:36:22 +0000 (03:36 +0000)]
Store symbols.zip in apps_only build. automerge:
a60fb49
automerge:
a73b611
* commit '
a73b611e6b2a626b144170f15509e02f3318976e':
Store symbols.zip in apps_only build.
Ying Wang [Tue, 28 Oct 2014 00:15:59 +0000 (00:15 +0000)]
Store symbols.zip in apps_only build.
automerge:
a60fb49
* commit '
a60fb49704946b9d5cf0551ddd56bd1072131b85':
Store symbols.zip in apps_only build.
Adam Lesinski [Mon, 27 Oct 2014 21:26:35 +0000 (14:26 -0700)]
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
Ying Wang [Fri, 24 Oct 2014 18:36:59 +0000 (11:36 -0700)]
Store symbols.zip in apps_only build.
Bug:
18103055
Change-Id: I0eb335e944138b0edc3050d19c076891f499a07c
Neil Fuller [Fri, 24 Oct 2014 20:18:15 +0000 (20:18 +0000)]
am
4dfda1fa: Merge "Remove Java 6 build support"
* commit '
4dfda1fa4201e41022396b77054168ffc73b590c':
Remove Java 6 build support
Chih-Hung Hsieh [Fri, 24 Oct 2014 13:02:00 +0000 (13:02 +0000)]
am
660f3c9a: Merge "Set default to Clang integrated assembler."
* commit '
660f3c9ae9cb99f428fb62fb6a1256679eb9f138':
Set default to Clang integrated assembler.
Neil Fuller [Fri, 24 Oct 2014 08:16:03 +0000 (08:16 +0000)]
Merge "Add OpenJDK 8 experimental support"
JP Abgrall [Fri, 24 Oct 2014 03:24:41 +0000 (03:24 +0000)]
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)
JP Abgrall [Fri, 24 Oct 2014 02:57:34 +0000 (02:57 +0000)]
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)
Chih-Hung Hsieh [Fri, 24 Oct 2014 00:26:20 +0000 (00:26 +0000)]
Merge "Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS."
Chih-Hung Hsieh [Thu, 23 Oct 2014 23:39:09 +0000 (16:39 -0700)]
Add unknown flag to CLANG_CONFIG_UNKNOWN_CFLAGS.
BUG:
18108271
Change-Id: Id929cad31340d2946027603c1c8c8fb1cb60f66a
JP Abgrall [Thu, 23 Oct 2014 23:27:03 +0000 (16:27 -0700)]
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
Michael Runge [Thu, 23 Oct 2014 22:20:09 +0000 (22:20 +0000)]
am
46fe30ef: am
fb8886db: get_stage in updater takes one param, not two.
* commit '
46fe30eff7c66ce5ec8fd8d6b3aba91b55a5e12f':
get_stage in updater takes one param, not two.
JP Abgrall [Thu, 23 Oct 2014 22:20:08 +0000 (22:20 +0000)]
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
Michael Runge [Thu, 23 Oct 2014 22:20:07 +0000 (22:20 +0000)]
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
Dan Albert [Thu, 23 Oct 2014 22:20:01 +0000 (22:20 +0000)]
Merge "Don't sort shared library link order."
Michael Runge [Thu, 23 Oct 2014 21:57:12 +0000 (21:57 +0000)]
am
fb8886db: get_stage in updater takes one param, not two.
* commit '
fb8886db6858388af5082268fd023b8a44fb87ea':
get_stage in updater takes one param, not two.
JP Abgrall [Thu, 23 Oct 2014 21:57:11 +0000 (21:57 +0000)]
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
Michael Runge [Thu, 23 Oct 2014 21:57:10 +0000 (21:57 +0000)]
am
7cd99bad: Allow info_dict from target_files to specify mount options
* commit '
7cd99bad210455dc57702b7cbf674a588a5eb028':
Allow info_dict from target_files to specify mount options
Dan Albert [Thu, 23 Oct 2014 21:04:02 +0000 (14:04 -0700)]
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
Michael Runge [Thu, 23 Oct 2014 20:51:04 +0000 (13:51 -0700)]
get_stage in updater takes one param, not two.
Change-Id: I09a77eda5a1691080b1ae074d2e94d233eca7150
Chih-Hung Hsieh [Thu, 23 Oct 2014 20:47:29 +0000 (20:47 +0000)]
Merge "Raise x86 arch requirement to prescott."
Jeff Hamilton [Thu, 23 Oct 2014 20:28:21 +0000 (20:28 +0000)]
am
5069bd6b: Add a density axis to tapas.
* commit '
5069bd6bfa49c0f978ed47d44e0439b15b74cef5':
Add a density axis to tapas.
smain@google.com [Thu, 23 Oct 2014 20:28:20 +0000 (20:28 +0000)]
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
Ying Wang [Thu, 23 Oct 2014 19:46:53 +0000 (19:46 +0000)]
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.
Jeff Hamilton [Fri, 5 Sep 2014 04:28:00 +0000 (21:28 -0700)]
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)
JP Abgrall [Thu, 23 Oct 2014 18:15:56 +0000 (18:15 +0000)]
Merge "core: Let the build specify mount options for recovery" into lmp-dev
JP Abgrall [Thu, 23 Oct 2014 03:01:22 +0000 (20:01 -0700)]
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
smain@google.com [Thu, 23 Oct 2014 16:34:39 +0000 (16:34 +0000)]
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
Jeff Davidson [Tue, 16 Sep 2014 00:51:11 +0000 (17:51 -0700)]
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
Neil Fuller [Thu, 16 Oct 2014 09:23:03 +0000 (10:23 +0100)]
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
Bill Yi [Thu, 23 Oct 2014 13:04:59 +0000 (13:04 +0000)]
Neil Fuller [Thu, 23 Oct 2014 09:00:13 +0000 (09:00 +0000)]
Merge "Remove Java 6 build support"
Ying Wang [Thu, 23 Oct 2014 03:18:55 +0000 (03:18 +0000)]
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.
Ying Wang [Thu, 23 Oct 2014 03:18:11 +0000 (03:18 +0000)]
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.
Michael Runge [Thu, 23 Oct 2014 00:21:48 +0000 (17:21 -0700)]
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
Ying Wang [Thu, 23 Oct 2014 00:14:19 +0000 (00:14 +0000)]
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.
smain@google.com [Wed, 22 Oct 2014 23:58:07 +0000 (23:58 +0000)]
Merge "add helpouts script to <head>, behind a condition that can be enabled per page" into lmp-dev
Bill Yi [Wed, 22 Oct 2014 22:44:51 +0000 (15:44 -0700)]
Restore AOSP-style version numbers - DO NOT MERGE
Chih-Hung Hsieh [Wed, 22 Oct 2014 21:35:08 +0000 (14:35 -0700)]
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
Ying Wang [Wed, 22 Oct 2014 21:28:02 +0000 (21:28 +0000)]
am
e3fe9cf2: am
03eceba1: Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
* commit '
e3fe9cf21383b0444037358eaf2f207d94a560f2':
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Chih-Hung Hsieh [Wed, 22 Oct 2014 21:07:47 +0000 (21:07 +0000)]
Merge "Set default to Clang integrated assembler."
Ying Wang [Wed, 22 Oct 2014 20:47:46 +0000 (20:47 +0000)]
am
03eceba1: Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
* commit '
03eceba1ddfe6cf3ae6eb22bddc889930c097c1a':
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
smain@google.com [Tue, 21 Oct 2014 20:57:01 +0000 (13:57 -0700)]
add helpouts script to <head>, behind a condition that can be enabled per page
Change-Id: Ifa2364ed77a86efd6bec69dbe4f15d7f69569504
Chih-Hung Hsieh [Wed, 22 Oct 2014 16:21:53 +0000 (09:21 -0700)]
Set default to Clang integrated assembler.
BUG:
17820427
Change-Id: I10a6ddd94aad083665164d7939990e148b3b6efb
Bill Yi [Wed, 22 Oct 2014 15:45:57 +0000 (08:45 -0700)]
Clay Murphy [Wed, 22 Oct 2014 15:34:34 +0000 (15:34 +0000)]
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
Clay Murphy [Wed, 22 Oct 2014 14:53:29 +0000 (14:53 +0000)]
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
Ying Wang [Wed, 22 Oct 2014 13:12:13 +0000 (13:12 +0000)]
am
46ba24c4: Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."
* commit '
46ba24c4a00156d6149be78928de962bf52e9502':
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Neil Fuller [Thu, 16 Oct 2014 09:23:03 +0000 (10:23 +0100)]
Remove Java 6 build support
Change-Id: I9754844af58e3f81d7eb9dae286128d17a2cb56c
Ying Wang [Wed, 22 Oct 2014 04:20:41 +0000 (21:20 -0700)]
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
Ying Wang [Wed, 22 Oct 2014 01:37:15 +0000 (01:37 +0000)]
Merge "Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it."
Ying Wang [Wed, 22 Oct 2014 01:34:30 +0000 (18:34 -0700)]
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Change-Id: I9182ce1efe09609100d19c9fae2bc4fe7358dfc0
Ying Wang [Wed, 22 Oct 2014 01:34:30 +0000 (18:34 -0700)]
Reset LOCAL_2ND_ARCH_VAR_PREFIX before referencing it.
Change-Id: I9182ce1efe09609100d19c9fae2bc4fe7358dfc0
Ying Wang [Tue, 21 Oct 2014 20:20:56 +0000 (20:20 +0000)]
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.
Ying Wang [Tue, 21 Oct 2014 19:19:15 +0000 (19:19 +0000)]
Merge "Add -Wno-unused-command-line-argument to clang cflags to enable ccache."