Zach Jang
a9ac12d276
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
2016-01-12 01:40:37 +00:00
Zach Jang
b0b568b5c8
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
2016-01-12 01:38:31 +00:00
Zach Jang
1b29f2f9c9
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
2016-01-12 01:35:21 +00:00
Zach Jang
6facd249d5
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
2016-01-12 01:33:23 +00:00
Zach Jang
6c61548bb7
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
2016-01-12 01:30:53 +00:00
Zach Jang
c9da4cce57
Updating security patch string to 2016-03-01 am: c24c6ccd4d
am: 293887c43e
...
am: 53e7d9bf7f
* commit '53e7d9bf7f298c438157dccc5222b7484b083d9e':
Updating security patch string to 2016-03-01
2016-01-12 01:28:37 +00:00
Zach Jang
53e7d9bf7f
Updating security patch string to 2016-03-01 am: c24c6ccd4d
...
am: 293887c43e
* commit '293887c43ee5b797f8628f5983f64bf766002009':
Updating security patch string to 2016-03-01
2016-01-12 01:26:41 +00:00
Zach Jang
293887c43e
Updating security patch string to 2016-03-01
...
am: c24c6ccd4d
* commit 'c24c6ccd4d5de8be010b74b9021b8fdb926e1dad':
Updating security patch string to 2016-03-01
2016-01-12 01:24:55 +00:00
Zach Jang
c24c6ccd4d
Updating security patch string to 2016-03-01
...
b/26499556
Change-Id: I18a5ad9d8d08e2050053bcebc1a9a0c46db86733
2016-01-11 17:12:37 -08:00
Narayan Kamath
3eb6d15e6f
Merge "Remove libsqlite_jni from all product configs."
...
am: 4203ee20f1
* commit '4203ee20f13b1dd3ec9100f5045c19541f70da33':
Remove libsqlite_jni from all product configs.
2016-01-11 11:43:46 +00:00
Narayan Kamath
4203ee20f1
Merge "Remove libsqlite_jni from all product configs."
2016-01-11 11:39:15 +00:00
Gina Dimino
256dbdc76d
Merge "Docs: Changing text on Feedback button. Bug: 26452230"
...
am: 49d5d5576e
* commit '49d5d5576e714a733b952506bcc49d660d8a4afb':
Docs: Changing text on Feedback button. Bug: 26452230
2016-01-08 18:37:02 +00:00
Gina Dimino
49d5d5576e
Merge "Docs: Changing text on Feedback button. Bug: 26452230"
2016-01-08 18:31:38 +00:00
Narayan Kamath
58408f645a
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
2016-01-08 11:02:36 +00:00
Tianjie Xu
3236cfd672
Merge "Check block0 for remounting partition R/W"
...
am: 0b109751b8
* commit '0b109751b8f767e9191f1d84f345ee70690be9fa':
Check block0 for remounting partition R/W
2016-01-08 00:54:12 +00:00
Tianjie Xu
0b109751b8
Merge "Check block0 for remounting partition R/W"
2016-01-08 00:49:49 +00:00
Gina Dimino
261bb0871d
Docs: Changing text on Feedback button.
...
Bug: 26452230
Change-Id: I716b773ed649dea4634f3db3fcb9daba0d0fab86
2016-01-07 16:22:36 -08:00
Shinichiro Hamaji
bb1207f99c
Merge "Have symbol versions in .so.toc files"
...
am: c610c42b99
* commit 'c610c42b99c0f9570492731911199ae75d1ad9c0':
Have symbol versions in .so.toc files
2016-01-07 05:17:27 +00:00
Shinichiro Hamaji
c610c42b99
Merge "Have symbol versions in .so.toc files"
2016-01-07 05:14:37 +00:00
Josh Gao
5774bafd18
Merge "Kill BOARD_MALLOC_ALIGNMENT."
...
am: 1ad7edd5e4
* commit '1ad7edd5e46793bee4450a7d6deadc39538dbf54':
Kill BOARD_MALLOC_ALIGNMENT.
2016-01-06 22:54:05 +00:00
Josh Gao
1ad7edd5e4
Merge "Kill BOARD_MALLOC_ALIGNMENT."
2016-01-06 22:49:30 +00:00
Josh Gao
b1171e4a31
Kill BOARD_MALLOC_ALIGNMENT.
...
Bug: http://b/26403338
Change-Id: I55d2c417d972f78caddc5fb28a065807feb86b0a
2016-01-06 14:15:46 -08:00
Josh Gao
3fe35f9775
Merge "Replace MALLOC_IMPL with MALLOC_SVELTE."
...
am: 9fb0221abe
* commit '9fb0221abedf9c8aadbe0d5efd7797ff9b293a46':
Replace MALLOC_IMPL with MALLOC_SVELTE.
2016-01-06 20:30:24 +00:00
Josh Gao
9fb0221abe
Merge "Replace MALLOC_IMPL with MALLOC_SVELTE."
2016-01-06 20:08:13 +00:00
Gina Dimino
e1e7d93cfe
Merge "Docs: Encode URL input to search box Bug: 26287939"
...
am: 634e4a2a39
* commit '634e4a2a39b32df838d750374ce390fa25f1710b':
Docs: Encode URL input to search box Bug: 26287939
2016-01-06 17:41:52 +00:00
Gina Dimino
634e4a2a39
Merge "Docs: Encode URL input to search box Bug: 26287939"
2016-01-06 17:37:04 +00:00
Shinichiro Hamaji
2b0caa3a67
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
2016-01-06 15:13:25 +09:00
Gina Dimino
bbde9363fa
Docs: Encode URL input to search box
...
Bug: 26287939
Change-Id: Ica656034412b517e182333f5fe4f6e9bc5f300f3
2016-01-05 15:08:40 -08:00
Josh Gao
a4f00d74fc
Replace MALLOC_IMPL with MALLOC_SVELTE.
...
Bug: http://b/26390299
Change-Id: Ib1bef4aa272033412bea57a9bccf1d67793d2bda
2016-01-05 13:08:45 -08:00
Elliott Hughes
b938cbc7a7
Merge "Clean up Mac OS hacks in acp slightly."
...
am: 0e80edd259
* commit '0e80edd259d1ce7f35d8c9841f88296416c1e2cf':
Clean up Mac OS hacks in acp slightly.
2016-01-05 17:48:29 +00:00
Elliott Hughes
0e80edd259
Merge "Clean up Mac OS hacks in acp slightly."
2016-01-05 17:36:09 +00:00
Elliott Hughes
636c1c4a44
Clean up Mac OS hacks in acp slightly.
...
Change-Id: I7cba3a345cd8907ae050961cc4f173003ac90f39
2016-01-05 09:32:42 -08:00
Narayan Kamath
491233c403
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
2016-01-05 17:19:15 +00:00
Narayan Kamath
b11bf3f70c
Merge "CopyFile: Remove bogus reference to HAVE_VALID_STAT_ST_INO"
2016-01-05 17:15:35 +00:00
Narayan Kamath
c407052766
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
2016-01-05 16:59:50 +00:00
Dan Willemsen
c4ba49dbec
Merge "Prevent changes to COMMON_GLOBAL_C(PP)FLAGS"
...
am: d443abf1aa
* commit 'd443abf1aaa12c1b0fb82c940df60046c06aaed7':
Prevent changes to COMMON_GLOBAL_C(PP)FLAGS
2016-01-05 05:52:06 +00:00
Dan Willemsen
d443abf1aa
Merge "Prevent changes to COMMON_GLOBAL_C(PP)FLAGS"
2016-01-05 05:47:43 +00:00
Tao Bao
7da6338cf3
Merge "Build delta_generator for A/B update."
...
am: bf4213ebae
* commit 'bf4213ebaee1c505fa5070419aba4cd5ddccaae2':
Build delta_generator for A/B update.
2016-01-04 19:51:30 +00:00
Tao Bao
bf4213ebae
Merge "Build delta_generator for A/B update."
2016-01-04 19:46:55 +00:00
Tao Bao
f8e6fbe2f5
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
2016-01-04 09:57:32 -08:00
Christopher Wiley
5f2422beb1
Merge "Fix compiler warnings on Windows in CopyFile.c"
...
am: b327f61f50
* commit 'b327f61f50c5bf42dc61f5d1bc946f7e4edb7ccf':
Fix compiler warnings on Windows in CopyFile.c
2016-01-04 17:02:44 +00:00
Christopher Wiley
b327f61f50
Merge "Fix compiler warnings on Windows in CopyFile.c"
2016-01-04 16:59:58 +00:00
Christopher Wiley
676799f23d
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
2015-12-30 12:30:58 -08:00
Christopher Wiley
9d0837cbd2
Merge "Fix unused parameter warnings in CopyFile.c"
...
am: 530d99446a
* commit '530d99446a02912387ea45c1d1d35a7d1bd39829':
Fix unused parameter warnings in CopyFile.c
2015-12-30 19:09:42 +00:00
Christopher Wiley
530d99446a
Merge "Fix unused parameter warnings in CopyFile.c"
2015-12-30 19:06:32 +00:00
Christopher Wiley
982e1f2650
Fix unused parameter warnings in CopyFile.c
...
Bug: 26355209
Test: Compiles
Change-Id: I6f804f150ec08de5a1b3272ae59bc921dd6d0c9c
2015-12-30 11:03:14 -08:00
Narayan Kamath
4baa857e6d
Merge "Revert "Temporary workaround to build bouncycastle / nist-pkits""
...
am: 54a5e368fe
* commit '54a5e368fea461a265374db9ecf2c0b4c6825460':
Revert "Temporary workaround to build bouncycastle / nist-pkits"
2015-12-30 11:47:12 +00:00
Narayan Kamath
54a5e368fe
Merge "Revert "Temporary workaround to build bouncycastle / nist-pkits""
2015-12-30 11:43:35 +00:00
Narayan Kamath
cdc3d5ac03
Revert "Temporary workaround to build bouncycastle / nist-pkits"
...
This reverts commit 3006881f84
.
2015-12-24 12:39:51 +00:00
Narayan Kamath
45ae4eb8a2
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.
2015-12-24 12:04:50 +00:00