OSDN Git Service
Ying Wang [Wed, 20 May 2015 10:19:21 +0000 (10:19 +0000)]
am
74a5606f: am
716bd35e: am
9b0a76fd: am
a6ffb929: FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.
* commit '
74a5606fb409bae3a7212d58e840e6b447f14b22':
FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.
Ying Wang [Wed, 20 May 2015 10:00:03 +0000 (10:00 +0000)]
am
716bd35e: am
9b0a76fd: am
a6ffb929: FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.
* commit '
716bd35ead5778feba348094876421cc24d50139':
FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.
Ying Wang [Wed, 20 May 2015 09:49:14 +0000 (09:49 +0000)]
am
9b0a76fd: am
a6ffb929: FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.
* commit '
9b0a76fdf18d9bcc870a07e9089edc368d16c9d5':
FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.
Ying Wang [Wed, 20 May 2015 07:03:25 +0000 (07:03 +0000)]
am
a6ffb929: FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.
* commit '
a6ffb929f44e8def03bdc820386c5acfbd78f24b':
FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.
Ying Wang [Thu, 6 Nov 2014 22:11:33 +0000 (14:11 -0800)]
FORCE_BUILD_LLVM_COMPONENTS if HOST_PREFER_32_BIT.
Because we don't have 32-bit prebuilt libLLVM/libclang.
Change-Id: I86dac33e9bcbcb3d197f7d1e4c9d33bd4e7c473e
(cherry picked from commit
e5d4e74f9f8c09b79cac8125fb58bdfbb4f1aa9c)
Ying Wang [Wed, 20 May 2015 01:38:01 +0000 (01:38 +0000)]
am
69425c1d: am
44acba6d: am
02026edf: am
bf6b82fb: am
247f5c4f: am
1bd15569: am
e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '
69425c1dcb6a286f75a82ede7028a0d6089adc95':
Add task to print transitive dependencies and their license files.
Ying Wang [Wed, 20 May 2015 01:15:47 +0000 (01:15 +0000)]
am
44acba6d: am
02026edf: am
bf6b82fb: am
247f5c4f: am
1bd15569: am
e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '
44acba6d37b1d13ef3a3ec6d89e5121f691089d9':
Add task to print transitive dependencies and their license files.
Ying Wang [Wed, 20 May 2015 01:03:22 +0000 (01:03 +0000)]
am
02026edf: am
bf6b82fb: am
247f5c4f: am
1bd15569: am
e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '
02026edf4d104750fde070862636d29db4124b3a':
Add task to print transitive dependencies and their license files.
Ying Wang [Wed, 20 May 2015 00:50:56 +0000 (00:50 +0000)]
am
bf6b82fb: am
247f5c4f: am
1bd15569: am
e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '
bf6b82fbf1ec51523c615f8bf856c315c27b6890':
Add task to print transitive dependencies and their license files.
Ying Wang [Wed, 20 May 2015 00:47:42 +0000 (00:47 +0000)]
am
589e8c52: Use TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
* commit '
589e8c52fb5eeb4027721bac52851ad977f53bbb':
Use TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
Ying Wang [Wed, 20 May 2015 00:39:27 +0000 (00:39 +0000)]
am
247f5c4f: am
1bd15569: am
e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '
247f5c4fce9e2cf1911458be1591517c1e7dbc42':
Add task to print transitive dependencies and their license files.
Ying Wang [Wed, 20 May 2015 00:28:37 +0000 (00:28 +0000)]
am
1bd15569: am
e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '
1bd155692f2e7ddc4fb6b874fc586ba8ab86a363':
Add task to print transitive dependencies and their license files.
Ying Wang [Wed, 20 May 2015 00:11:27 +0000 (00:11 +0000)]
am
e528e44d: Merge "Add task to print transitive dependencies and their license files." into lmp-dev
* commit '
e528e44d31498ad83482b1860036916d0fded379':
Add task to print transitive dependencies and their license files.
Ying Wang [Tue, 19 May 2015 23:58:46 +0000 (23:58 +0000)]
Merge "Add task to print transitive dependencies and their license files." into lmp-dev
Ying Wang [Thu, 7 May 2015 19:08:53 +0000 (12:08 -0700)]
Add task to print transitive dependencies and their license files.
Print modules and their transitive dependencies with license files.
To invoke, run
"make deps-license PROJ_PATH=<proj-path-patterns> DEP_PATH=<dep-path-patterns>".
PROJ_PATH restricts the paths of the source modules;
DEP_PATH restricts the paths of the dependency modules.
Both can be makefile patterns supported by makefile function $(filter).
Example:
$ make deps-license packages/app/% external/%
prints all modules in packages/app/ with their dpendencies in external/.
The printout lines look like "<module_name> :: <module_paths> :: <license_files>".
Bug:
20823995
Change-Id: I06b66e85ff56c8628bffa3d948085ed45870100f
(cherry-pick from
39b9b690a824c82465fe0ac9b44a0c1f5e6ae13a)
Ying Wang [Tue, 19 May 2015 23:03:57 +0000 (16:03 -0700)]
Use TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
- When raising the ProGuard sdk version for platform build, use
TARGET_DEFAULT_JAVA_LIBRARIES instead of just framework.
- Also added SUPPORT_LIBRARY_ROOT to reference support library resource
dir.
Bug:
20658265
Change-Id: Ib008d8e70508723db91431a062cac691367f2f6c
Nick Kralevich [Tue, 19 May 2015 13:14:42 +0000 (13:14 +0000)]
am
7e72d990: Merge "Allow goldfish-setup to put the emulator in WiFi-only mode" into mnc-dev
* commit '
7e72d990aff9cc9152c534678417b9e5448e0e42':
Allow goldfish-setup to put the emulator in WiFi-only mode
Nick Kralevich [Tue, 19 May 2015 12:52:16 +0000 (12:52 +0000)]
Merge "Allow goldfish-setup to put the emulator in WiFi-only mode" into mnc-dev
Yohann Roussel [Tue, 19 May 2015 09:51:29 +0000 (09:51 +0000)]
am
0a0b640f: Merge "Save Jack default extra args in a file" into mnc-dev
* commit '
0a0b640f50af77215f2c0db9695c6a3494ad1dd3':
Save Jack default extra args in a file
Yohann Roussel [Tue, 19 May 2015 09:27:42 +0000 (09:27 +0000)]
Merge "Save Jack default extra args in a file" into mnc-dev
Nick Kralevich [Tue, 19 May 2015 02:58:08 +0000 (19:58 -0700)]
resolved conflicts for merge of
c434f71b to mnc-dev-plus-aosp
Change-Id: I32ebfab7391089d399a00a7b8b63cdc21e46a0ea
Yu Ning [Mon, 18 May 2015 09:11:37 +0000 (17:11 +0800)]
Allow goldfish-setup to put the emulator in WiFi-only mode
The goldfish-setup service (essentially /system/etc/init.goldfish.sh)
executes the following commands when certain conditions are met:
setprop ro.radio.noril yes
stop ril-daemon
so as to stop the RIL daemon and emulate a WiFi-only device. Both would
fail, though, because goldfish-setup does not have the permissions to
set relevant properties.
This CL modifies the emulator's SELinux policy to grant the necessary
permissions. It is a step towards fixing the ril-daemon-keeps-getting-
killed-and-restarted problem with the new ("ranchu") emulator, which
does not support telephony emulation yet. (The other step is to have
init start goldfish-setup, which will be done in a seperate CL.)
(cherrypicked from commit
33dca8090f8eb1be27e6c6426b7a13a73314e464)
Change-Id: Ice7e7898804b7353ac4a8c49d871b1b2571d7a5f
Signed-off-by: Yu Ning <yu.ning@intel.com>
William Roberts [Mon, 11 May 2015 17:23:59 +0000 (10:23 -0700)]
Update device to use set_prop() macro
(cherrypicked from commit
cccc90163946c0273a165a1ea50f2a87756610c7)
Change-Id: I630ba0178439c935d08062892990d43a3cc1239e
Signed-off-by: William Roberts <william.c.roberts@linux.intel.com>
Nick Kralevich [Tue, 19 May 2015 00:50:05 +0000 (00:50 +0000)]
am
8da1acf8: am
c3b58d4a: Merge "Allow goldfish-setup to put the emulator in WiFi-only mode"
* commit '
8da1acf8b702665ce7891799cdbc86499533cc54':
Allow goldfish-setup to put the emulator in WiFi-only mode
Nick Kralevich [Tue, 19 May 2015 00:36:01 +0000 (00:36 +0000)]
am
c3b58d4a: Merge "Allow goldfish-setup to put the emulator in WiFi-only mode"
* commit '
c3b58d4a8fd89df6122b7b2fdcd7975dc6e2c45b':
Allow goldfish-setup to put the emulator in WiFi-only mode
Nick Kralevich [Tue, 19 May 2015 00:23:43 +0000 (00:23 +0000)]
Merge "Allow goldfish-setup to put the emulator in WiFi-only mode"
Yu Ning [Mon, 18 May 2015 09:11:37 +0000 (17:11 +0800)]
Allow goldfish-setup to put the emulator in WiFi-only mode
The goldfish-setup service (essentially /system/etc/init.goldfish.sh)
executes the following commands when certain conditions are met:
setprop ro.radio.noril yes
stop ril-daemon
so as to stop the RIL daemon and emulate a WiFi-only device. Both would
fail, though, because goldfish-setup does not have the permissions to
set relevant properties.
This CL modifies the emulator's SELinux policy to grant the necessary
permissions. It is a step towards fixing the ril-daemon-keeps-getting-
killed-and-restarted problem with the new ("ranchu") emulator, which
does not support telephony emulation yet. (The other step is to have
init start goldfish-setup, which will be done in a seperate CL.)
Change-Id: Ice7e7898804b7353ac4a8c49d871b1b2571d7a5f
Signed-off-by: Yu Ning <yu.ning@intel.com>
Siva Velusamy [Tue, 19 May 2015 00:12:20 +0000 (00:12 +0000)]
am
70b67acc: Don\'t exclude GPL binaries from the emulator system image
* commit '
70b67accbfb80c9d238c7b2121f3ba6d1691e2b0':
Don't exclude GPL binaries from the emulator system image
Siva Velusamy [Mon, 18 May 2015 19:02:26 +0000 (12:02 -0700)]
Don't exclude GPL binaries from the emulator system image
GPL binaries are allowed on device and emulator as well
b/
20341087
Change-Id: I777dccd0d5442ae2cd0b7e222f6a9beaa3648c37
Vince Harron [Mon, 18 May 2015 20:23:38 +0000 (20:23 +0000)]
am
1dadfec6: Merge "Improved/clarified license guidance for GPL code." into mnc-dev
* commit '
1dadfec6e02cc362ed36e7e39b7cc49b6a00731d':
Improved/clarified license guidance for GPL code.
Vince Harron [Mon, 18 May 2015 19:58:01 +0000 (19:58 +0000)]
Merge "Improved/clarified license guidance for GPL code." into mnc-dev
Dirk Dougherty [Mon, 18 May 2015 19:18:37 +0000 (19:18 +0000)]
am
fd2d4fc9: am
9cf9a6c6: am
a8bbfca3: Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
* commit '
fd2d4fc975f75a8df5b7cbcd1cca893ba3239dc7':
Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
Dirk Dougherty [Mon, 18 May 2015 18:49:35 +0000 (18:49 +0000)]
am
9cf9a6c6: am
a8bbfca3: Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
* commit '
9cf9a6c6dcd9d58024dc115a703feb7bc47098bd':
Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
Yu Ning [Mon, 18 May 2015 17:24:35 +0000 (17:24 +0000)]
am
e9ec053e: Label /dev/ttyGF* as serial_device
* commit '
e9ec053e992a2cce6e0688ad1711b015372c24ae':
Label /dev/ttyGF* as serial_device
Nick Kralevich [Mon, 18 May 2015 17:12:33 +0000 (17:12 +0000)]
am
7b6e1ba2: am
94b4f9a5: Merge "Label /dev/ttyGF* as serial_device"
* commit '
7b6e1ba2fa4edb757ff9e1c08deee9edf06fc1cc':
Label /dev/ttyGF* as serial_device
Nick Kralevich [Mon, 18 May 2015 16:59:31 +0000 (16:59 +0000)]
am
94b4f9a5: Merge "Label /dev/ttyGF* as serial_device"
* commit '
94b4f9a5cfde89b6202db3a8269b24a0917f9ab2':
Label /dev/ttyGF* as serial_device
Yu Ning [Mon, 18 May 2015 06:52:22 +0000 (14:52 +0800)]
Label /dev/ttyGF* as serial_device
In goldfish kernel 3.10, the goldfish_tty device instantiates virtual
serial ports as /dev/ttyGF* (e.g. /dev/ttyGF0), not as /dev/ttyS* as in
goldfish kernel 3.4. However, in the emulator's SELinux security policy,
there is no specific security context assigned to /dev/ttyGF*, and the
one inherited from /dev (u:object_r:device:s0) prevents services such as
qemud and goldfish-logcat from reading and writing ttyGF*. Consequently,
qemud terminates abnormally on the classic x86_64 emulator:
init: Service 'qemud' (pid XXX) exited with status 1
Fix this issue by assigning /dev/ttyGF* the same security context as
/dev/ttyS*.
(cherrypicked from commit
478346792282aba990111d736ba9928c616f9eb6)
Change-Id: Ia7394dc217bd82f566c4d1b7eda3cc8ce3ac612f
Signed-off-by: Yu Ning <yu.ning@intel.com>
Nick Kralevich [Mon, 18 May 2015 16:51:18 +0000 (16:51 +0000)]
Merge "Label /dev/ttyGF* as serial_device"
Yu Ning [Mon, 18 May 2015 06:52:22 +0000 (14:52 +0800)]
Label /dev/ttyGF* as serial_device
In goldfish kernel 3.10, the goldfish_tty device instantiates virtual
serial ports as /dev/ttyGF* (e.g. /dev/ttyGF0), not as /dev/ttyS* as in
goldfish kernel 3.4. However, in the emulator's SELinux security policy,
there is no specific security context assigned to /dev/ttyGF*, and the
one inherited from /dev (u:object_r:device:s0) prevents services such as
qemud and goldfish-logcat from reading and writing ttyGF*. Consequently,
qemud terminates abnormally on the classic x86_64 emulator:
init: Service 'qemud' (pid XXX) exited with status 1
Fix this issue by assigning /dev/ttyGF* the same security context as
/dev/ttyS*.
Change-Id: Ia7394dc217bd82f566c4d1b7eda3cc8ce3ac612f
Signed-off-by: Yu Ning <yu.ning@intel.com>
Yohann Roussel [Wed, 13 May 2015 14:03:28 +0000 (16:03 +0200)]
Save Jack default extra args in a file
Change-Id: I059b36fc71679eb5c95f05ede26d8037c742921b
Dirk Dougherty [Sat, 16 May 2015 00:32:01 +0000 (00:32 +0000)]
am
a8bbfca3: Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
* commit '
a8bbfca3d0ba7da40f9348eeb38badda575fe411':
Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
Dirk Dougherty [Fri, 15 May 2015 05:58:28 +0000 (22:58 -0700)]
Change "M Preview" tab to "Preview", change "monetize" subtab to "Earn". Highlight preview subtab on preview pages. Change "About" link to latest version of Android.
Change-Id: I80124a8a05311976a7c373dfdaf5bb984a9c3bc7
Vince Harron [Fri, 15 May 2015 23:55:30 +0000 (16:55 -0700)]
Improved/clarified license guidance for GPL code.
This messaging approved by Google Open Source Licensing.
Change-Id: I717e8b5003fd856b3e2e6c28394591b5d6939b43
Elliott Hughes [Fri, 15 May 2015 21:08:33 +0000 (21:08 +0000)]
am
b6fb86dd: am
c340a306: Merge "Explain __USE_MINGW_ANSI_STDIO."
* commit '
b6fb86dd7f1b2e8b4225513439546ff7694b3f25':
Explain __USE_MINGW_ANSI_STDIO.
Elliott Hughes [Fri, 15 May 2015 21:01:18 +0000 (21:01 +0000)]
am
c340a306: Merge "Explain __USE_MINGW_ANSI_STDIO."
* commit '
c340a30641ca4ed5c40612f3bfe36b41fadca0c0':
Explain __USE_MINGW_ANSI_STDIO.
Elliott Hughes [Fri, 15 May 2015 20:52:55 +0000 (20:52 +0000)]
Merge "Explain __USE_MINGW_ANSI_STDIO."
Nick Kralevich [Fri, 15 May 2015 19:46:52 +0000 (19:46 +0000)]
am
53df3d67: am
e89b6f5d: Merge "Update device to use set_prop() macro"
* commit '
53df3d67b22b70dff841b41603945d1ae4221246':
Update device to use set_prop() macro
Nick Kralevich [Fri, 15 May 2015 19:34:43 +0000 (19:34 +0000)]
am
e89b6f5d: Merge "Update device to use set_prop() macro"
* commit '
e89b6f5df1b971c27ec85efb5dd41b9012930dcc':
Update device to use set_prop() macro
Nick Kralevich [Fri, 15 May 2015 19:26:56 +0000 (19:26 +0000)]
Merge "Update device to use set_prop() macro"
Daniel Cashman [Fri, 15 May 2015 16:47:40 +0000 (16:47 +0000)]
am
09ee0a42: Merge "Label /dev/goldfish_pipe as qemu_device" into mnc-dev
* commit '
09ee0a4252dbfd811f8345ab095c95ab78a1595f':
Label /dev/goldfish_pipe as qemu_device
Nick Kralevich [Fri, 15 May 2015 16:45:04 +0000 (16:45 +0000)]
am
45d8cf5a: am
cea991d7: Merge "Label /dev/goldfish_pipe as qemu_device"
* commit '
45d8cf5aafd3108c861dadfa85e1177714fee4ae':
Label /dev/goldfish_pipe as qemu_device
Neil Fuller [Fri, 15 May 2015 16:44:57 +0000 (16:44 +0000)]
am
344d54c3: am
abf5ef8f: Merge "Add tzdatacheck to image"
* commit '
344d54c3fb1acca40f58899a0ad7db753fcf3810':
Add tzdatacheck to image
Daniel Cashman [Fri, 15 May 2015 15:42:24 +0000 (15:42 +0000)]
Merge "Label /dev/goldfish_pipe as qemu_device" into mnc-dev
Yu Ning [Thu, 14 May 2015 16:00:35 +0000 (00:00 +0800)]
Label /dev/goldfish_pipe as qemu_device
In goldfish kernel 3.10, qemu_pipe has been renamed to goldfish_pipe.
However, in the emulator's SELinux policy, there is no specific security
context assigned to /dev/goldfish_pipe, and the one inherited from /dev
(u:object_r:device:s0) prevents various processes (qemud, qemu-props,
etc.) from reading and writing goldfish_pipe. Consequently, the classic
x86_64 emulator will not boot if GPU emulation is enabled ("-gpu host"),
and does not render the UI correctly if launched with "-gpu off".
Fix this issue by assigning /dev/goldfish_pipe the same security context
as /dev/qemu_pipe.
This CL also benefits the new ("ranchu") emulator, where all supported
ABIs (arm64, mips64, x86 and x86_64) use 3.10-based kernels. Without
this fix, the new emulator boots and works, but there are avc denials
related to goldfish_pipe.
Last but not least, it is now possible to boot the classic x86 emulator
with a 3.10-based kernel instead of the current 3.4-based one, without
disabling SELinux.
(cherry-pick of commit:
a5053e6b35fa1188d94a851a3032126141e5c87f)
Change-Id: I52e75c94d3ae3758cbbf5bc0e1d84254fdf5c6cb
Signed-off-by: Yu Ning <yu.ning@intel.com>
Nick Kralevich [Fri, 15 May 2015 13:10:55 +0000 (13:10 +0000)]
am
cea991d7: Merge "Label /dev/goldfish_pipe as qemu_device"
* commit '
cea991d7785d9a6f1f520f2d82f946930ef21bf1':
Label /dev/goldfish_pipe as qemu_device
Nick Kralevich [Fri, 15 May 2015 13:00:25 +0000 (13:00 +0000)]
Merge "Label /dev/goldfish_pipe as qemu_device"
Neil Fuller [Fri, 15 May 2015 09:30:35 +0000 (09:30 +0000)]
am
abf5ef8f: Merge "Add tzdatacheck to image"
* commit '
abf5ef8fdd96cee524f8d6518b19f8092d6a6e46':
Add tzdatacheck to image
Neil Fuller [Fri, 15 May 2015 09:09:44 +0000 (09:09 +0000)]
Merge "Add tzdatacheck to image"
Yu Ning [Thu, 14 May 2015 16:00:35 +0000 (00:00 +0800)]
Label /dev/goldfish_pipe as qemu_device
In goldfish kernel 3.10, qemu_pipe has been renamed to goldfish_pipe.
However, in the emulator's SELinux policy, there is no specific security
context assigned to /dev/goldfish_pipe, and the one inherited from /dev
(u:object_r:device:s0) prevents various processes (qemud, qemu-props,
etc.) from reading and writing goldfish_pipe. Consequently, the classic
x86_64 emulator will not boot if GPU emulation is enabled ("-gpu host"),
and does not render the UI correctly if launched with "-gpu off".
Fix this issue by assigning /dev/goldfish_pipe the same security context
as /dev/qemu_pipe.
This CL also benefits the new ("ranchu") emulator, where all supported
ABIs (arm64, mips64, x86 and x86_64) use 3.10-based kernels. Without
this fix, the new emulator boots and works, but there are avc denials
related to goldfish_pipe.
Last but not least, it is now possible to boot the classic x86 emulator
with a 3.10-based kernel instead of the current 3.4-based one, without
disabling SELinux.
Change-Id: Iad979c0ee9d0a410be12b83ac1bef9476b50a6dc
Signed-off-by: Yu Ning <yu.ning@intel.com>
Elliott Hughes [Fri, 15 May 2015 03:55:49 +0000 (20:55 -0700)]
Explain __USE_MINGW_ANSI_STDIO.
Change-Id: I6900a7cddfb5aa4365c3e0f6f6f0fa9203c0fe43
Tao Bao [Thu, 14 May 2015 22:16:55 +0000 (22:16 +0000)]
am
1a833d24: Merge "Add support for clobbered blocks" into mnc-dev
* commit '
1a833d24c466f4bf765d0f00d02dded9aad0477b':
Add support for clobbered blocks
Tao Bao [Thu, 14 May 2015 21:54:20 +0000 (21:54 +0000)]
Merge "Add support for clobbered blocks" into mnc-dev
Neil Fuller [Thu, 14 May 2015 19:27:45 +0000 (19:27 +0000)]
am
f9f9c3f3: Merge "Add tzdatacheck to image" into mnc-dev
* commit '
f9f9c3f31e85a96aeb13af065d8eb8dbf33dd05c':
Add tzdatacheck to image
Ying Wang [Thu, 14 May 2015 16:35:30 +0000 (16:35 +0000)]
am
7ffd7c20: am
df5c798f: Merge "[MIPS] Temporarily disable Mips shared-textrel errors"
* commit '
7ffd7c207be55b86416845dbd5ffa8f69518ab68':
[MIPS] Temporarily disable Mips shared-textrel errors
Ying Wang [Thu, 14 May 2015 16:26:33 +0000 (16:26 +0000)]
am
df5c798f: Merge "[MIPS] Temporarily disable Mips shared-textrel errors"
* commit '
df5c798f368bc16a858281b4d5d0ecc2b7040cfe':
[MIPS] Temporarily disable Mips shared-textrel errors
Ying Wang [Thu, 14 May 2015 16:11:58 +0000 (16:11 +0000)]
Merge "[MIPS] Temporarily disable Mips shared-textrel errors"
Jeff Vander Stoep [Thu, 14 May 2015 15:51:46 +0000 (15:51 +0000)]
am
dfd58ba5: am
7033819e: Merge "Remove unused #include <selinux/android.h>"
* commit '
dfd58ba54e4a4e5d3a5aa2527a9e48b344f37894':
Remove unused #include <selinux/android.h>
Jeff Vander Stoep [Thu, 14 May 2015 15:41:45 +0000 (15:41 +0000)]
am
7033819e: Merge "Remove unused #include <selinux/android.h>"
* commit '
7033819eeba08f9e550bc50fd1b01625d5f7e673':
Remove unused #include <selinux/android.h>
Jeff Vander Stoep [Thu, 14 May 2015 15:27:50 +0000 (15:27 +0000)]
Merge "Remove unused #include <selinux/android.h>"
Neil Fuller [Wed, 13 May 2015 16:47:29 +0000 (17:47 +0100)]
Add tzdatacheck to image
Bug:
21110439
Bug:
19941636
(cherry picked from commit
7d18a684177064a74dafbba8cc2f270f911936bf)
Change-Id: I29ab303d2695ba1cadf70c2d2f4440d34a8cede9
Neil Fuller [Thu, 14 May 2015 10:15:00 +0000 (10:15 +0000)]
Merge "Add tzdatacheck to image" into mnc-dev
Neil Fuller [Wed, 13 May 2015 16:47:29 +0000 (17:47 +0100)]
Add tzdatacheck to image
Bug:
21110439
Bug:
19941636
Change-Id: I743236d9c7b433968865648ffae25451c6012a5f
David Friedman [Thu, 14 May 2015 01:45:01 +0000 (01:45 +0000)]
am
8025e285: am
802f05f0: am
2f9407e1: am
f004b114: am
302e2f9c: Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
* commit '
8025e2854e31decd672e938fc94cd735ee9071e2':
Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
Filip Gruszczynski [Thu, 14 May 2015 00:55:58 +0000 (00:55 +0000)]
am
8eade31f: am
7fbb988d: Merge "Add percent library to support libraries build." into lmp-mr1-ub-dev
* commit '
8eade31f989224d006f012364ab91f1c9a102c5c':
Add percent library to support libraries build.
David Friedman [Thu, 14 May 2015 00:00:12 +0000 (00:00 +0000)]
am
802f05f0: am
2f9407e1: am
f004b114: am
302e2f9c: Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
* commit '
802f05f0e47ab15955b0c460db0c751b982a6f34':
Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
David Friedman [Wed, 13 May 2015 23:46:38 +0000 (23:46 +0000)]
am
2f9407e1: am
f004b114: am
302e2f9c: Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
* commit '
2f9407e197242eb3a9db188f901369e09e11a152':
Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
Filip Gruszczynski [Wed, 13 May 2015 23:46:29 +0000 (23:46 +0000)]
am
7fbb988d: Merge "Add percent library to support libraries build." into lmp-mr1-ub-dev
* commit '
7fbb988da154ad91461c3d51994ae0ff99d94032':
Add percent library to support libraries build.
Filip Gruszczynski [Wed, 13 May 2015 23:32:06 +0000 (23:32 +0000)]
Merge "Add percent library to support libraries build." into lmp-mr1-ub-dev
David Friedman [Wed, 13 May 2015 23:30:43 +0000 (23:30 +0000)]
am
f004b114: am
302e2f9c: Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
* commit '
f004b1149db26f24188eeaa1fe65a4743c4e9b31':
Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
David Friedman [Wed, 13 May 2015 23:16:45 +0000 (23:16 +0000)]
am
302e2f9c: Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
* commit '
302e2f9cb58de33c529b6ac02421fb0b63b7fcb0':
Docs: Modified .cs page to reflect removal of 32-bit Darwin as NDK download option.
Dirk Dougherty [Wed, 13 May 2015 22:13:32 +0000 (22:13 +0000)]
am
02a80261: am
7a72fdd4: am
f97b2ef2: Style and template updates to support responsive layout, mobile nav, email signup, updated styles (sync2).
* commit '
02a80261437839655900732718e5149c27979de8':
Style and template updates to support responsive layout, mobile nav, email signup, updated styles (sync2).
dcashman [Wed, 13 May 2015 22:03:35 +0000 (22:03 +0000)]
am
c0ba40b8: Merge "Remove libc++ from prepackaged shared libs in cts." into mnc-dev
* commit '
c0ba40b8a17669b9938008f826cef88aa791c828':
Remove libc++ from prepackaged shared libs in cts.
Dirk Dougherty [Wed, 13 May 2015 21:44:39 +0000 (21:44 +0000)]
am
7a72fdd4: am
f97b2ef2: Style and template updates to support responsive layout, mobile nav, email signup, updated styles (sync2).
* commit '
7a72fdd4e46c907c7deac8e6cd75df156ec244f0':
Style and template updates to support responsive layout, mobile nav, email signup, updated styles (sync2).
Dirk Dougherty [Wed, 13 May 2015 21:34:56 +0000 (21:34 +0000)]
am
f97b2ef2: Style and template updates to support responsive layout, mobile nav, email signup, updated styles (sync2).
* commit '
f97b2ef21a9940ec7a41c9116a79f9b2a36e0c1d':
Style and template updates to support responsive layout, mobile nav, email signup, updated styles (sync2).
Elliott Hughes [Wed, 13 May 2015 21:34:09 +0000 (21:34 +0000)]
am
385cdb78: am
0dac6788: Merge "Revert "Revert "Turn on _FORTIFY_SOURCE=2 for the host."""
* commit '
385cdb7855bfb3983d21fe7344d56d863f638985':
Revert "Revert "Turn on _FORTIFY_SOURCE=2 for the host.""
Jeff Vander Stoep [Wed, 13 May 2015 21:24:04 +0000 (14:24 -0700)]
Remove unused #include <selinux/android.h>
Change-Id: Iebc59784c7318edb1c1f686e040ed581259bdd5a
Elliott Hughes [Wed, 13 May 2015 21:22:17 +0000 (21:22 +0000)]
am
0dac6788: Merge "Revert "Revert "Turn on _FORTIFY_SOURCE=2 for the host."""
* commit '
0dac67880b6e1ddec9d4aa5ed741e2f62bd96284':
Revert "Revert "Turn on _FORTIFY_SOURCE=2 for the host.""
Elliott Hughes [Wed, 13 May 2015 21:13:10 +0000 (21:13 +0000)]
am
56ad4250: am
1d8e8c96: Merge "Add libbenchmark\'s new dependency on libbase."
* commit '
56ad4250257004a3281db9c703cba4eb8cd6ada4':
Add libbenchmark's new dependency on libbase.
Elliott Hughes [Wed, 13 May 2015 21:12:21 +0000 (21:12 +0000)]
Merge "Revert "Revert "Turn on _FORTIFY_SOURCE=2 for the host."""
Elliott Hughes [Wed, 13 May 2015 21:00:53 +0000 (21:00 +0000)]
am
1d8e8c96: Merge "Add libbenchmark\'s new dependency on libbase."
* commit '
1d8e8c96941fb9ea9a7980104506ab9dbdfc2e68':
Add libbenchmark's new dependency on libbase.
Dirk Dougherty [Wed, 13 May 2015 04:23:05 +0000 (21:23 -0700)]
Style and template updates to support responsive layout, mobile nav, email signup, updated styles (sync2).
Change-Id: I6e33dd10e1c9e8b378080464b4b70ac6b10df8b7
Elliott Hughes [Wed, 13 May 2015 20:53:32 +0000 (20:53 +0000)]
Merge "Add libbenchmark's new dependency on libbase."
Elliott Hughes [Wed, 13 May 2015 20:47:30 +0000 (13:47 -0700)]
Add libbenchmark's new dependency on libbase.
Change-Id: I6f9700b3e51a3b681d3d91b88103eed31764f61e
Elliott Hughes [Wed, 13 May 2015 20:29:40 +0000 (20:29 +0000)]
am
463377d0: am
2a3034b3: Merge "Revert "Turn on _FORTIFY_SOURCE=2 for the host.""
* commit '
463377d0c43a7a0e096d5d428b161061863089bb':
Revert "Turn on _FORTIFY_SOURCE=2 for the host."
Elliott Hughes [Wed, 13 May 2015 20:29:38 +0000 (20:29 +0000)]
am
35fb49df: am
b58119ea: Merge "Turn on _FORTIFY_SOURCE=2 for the host."
* commit '
35fb49df32f0f115f93cce04f7e0fe1be2301b83':
Turn on _FORTIFY_SOURCE=2 for the host.
Tao Bao [Wed, 13 May 2015 20:29:37 +0000 (20:29 +0000)]
am
412a5c3f: am
2f7ae925: Merge "Add support for clobbered blocks"
* commit '
412a5c3f52dafcb21fb86d6ca6bb5fd3deed90a4':
Add support for clobbered blocks
Tao Bao [Wed, 13 May 2015 20:29:35 +0000 (20:29 +0000)]
am
84d3af3e: am
dc618332: Merge "Add bootsigner path as an option"
* commit '
84d3af3eaa58930754327fb04444bac48beaa750':
Add bootsigner path as an option
dcashman [Wed, 13 May 2015 20:20:05 +0000 (13:20 -0700)]
resolved conflicts for merge of
eab5ab5d to mnc-dev-plus-aosp
Change-Id: Ic7ba16887aa778fad6911a4bfb155e91b9b3c88e
Elliott Hughes [Wed, 13 May 2015 20:15:19 +0000 (20:15 +0000)]
Revert "Revert "Turn on _FORTIFY_SOURCE=2 for the host.""
This reverts commit
e27b214fc248d8927c42c5529d5c9fe75e2591aa.
Change-Id: I3d739c0594dbe4ecd62c5b07064ada7de6cdaadb
Elliott Hughes [Wed, 13 May 2015 19:39:55 +0000 (19:39 +0000)]
am
2a3034b3: Merge "Revert "Turn on _FORTIFY_SOURCE=2 for the host.""
* commit '
2a3034b33650b68e6b8335b9698e9330079c6ef6':
Revert "Turn on _FORTIFY_SOURCE=2 for the host."