OSDN Git Service
Ying Wang [Tue, 12 Jan 2016 18:57:03 +0000 (18:57 +0000)]
Merge "Generate .c for .y and .l"
am:
873eeec194
* commit '
873eeec1944c46cd50779cd4fc8d4cd8ca0457ea':
Generate .c for .y and .l
Ying Wang [Tue, 12 Jan 2016 18:56:53 +0000 (18:56 +0000)]
Merge "Move "include configure_local_jack.mk""
am:
5799af6563
* commit '
5799af6563c2da0a3730f1d4e007052c429ccaf8':
Move "include configure_local_jack.mk"
Ying Wang [Tue, 12 Jan 2016 17:35:30 +0000 (17:35 +0000)]
Merge "Generate .c for .y and .l"
Ying Wang [Tue, 12 Jan 2016 17:34:26 +0000 (17:34 +0000)]
Merge "Move "include configure_local_jack.mk""
Ying Wang [Tue, 12 Jan 2016 00:28:45 +0000 (16:28 -0800)]
Generate .c for .y and .l
- For .l/.y source files, generate .c files; for .ll/.yy source files,
generate c++ files.
- Simplified the rules by adding the generated sources to
my_generated_sources.
- Simplified generated header file naming by always using .h extension
with bison's "--defines=" option.
- Removed the unnecesarry conditional inclusion to the generated
headers. Bison already automatically generates such things.
Bug:
26492989
Change-Id: I9ab6dc149c258f7642bc36c3fa32f90ff7ee51a4
Zach Jang [Tue, 12 Jan 2016 01:40:37 +0000 (01:40 +0000)]
Updating security patch string to 2016-03-01 am:
c24c6ccd4d am:
293887c43e am:
53e7d9bf7f am:
c9da4cce57 am:
6c61548bb7 am:
6facd249d5 am:
1b29f2f9c9
am:
b0b568b5c8
* commit '
b0b568b5c8731e40c53a6bfc3149a3720d1a2570':
Updating security patch string to 2016-03-01
Zach Jang [Tue, 12 Jan 2016 01:38:31 +0000 (01:38 +0000)]
Updating security patch string to 2016-03-01 am:
c24c6ccd4d am:
293887c43e am:
53e7d9bf7f am:
c9da4cce57 am:
6c61548bb7 am:
6facd249d5
am:
1b29f2f9c9
* commit '
1b29f2f9c97bc1b099712cd7c93c31e7f7a18ad1':
Updating security patch string to 2016-03-01
Zach Jang [Tue, 12 Jan 2016 01:35:21 +0000 (01:35 +0000)]
Updating security patch string to 2016-03-01 am:
c24c6ccd4d am:
293887c43e am:
53e7d9bf7f am:
c9da4cce57 am:
6c61548bb7
am:
6facd249d5
* commit '
6facd249d51ffef6afa369b11041ae07733883b8':
Updating security patch string to 2016-03-01
Zach Jang [Tue, 12 Jan 2016 01:33:23 +0000 (01:33 +0000)]
Updating security patch string to 2016-03-01 am:
c24c6ccd4d am:
293887c43e am:
53e7d9bf7f am:
c9da4cce57
am:
6c61548bb7
* commit '
6c61548bb7e426704760c9351e3211fb45d67dae':
Updating security patch string to 2016-03-01
Zach Jang [Tue, 12 Jan 2016 01:30:53 +0000 (01:30 +0000)]
Updating security patch string to 2016-03-01 am:
c24c6ccd4d am:
293887c43e am:
53e7d9bf7f
am:
c9da4cce57
* commit '
c9da4cce57d387f52b675d1024459af5e73c6dbc':
Updating security patch string to 2016-03-01
Zach Jang [Tue, 12 Jan 2016 01:28:37 +0000 (01:28 +0000)]
Updating security patch string to 2016-03-01 am:
c24c6ccd4d am:
293887c43e
am:
53e7d9bf7f
* commit '
53e7d9bf7f298c438157dccc5222b7484b083d9e':
Updating security patch string to 2016-03-01
Zach Jang [Tue, 12 Jan 2016 01:26:41 +0000 (01:26 +0000)]
Updating security patch string to 2016-03-01 am:
c24c6ccd4d
am:
293887c43e
* commit '
293887c43ee5b797f8628f5983f64bf766002009':
Updating security patch string to 2016-03-01
Zach Jang [Tue, 12 Jan 2016 01:24:55 +0000 (01:24 +0000)]
Updating security patch string to 2016-03-01
am:
c24c6ccd4d
* commit '
c24c6ccd4d5de8be010b74b9021b8fdb926e1dad':
Updating security patch string to 2016-03-01
Zach Jang [Tue, 12 Jan 2016 01:12:37 +0000 (17:12 -0800)]
Updating security patch string to 2016-03-01
b/
26499556
Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733
Ying Wang [Mon, 11 Jan 2016 21:34:16 +0000 (13:34 -0800)]
Move "include configure_local_jack.mk"
Move "include configure_local_jack.mk" out of the scope of
"ifdef LOCAL_RESOURCE_DIR".
Change-Id: I67bbb4e6b59414559219d24136ff91ba799fda25
Narayan Kamath [Mon, 11 Jan 2016 11:43:46 +0000 (11:43 +0000)]
Merge "Remove libsqlite_jni from all product configs."
am:
4203ee20f1
* commit '
4203ee20f13b1dd3ec9100f5045c19541f70da33':
Remove libsqlite_jni from all product configs.
Narayan Kamath [Mon, 11 Jan 2016 11:39:15 +0000 (11:39 +0000)]
Merge "Remove libsqlite_jni from all product configs."
Gina Dimino [Fri, 8 Jan 2016 18:37:02 +0000 (18:37 +0000)]
Merge "Docs: Changing text on Feedback button. Bug:
26452230"
am:
49d5d5576e
* commit '
49d5d5576e714a733b952506bcc49d660d8a4afb':
Docs: Changing text on Feedback button. Bug:
26452230
Gina Dimino [Fri, 8 Jan 2016 18:31:38 +0000 (18:31 +0000)]
Merge "Docs: Changing text on Feedback button. Bug:
26452230"
Narayan Kamath [Fri, 8 Jan 2016 11:02:36 +0000 (11:02 +0000)]
Remove libsqlite_jni from all product configs.
It's only used by libcore tests so there's no need to ship it on
all products.
bug:
26457850
Change-Id: I907f781d215e94e1cbf554d81fda9e6eed07a4de
Tianjie Xu [Fri, 8 Jan 2016 00:54:12 +0000 (00:54 +0000)]
Merge "Check block0 for remounting partition R/W"
am:
0b109751b8
* commit '
0b109751b8f767e9191f1d84f345ee70690be9fa':
Check block0 for remounting partition R/W
Tianjie Xu [Fri, 8 Jan 2016 00:49:49 +0000 (00:49 +0000)]
Merge "Check block0 for remounting partition R/W"
Gina Dimino [Fri, 8 Jan 2016 00:22:36 +0000 (16:22 -0800)]
Docs: Changing text on Feedback button.
Bug:
26452230
Change-Id: I716b773ed649dea4634f3db3fcb9daba0d0fab86
Shinichiro Hamaji [Thu, 7 Jan 2016 05:17:27 +0000 (05:17 +0000)]
Merge "Have symbol versions in .so.toc files"
am:
c610c42b99
* commit '
c610c42b99c0f9570492731911199ae75d1ad9c0':
Have symbol versions in .so.toc files
Shinichiro Hamaji [Thu, 7 Jan 2016 05:14:37 +0000 (05:14 +0000)]
Merge "Have symbol versions in .so.toc files"
Josh Gao [Wed, 6 Jan 2016 22:54:05 +0000 (22:54 +0000)]
Merge "Kill BOARD_MALLOC_ALIGNMENT."
am:
1ad7edd5e4
* commit '
1ad7edd5e46793bee4450a7d6deadc39538dbf54':
Kill BOARD_MALLOC_ALIGNMENT.
Josh Gao [Wed, 6 Jan 2016 22:49:30 +0000 (22:49 +0000)]
Merge "Kill BOARD_MALLOC_ALIGNMENT."
Josh Gao [Wed, 6 Jan 2016 22:08:26 +0000 (14:08 -0800)]
Kill BOARD_MALLOC_ALIGNMENT.
Bug: http://b/
26403338
Change-Id: I55d2c417d972f78caddc5fb28a065807feb86b0a
Josh Gao [Wed, 6 Jan 2016 20:30:24 +0000 (20:30 +0000)]
Merge "Replace MALLOC_IMPL with MALLOC_SVELTE."
am:
9fb0221abe
* commit '
9fb0221abedf9c8aadbe0d5efd7797ff9b293a46':
Replace MALLOC_IMPL with MALLOC_SVELTE.
Josh Gao [Wed, 6 Jan 2016 20:08:13 +0000 (20:08 +0000)]
Merge "Replace MALLOC_IMPL with MALLOC_SVELTE."
Gina Dimino [Wed, 6 Jan 2016 17:41:52 +0000 (17:41 +0000)]
Merge "Docs: Encode URL input to search box Bug:
26287939"
am:
634e4a2a39
* commit '
634e4a2a39b32df838d750374ce390fa25f1710b':
Docs: Encode URL input to search box Bug:
26287939
Gina Dimino [Wed, 6 Jan 2016 17:37:04 +0000 (17:37 +0000)]
Merge "Docs: Encode URL input to search box Bug:
26287939"
Shinichiro Hamaji [Wed, 6 Jan 2016 06:13:25 +0000 (15:13 +0900)]
Have symbol versions in .so.toc files
Use readelf --dyn-syms instead of nm, filtering out addresses
and sizes of symbols.
Bug:
26412928
Change-Id: I061ffb428076a79c7b255381ae4d4f8a8e7a4bd7
Gina Dimino [Tue, 5 Jan 2016 23:00:36 +0000 (15:00 -0800)]
Docs: Encode URL input to search box
Bug:
26287939
Change-Id: Ica656034412b517e182333f5fe4f6e9bc5f300f3
Josh Gao [Tue, 5 Jan 2016 20:56:35 +0000 (12:56 -0800)]
Replace MALLOC_IMPL with MALLOC_SVELTE.
Bug: http://b/
26390299
Change-Id: Ib1bef4aa272033412bea57a9bccf1d67793d2bda
Elliott Hughes [Tue, 5 Jan 2016 17:48:29 +0000 (17:48 +0000)]
Merge "Clean up Mac OS hacks in acp slightly."
am:
0e80edd259
* commit '
0e80edd259d1ce7f35d8c9841f88296416c1e2cf':
Clean up Mac OS hacks in acp slightly.
Elliott Hughes [Tue, 5 Jan 2016 17:36:09 +0000 (17:36 +0000)]
Merge "Clean up Mac OS hacks in acp slightly."
Elliott Hughes [Tue, 5 Jan 2016 17:26:54 +0000 (09:26 -0800)]
Clean up Mac OS hacks in acp slightly.
Change-Id: I7cba3a345cd8907ae050961cc4f173003ac90f39
Narayan Kamath [Tue, 5 Jan 2016 17:19:15 +0000 (17:19 +0000)]
Merge "CopyFile: Remove bogus reference to HAVE_VALID_STAT_ST_INO"
am:
b11bf3f70c
* commit '
b11bf3f70cfefd170fb4d668b9b8fabadd8959e1':
CopyFile: Remove bogus reference to HAVE_VALID_STAT_ST_INO
Narayan Kamath [Tue, 5 Jan 2016 17:15:35 +0000 (17:15 +0000)]
Merge "CopyFile: Remove bogus reference to HAVE_VALID_STAT_ST_INO"
Narayan Kamath [Tue, 5 Jan 2016 16:16:37 +0000 (16:16 +0000)]
CopyFile: Remove bogus reference to HAVE_VALID_STAT_ST_INO
This was never defined anywhere and only Windows doesn't have
a valid st_ino field on struct stat.
bug:
26355387
Change-Id: I40b8779606057281e2e6a2723ef93cd2f2d99a68
Dan Willemsen [Tue, 5 Jan 2016 05:52:06 +0000 (05:52 +0000)]
Merge "Prevent changes to COMMON_GLOBAL_C(PP)FLAGS"
am:
d443abf1aa
* commit '
d443abf1aaa12c1b0fb82c940df60046c06aaed7':
Prevent changes to COMMON_GLOBAL_C(PP)FLAGS
Dan Willemsen [Tue, 5 Jan 2016 05:47:43 +0000 (05:47 +0000)]
Merge "Prevent changes to COMMON_GLOBAL_C(PP)FLAGS"
Tao Bao [Mon, 4 Jan 2016 19:51:30 +0000 (19:51 +0000)]
Merge "Build delta_generator for A/B update."
am:
bf4213ebae
* commit '
bf4213ebaee1c505fa5070419aba4cd5ddccaae2':
Build delta_generator for A/B update.
Tao Bao [Mon, 4 Jan 2016 19:46:55 +0000 (19:46 +0000)]
Merge "Build delta_generator for A/B update."
Tao Bao [Mon, 4 Jan 2016 17:57:32 +0000 (09:57 -0800)]
Build delta_generator for A/B update.
delta_generator computes the OTA package (aka payload) for A/B update.
Also add its dependent libraries into otatools.zip.
Bug:
25715402
Change-Id: Iddf4b9ac188cc4c8bf3f89ce3641d68451632ba1
Christopher Wiley [Mon, 4 Jan 2016 17:02:44 +0000 (17:02 +0000)]
Merge "Fix compiler warnings on Windows in CopyFile.c"
am:
b327f61f50
* commit '
b327f61f50c5bf42dc61f5d1bc946f7e4edb7ccf':
Fix compiler warnings on Windows in CopyFile.c
Christopher Wiley [Mon, 4 Jan 2016 16:59:58 +0000 (16:59 +0000)]
Merge "Fix compiler warnings on Windows in CopyFile.c"
Christopher Wiley [Wed, 30 Dec 2015 20:24:40 +0000 (12:24 -0800)]
Fix compiler warnings on Windows in CopyFile.c
direct.h declares _mkdir() on Windows.
Prevent future compiler warnings with -Wall and -Werror.
Bug:
26355209
Test: `mmma -j30 build/libs/host` for aosp_arm64-eng is successful.
Change-Id: I6d6e4edca98bef57d62829e9d1ef4e2a96cdad3d
Christopher Wiley [Wed, 30 Dec 2015 19:09:42 +0000 (19:09 +0000)]
Merge "Fix unused parameter warnings in CopyFile.c"
am:
530d99446a
* commit '
530d99446a02912387ea45c1d1d35a7d1bd39829':
Fix unused parameter warnings in CopyFile.c
Christopher Wiley [Wed, 30 Dec 2015 19:06:32 +0000 (19:06 +0000)]
Merge "Fix unused parameter warnings in CopyFile.c"
Christopher Wiley [Wed, 30 Dec 2015 18:43:22 +0000 (10:43 -0800)]
Fix unused parameter warnings in CopyFile.c
Bug:
26355209
Test: Compiles
Change-Id: I6f804f150ec08de5a1b3272ae59bc921dd6d0c9c
Narayan Kamath [Wed, 30 Dec 2015 11:47:12 +0000 (11:47 +0000)]
Merge "Revert "Temporary workaround to build bouncycastle / nist-pkits""
am:
54a5e368fe
* commit '
54a5e368fea461a265374db9ecf2c0b4c6825460':
Revert "Temporary workaround to build bouncycastle / nist-pkits"
Narayan Kamath [Wed, 30 Dec 2015 11:43:35 +0000 (11:43 +0000)]
Merge "Revert "Temporary workaround to build bouncycastle / nist-pkits""
Narayan Kamath [Thu, 24 Dec 2015 12:39:51 +0000 (12:39 +0000)]
Revert "Temporary workaround to build bouncycastle / nist-pkits"
This reverts commit
3006881f84c9abf1ab85b77ecd4e815c4cb880d0.
Narayan Kamath [Thu, 24 Dec 2015 12:04:50 +0000 (12:04 +0000)]
Merge changes from topic \'aosp-merge-24-12\'
am:
8b9589216d
* commit '
8b9589216dd8c2a644dab9623952b5fd8a32e550':
Temporary workaround to build bouncycastle / nist-pkits
Build: Build changes for multi oat/image support.
Allow modules to override the default NOTICE file.
Track introduction of libopenjdkjvm.
Allow for 5200 words in dump-words-to-file
Update the package whitelist for the boot image.
Use core-oj alongside core-libart wherever required.
Narayan Kamath [Thu, 24 Dec 2015 11:56:45 +0000 (11:56 +0000)]
Merge changes from topic 'aosp-merge-24-12'
* changes:
Temporary workaround to build bouncycastle / nist-pkits
Build: Build changes for multi oat/image support.
Allow modules to override the default NOTICE file.
Track introduction of libopenjdkjvm.
Allow for 5200 words in dump-words-to-file
Update the package whitelist for the boot image.
Use core-oj alongside core-libart wherever required.
Narayan Kamath [Thu, 24 Dec 2015 11:35:24 +0000 (11:35 +0000)]
Temporary workaround to build bouncycastle / nist-pkits
Change-Id: I20bb834f08eeff03f627ab7d8f422a5ba9f3eb1a
Jeff Hao [Thu, 17 Dec 2015 01:20:11 +0000 (17:20 -0800)]
Build: Build changes for multi oat/image support.
Use the --multi-image option to generate a preopted boot image. This
generates a separate oat file and image file output for each dex file
input.
Stop inlining core.
(cherry picked from commit
d1d3fd933f3d79dfffc12c68a21ae1a1e1b21cc0)
Change-Id: Ibd23bc06d346ff404cabd88f7461f041af6016dd
Narayan Kamath [Tue, 22 Dec 2015 14:34:09 +0000 (14:34 +0000)]
Allow modules to override the default NOTICE file.
It's useful in projects where different top level modules have
different licenses associated with them.
(cherry picked from commit
3026f4daf11b2d4729559d49624e748a82f15495)
Change-Id: I71b20d6f979c0f50562f4f44b2af1f3ec2909444
Narayan Kamath [Fri, 18 Dec 2015 11:10:53 +0000 (11:10 +0000)]
Track introduction of libopenjdkjvm.
(cherry picked from commit
2eb52037e8c06473d0d8de7fb68acc5beccdc6ba)
Change-Id: Ib8683d7e628ae4b09f359ecedc93f77199205cef
Przemyslaw Szczepaniak [Fri, 20 Nov 2015 15:05:03 +0000 (15:05 +0000)]
Allow for 5200 words in dump-words-to-file
After switching to OpenJdk, doc-comment-check target
started to fail due to "Too many words (5082)" while
generating out/target/common/docs/doc-comment-check-timestamp.rsp
This change extends number of dumped words to 5200.
Bug:
25758743
(cherry picked from commit
972a2681c6cb1992886195b9e69234ef786cb876)
Change-Id: I9b8516d1e7c113d667dcfb7963ee352972677afa
Narayan Kamath [Tue, 17 Nov 2015 18:34:53 +0000 (18:34 +0000)]
Update the package whitelist for the boot image.
.. to track the inclusion of OpenJdk.
(cherry picked from commit
b3c9e4a22ee6d32a99a5c9a7b833e2644a690c82)
Change-Id: Ie7277a0403dee9ccd114d9dcb7bf95cdaf5688a0
Piotr Jastrzebski [Tue, 17 Feb 2015 16:55:52 +0000 (16:55 +0000)]
Use core-oj alongside core-libart wherever required.
With some core classes moved to separate core-oj jar
we need to use the new jar.
(cherry picked from commit
89b94c827f92e107b286ab60876ff9f75ba22a33)
Change-Id: I025c0adc70535bf23def3ab0ce28a1bfaef72514
Nick Kralevich [Wed, 23 Dec 2015 20:27:00 +0000 (20:27 +0000)]
Merge "set ro.adb.secure=1 for user builds"
am:
f9911ae087
* commit '
f9911ae087189c26e0ef8a2334233116a8944aa7':
set ro.adb.secure=1 for user builds
Nick Kralevich [Wed, 23 Dec 2015 20:22:30 +0000 (20:22 +0000)]
Merge "set ro.adb.secure=1 for user builds"
Daniel Micay [Wed, 16 Dec 2015 21:42:49 +0000 (16:42 -0500)]
set ro.adb.secure=1 for user builds
In user builds, adb without authentication is always disabled. However,
it doesn't work with the defaults because authentication doesn't work
without having ro.adb.secure=1 set. It makes sense to offer builds with
no adb but not builds with adb present in an unusable state (especially
as the default).
Bug:
22220212
Bug:
21862859
Change-Id: Ic22300a70586fd57692ac59d6873ab16dde70919
Tao Bao [Tue, 22 Dec 2015 22:27:04 +0000 (14:27 -0800)]
Merge "Makefile: Clean up the condition for RECOVERY_RESOURCE_ZIP."
am:
9d4dbe09ed
* commit '
9d4dbe09edcaeccd461138b5aefceb76759f5fd9':
Makefile: Clean up the condition for RECOVERY_RESOURCE_ZIP.
Tao Bao [Tue, 22 Dec 2015 22:22:44 +0000 (22:22 +0000)]
Merge "Makefile: Clean up the condition for RECOVERY_RESOURCE_ZIP."
Dan Willemsen [Tue, 22 Dec 2015 22:15:47 +0000 (14:15 -0800)]
Merge "Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST"
am:
d52953e9ed
* commit '
d52953e9ed3a9625a61548234575acd4f0bbe87a':
Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST
Dan Willemsen [Tue, 22 Dec 2015 22:05:30 +0000 (22:05 +0000)]
Merge "Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST"
Tao Bao [Tue, 22 Dec 2015 17:47:46 +0000 (09:47 -0800)]
Makefile: Clean up the condition for RECOVERY_RESOURCE_ZIP.
Change-Id: I6909d4572bd54da48f7fd6b76d4a5ee03c84206c
Yohann Roussel [Tue, 22 Dec 2015 14:03:54 +0000 (14:03 +0000)]
Merge "Always start jack server before first call to jack"
am:
4a01711267
* commit '
4a017112672901130c7ceb6c778f1ca243f2dd49':
Always start jack server before first call to jack
Yohann Roussel [Tue, 22 Dec 2015 13:59:49 +0000 (13:59 +0000)]
Merge "Always start jack server before first call to jack"
Dan Willemsen [Tue, 22 Dec 2015 00:34:25 +0000 (16:34 -0800)]
Default LOCAL_MULTILIB:=both for HOST_NATIVE_TEST
The target BUILD_NATIVE_TEST defaults to building both 32 and 64-bit
versions of the tests. Many of our host tests have opted into this
manually, but some have not. Switch the default on the host tests to
stay consistent.
To preserve script compatibility, a symlink remains pointing to the
binary that would have been built before this change.
Change-Id: I9585984e933c2ac36134fc1968736c0bb5fea7be
Shinichiro Hamaji [Mon, 21 Dec 2015 23:07:15 +0000 (23:07 +0000)]
Merge "Do not use 0 in recipe"
am:
67e960b70f
* commit '
67e960b70ff0c07a3ba817a687791cab538ceb66':
Do not use $? in recipe
Shinichiro Hamaji [Mon, 21 Dec 2015 22:46:01 +0000 (22:46 +0000)]
Merge "Do not use $? in recipe"
Tao Bao [Mon, 21 Dec 2015 19:22:00 +0000 (19:22 +0000)]
Merge "Allow building recovery as boot."
am:
781b7b20d4
* commit '
781b7b20d41cfe80472707aec46d0eac5473bfc5':
Allow building recovery as boot.
Tao Bao [Mon, 21 Dec 2015 19:17:56 +0000 (19:17 +0000)]
Merge "Allow building recovery as boot."
Daniel Rosenberg [Wed, 11 Nov 2015 03:21:34 +0000 (19:21 -0800)]
Allow building recovery as boot.
With BOARD_USES_RECOVERY_AS_BOOT = true, we skip building the
non-ramdisk boot.img but building the recovery image as boot.img. It
contains recovery's ramdisk (e.g. with /sbin/recovery). It depends on
the bootloader parameter (skip_initramfs) to determine the actual mode
to boot into.
Change-Id: Id6e2d0a2b94383944ca8f35bba688c6401745622
(cherry picked from commit
d80bef2b9e7aa5f92ab017247442798f47736566)
Evgenii Stepanov [Mon, 21 Dec 2015 18:37:35 +0000 (18:37 +0000)]
Merge "Remove RPATH for AddressSanitizer."
am:
18733b9b0c
* commit '
18733b9b0c2a1c3b9b6a2808497f47be076c9561':
Remove RPATH for AddressSanitizer.
Evgenii Stepanov [Mon, 21 Dec 2015 18:32:36 +0000 (18:32 +0000)]
Merge "Remove RPATH for AddressSanitizer."
Evgenii Stepanov [Mon, 21 Dec 2015 18:29:54 +0000 (10:29 -0800)]
Remove RPATH for AddressSanitizer.
RPATH was used in order for ASan executables to prefer ASan libraries
under /data. Now ASan executables use a special loader (linker_asan),
which implements this logic. RPATH is no longer needed.
Change-Id: Ic7a39b022267b80bd0ce3e95a2e822eb308a1fba
Shinichiro Hamaji [Fri, 18 Dec 2015 06:50:10 +0000 (15:50 +0900)]
Do not use $? in recipe
Kati cannot support this automatic variable as ninja doesn't
have a feature for this.
Change-Id: Ibc3a18dc5739b5008b156d2672a626621e046f5a
Yohann Roussel [Mon, 21 Dec 2015 13:01:36 +0000 (05:01 -0800)]
Merge "Do not set Jack source version, use default"
am:
2983fd4b0f
* commit '
2983fd4b0f66e58620afd57d5f68794c0767b641':
Do not set Jack source version, use default
Yohann Roussel [Mon, 21 Dec 2015 12:57:29 +0000 (12:57 +0000)]
Merge "Do not set Jack source version, use default"
Sami Tolvanen [Mon, 21 Dec 2015 11:30:44 +0000 (11:30 +0000)]
Merge "build_image: don\'t call append2simg for FEC"
am:
e2476f82a1
* commit '
e2476f82a1c83c5efda8d8e29d25305439e91985':
build_image: don't call append2simg for FEC
Sami Tolvanen [Mon, 21 Dec 2015 11:30:35 +0000 (11:30 +0000)]
Merge "build_image: remove an unnecessary call to append2simg"
am:
06b4ff6696
* commit '
06b4ff6696dfc11fafde52e17c6e9d46f0ec1be5':
build_image: remove an unnecessary call to append2simg
Sami Tolvanen [Mon, 21 Dec 2015 11:21:16 +0000 (11:21 +0000)]
Merge "build_image: don't call append2simg for FEC"
Sami Tolvanen [Mon, 21 Dec 2015 11:19:26 +0000 (11:19 +0000)]
Merge "build_image: remove an unnecessary call to append2simg"
Shinichiro Hamaji [Mon, 21 Dec 2015 05:51:26 +0000 (05:51 +0000)]
Merge "Disable goma/ccache with USE_XXX=false"
am:
6c90e49f4a
* commit '
6c90e49f4a70e100a56e2a1b2f2550a782c72311':
Disable goma/ccache with USE_XXX=false
Shinichiro Hamaji [Mon, 21 Dec 2015 05:48:44 +0000 (05:48 +0000)]
Merge "Disable goma/ccache with USE_XXX=false"
Elliott Hughes [Fri, 18 Dec 2015 21:45:31 +0000 (13:45 -0800)]
Merge "Enable -fstack-protector-strong for arm64."
am:
03b7effb8d
* commit '
03b7effb8d018eb248fed9e6856a7b8795cdb907':
Enable -fstack-protector-strong for arm64.
Elliott Hughes [Fri, 18 Dec 2015 21:45:23 +0000 (13:45 -0800)]
Merge "Enable -fstack-protector-strong for arm."
am:
7fca8a373f
* commit '
7fca8a373f9885d4cb23145a5b457d7f2f1c5f22':
Enable -fstack-protector-strong for arm.
Alex Klyubin [Fri, 18 Dec 2015 21:45:16 +0000 (13:45 -0800)]
Merge "Move signapk sources to src dir."
am:
421d84f911
* commit '
421d84f911218387dc638dd7ef897aa3199b96b6':
Move signapk sources to src dir.
Elliott Hughes [Fri, 18 Dec 2015 21:36:49 +0000 (21:36 +0000)]
Merge "Enable -fstack-protector-strong for arm64."
Elliott Hughes [Fri, 18 Dec 2015 21:36:27 +0000 (21:36 +0000)]
Merge "Enable -fstack-protector-strong for arm."
Dan Willemsen [Wed, 16 Dec 2015 21:10:35 +0000 (13:10 -0800)]
Prevent changes to COMMON_GLOBAL_C(PP)FLAGS
Reorder the definitions of the core cflags so that we can prevent device
configurations from changing the global C(PP)FLAGS.
There is no reason for devices to be configuring the global cflags -- if
something needs to change for a particular device, that flag should be
defined in the BoardConfig.mk, then used in the individual makefiles
where it is needed. The common global flags also affected host tools,
which should not change between device configurations.
Bug:
26165350
Change-Id: Icece4505ce3d2a9168087d802953378534018d47
Tianjie Xu [Tue, 15 Dec 2015 19:53:59 +0000 (11:53 -0800)]
Check block0 for remounting partition R/W
Add a function check_first_block to read block0 and output a message
on screen if the device has been remounted. The function is called
for version >= 4 only; it executes after a failing block verification
and before recovery attempts.
Bug:
21124327
Change-Id: I49dc0b861c702698896a2495ca094215705d4650
(cherry picked from commit
9dac79701304cc466ea67c754233487f755dd97a)
Alex Klyubin [Fri, 18 Dec 2015 18:06:37 +0000 (18:06 +0000)]
Merge "Move signapk sources to src dir."