OSDN Git Service
Neil Fuller [Mon, 18 Jan 2016 19:40:31 +0000 (19:40 +0000)]
Merge "Remove synchronized from the public API docs"
am:
8cb9be66b7
* commit '
8cb9be66b7878478aa61e7b752e3c8b916811299':
Remove synchronized from the public API docs
Neil Fuller [Mon, 18 Jan 2016 19:36:27 +0000 (19:36 +0000)]
Merge "Remove synchronized from the public API docs"
Dan Willemsen [Sat, 16 Jan 2016 20:17:01 +0000 (20:17 +0000)]
Merge "Add -Werror=date-time to target builds"
am:
5c3f812507
* commit '
5c3f812507bd025da2fc3d5fa40e8a278535dff2':
Add -Werror=date-time to target builds
Dan Willemsen [Sat, 16 Jan 2016 20:13:30 +0000 (20:13 +0000)]
Merge "Add -Werror=date-time to target builds"
Tianjie Xu [Fri, 15 Jan 2016 19:21:00 +0000 (19:21 +0000)]
Merge "Fix print error of numbers of blocks"
am:
2acd8a2eef
* commit '
2acd8a2eef88973ce222a4ed90efaa94ede1a30b':
Fix print error of numbers of blocks
Tianjie Xu [Fri, 15 Jan 2016 19:07:22 +0000 (19:07 +0000)]
Merge "Fix print error of numbers of blocks"
Neil Fuller [Wed, 25 Nov 2015 10:23:17 +0000 (10:23 +0000)]
Remove synchronized from the public API docs
The information is not useful. Javadoc hasn't included this
information for years.
Bug:
25767152
(cherry-picked from commit
a37bdc89b47893f740ab652fe8b58c44e440f334)
Change-Id: Id03a6e383118ab716ce870a1d7a3740656420fe7
Tianjie Xu [Thu, 14 Jan 2016 22:12:26 +0000 (14:12 -0800)]
Fix print error of numbers of blocks
The total number of blocks to pack as new data was printed incorrectly.
Fix printing.
Change-Id: I6a6bb8dd6682d9c57943ceb1a728995f9529e2fd
Tianjie Xu [Thu, 14 Jan 2016 19:22:39 +0000 (19:22 +0000)]
Merge "Adjust the size limit for splitting large files"
am:
9b2fe7e0b8
* commit '
9b2fe7e0b864a7fd2deae831674d97c72fe29f64':
Adjust the size limit for splitting large files
Tianjie Xu [Thu, 14 Jan 2016 19:17:00 +0000 (19:17 +0000)]
Merge "Adjust the size limit for splitting large files"
Tianjie Xu [Thu, 14 Jan 2016 00:14:10 +0000 (16:14 -0800)]
Adjust the size limit for splitting large files
Modify the number of max blocks per transfer to reduce splitting of
large files during patch generation. This will reduce the size of
final incremental OTA updater package. In specific, the size limit
for each file to transfer is set to 1/8 cachesize instead of a fix
number.
Bug:
26472126
Change-Id: Iffb135e378c4c7a91640f2fc4c40e9e93d1fe4bb
Dan Willemsen [Thu, 14 Jan 2016 02:05:24 +0000 (02:05 +0000)]
Merge "Allow building kati & makeparallel with soong"
am:
77cde9e244
* commit '
77cde9e244de9b043793ef528818de0ffea862e1':
Allow building kati & makeparallel with soong
Dan Willemsen [Thu, 14 Jan 2016 00:40:26 +0000 (00:40 +0000)]
Merge "Allow building kati & makeparallel with soong"
Andy Huang [Wed, 13 Jan 2016 21:28:07 +0000 (21:28 +0000)]
Merge "remove Exchange2 from core.mk" into mnc-dr1.5-dev am:
0936632c93
am:
624ecb988b
* commit '
624ecb988b037a4eee46d06b3618bee1e5d2b9cb':
remove Exchange2 from core.mk
Andy Huang [Wed, 13 Jan 2016 21:26:14 +0000 (21:26 +0000)]
Merge "remove Exchange2 from core.mk" into mnc-dr1.5-dev
am:
0936632c93
* commit '
0936632c93caf436732a85bbf7beb3c5cecafd5b':
remove Exchange2 from core.mk
Andy Huang [Wed, 13 Jan 2016 21:23:07 +0000 (21:23 +0000)]
Merge "remove Exchange2 from core.mk" into mnc-dr1.5-dev
Dan Willemsen [Thu, 7 Jan 2016 00:00:00 +0000 (16:00 -0800)]
Allow building kati & makeparallel with soong
This uses far fewer hacks in order to build these host tools, but will
require more libraries(libc++,etc) from unbundled and stripped down
branches.
Once this becomes the only option, all builds will happen after soong
runs. Then the toolchain / global cflags information will be able to be
moved from make to soong (and exported back to make).
Change-Id: I270b1d92bcef28a96fbc3ec9910d9bd0c101ac0f
Stephen Hines [Wed, 13 Jan 2016 20:52:09 +0000 (20:52 +0000)]
Merge "Switch to Vista instead of Win2K."
am:
c8299320da
* commit '
c8299320dac3a399430be37e0581bc263bef997e':
Switch to Vista instead of Win2K.
Stephen Hines [Wed, 13 Jan 2016 20:47:13 +0000 (20:47 +0000)]
Merge "Switch to Vista instead of Win2K."
Colin Cross [Wed, 13 Jan 2016 20:43:27 +0000 (20:43 +0000)]
Merge "makeparallel: print path on exec failure"
am:
e56ef1bee7
* commit '
e56ef1bee78f7b9a0c74c25087a869f382599080':
makeparallel: print path on exec failure
Colin Cross [Wed, 13 Jan 2016 20:43:22 +0000 (20:43 +0000)]
Merge "Ignore Android.mk files with USE_SOONG=true"
am:
19f6638026
* commit '
19f6638026b8481e04003fcbd5a8ef017a66d9c8':
Ignore Android.mk files with USE_SOONG=true
Colin Cross [Wed, 13 Jan 2016 20:32:45 +0000 (20:32 +0000)]
Merge "makeparallel: print path on exec failure"
Colin Cross [Wed, 13 Jan 2016 20:32:26 +0000 (20:32 +0000)]
Merge "Ignore Android.mk files with USE_SOONG=true"
Alex Klyubin [Wed, 13 Jan 2016 18:46:25 +0000 (18:46 +0000)]
Merge "Unconditionally use SHA-256 when minSdkVersion is 18 or higher."
am:
fbee4f2e42
* commit '
fbee4f2e42c31aa392869d813687c7648ae41e80':
Unconditionally use SHA-256 when minSdkVersion is 18 or higher.
Alex Klyubin [Wed, 13 Jan 2016 17:15:34 +0000 (17:15 +0000)]
Merge "Unconditionally use SHA-256 when minSdkVersion is 18 or higher."
Stephen Hines [Wed, 13 Jan 2016 01:56:47 +0000 (17:56 -0800)]
Switch to Vista instead of Win2K.
Bug: http://b/
26524325
Bug: http://b/
25282907
The latest Clang/LLVM requires Vista APIs in order to execute, so we
need to bump the minimum required Windows version for our host tools.
Change-Id: Ic1a760bc240060f5de39ce3a68484886021ff3d9
Dan Willemsen [Wed, 13 Jan 2016 01:02:40 +0000 (01:02 +0000)]
Merge "Remove -Wa,noexecstack from unsupported arm clang flags"
am:
d29a84161e
* commit '
d29a84161edf1c82b988c8b181638b9b37540e6d':
Remove -Wa,noexecstack from unsupported arm clang flags
Dan Willemsen [Wed, 13 Jan 2016 00:56:59 +0000 (00:56 +0000)]
Merge "Remove -Wa,noexecstack from unsupported arm clang flags"
Dan Willemsen [Tue, 12 Jan 2016 23:47:58 +0000 (15:47 -0800)]
Remove -Wa,noexecstack from unsupported arm clang flags
This was marked as unsupported only on arm[64], even though it works.
For soong, we want to keep a single list of unsupported clang flags
for all architectures.
Change-Id: I9c4ae0f255c549d2346ba7abae57e22c86ddcc61
Tao Bao [Tue, 12 Jan 2016 22:32:11 +0000 (22:32 +0000)]
Merge "Fix mounting /sdcard under recovery."
am:
948b9c30b4
* commit '
948b9c30b4197a709846e604c8e571d90161b17f':
Fix mounting /sdcard under recovery.
Tao Bao [Tue, 12 Jan 2016 22:18:52 +0000 (22:18 +0000)]
Merge "Fix mounting /sdcard under recovery."
Alex Klyubin [Mon, 11 Jan 2016 21:22:22 +0000 (13:22 -0800)]
Unconditionally use SHA-256 when minSdkVersion is 18 or higher.
SHA-1 is deprecated, but the replacement SHA-256 is only supported
for JAR/APK and OTA update package signatures on API Level 18 and
newer. This change thus adds a --min-sdk-version command-line
parameter to signapk. When this parameter is set to 18 or higher,
SHA-256 is used instead of SHA-1. When the parameter is not provided,
SHA-1 is used same as before.
This change also removes any other digests from the MANIFEST.MF.
This is to ignore any MANIFEST.MF digests already there in the APK,
such as when re-signing an already signed APK.
Build scripts will be modified to provide the --min-sdk-version
parameter in a follow-up change. This is not done in this change
because of prebuilts which require a prebuilt version of signapk
to support this parameter before the build scripts can be modified.
Bug:
25643280
Change-Id: I6a2782e465600fe2a3ad0c10bd80db2b80a6fb76
Alex Klyubin [Tue, 12 Jan 2016 21:26:01 +0000 (21:26 +0000)]
Merge "List SHA-1 digests of APK entries\' contents in .SF files."
am:
6b452b2767
* commit '
6b452b276773e7f1149845e99777e119cf9754ca':
List SHA-1 digests of APK entries' contents in .SF files.
Alex Klyubin [Tue, 12 Jan 2016 21:22:12 +0000 (21:22 +0000)]
Merge "List SHA-1 digests of APK entries' contents in .SF files."
Tom Cherry [Tue, 12 Jan 2016 20:54:38 +0000 (20:54 +0000)]
Merge "Remove special case handling of "ro." properties"
am:
560fde999a
* commit '
560fde999ad87379e8adfbe36958a33db4eb1c81':
Remove special case handling of "ro." properties
Alex Klyubin [Tue, 12 Jan 2016 20:23:11 +0000 (12:23 -0800)]
List SHA-1 digests of APK entries' contents in .SF files.
Due to a bug introduced in
8562fd478d7f1b1b693de5db67928f1993522c0a
SHA-1 digests of APK entries' contents were listed under wrong
attribute name. The effect is equivalent to not listing SHA-1
digests.
This change fix the issue by listing SHA-1 digests under the correct
attribute name. However, these digests are not that useful because:
(1) typically the digest of the MANIFEST.MF verifies and thus the
per-entry digests are ignored, and (2) per-entry digests of entries
with names longer than 64 characters are wrong in any case because the
digest generation code does not take into account that such names are
split over multiple lines.
An alternative to this change would be to completely omit outputting
per-entry sections of .SF files, thus saving space and speeding up APK
verification (.SF files would decompress faster).
Bug:
26513901
Change-Id: If95d58e9baa62b1113639fe70724e1e9c9f4e15c
Tom Cherry [Tue, 12 Jan 2016 20:36:32 +0000 (20:36 +0000)]
Merge "Remove special case handling of "ro." properties"
Clay Murphy [Tue, 12 Jan 2016 19:49:33 +0000 (19:49 +0000)]
Merge "Docs: Shorten feedback button text."
am:
a3a9d929a6
* commit '
a3a9d929a61bf0574d8372d5932af6bde2e12920':
Docs: Shorten feedback button text.
Tao Bao [Tue, 12 Jan 2016 19:34:58 +0000 (11:34 -0800)]
Fix mounting /sdcard under recovery.
The CL in [1] changed to create a symlink to /storage/self/primary for
/sdcard. It breaks the mount of /sdcard under recovery.
[1] commit
595003a3d06a13862052ef2f4f578371dae5ad65
Bug:
26509280
Change-Id: I98d02d54d707c2c8826c5ee119cf1a3ffa0c4bc9
Clay Murphy [Tue, 12 Jan 2016 19:32:26 +0000 (19:32 +0000)]
Merge "Docs: Shorten feedback button text."
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"
Clay Murphy [Tue, 12 Jan 2016 18:55:44 +0000 (10:55 -0800)]
Docs: Shorten feedback button text.
Bug:
26452230
Change-Id: I8069d5087775a38f23e2aae86eb16fea81a65cd3
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
Colin Cross [Mon, 11 Jan 2016 21:01:01 +0000 (13:01 -0800)]
makeparallel: print path on exec failure
If ninja is missing makeparallel prints an unhelpful error:
out/host/linux-x86/bin/makeparallel: exec failed: No such file or directory
which suggests that makeparallel is what is missing, not what is
reporting the error. Print the path passed to exec as well.
Change-Id: Ic04c1cde6da9c3a974b5c43e3fb3bdb6da6605f7
Colin Cross [Mon, 11 Jan 2016 20:33:23 +0000 (12:33 -0800)]
Ignore Android.mk files with USE_SOONG=true
When USE_SOONG=true, ignore any Android.mk file that has an Android.bp
file in the same directory.
Change-Id: Id79bd90c2aed5dafc2f8ad2c5b7eb0aa6e81dc18
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
Tom Cherry [Mon, 11 Jan 2016 21:16:45 +0000 (13:16 -0800)]
Remove special case handling of "ro." properties
Currently, properties that begin with "ro." are special cased to skip
over the "ro." part of the prefix before matching with entries in
property_contexts. A change to init is removing this special case and
therefore, the "ro." prefixes must be explicitly added to
property_contexts.
Bug
26425619
Change-Id: I735eb9fc208eeec284cda8d778db946eeec24192
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."
Dan Willemsen [Wed, 6 Jan 2016 22:27:53 +0000 (14:27 -0800)]
Add -Werror=date-time to target builds
The lack of a changing timestamp improves reproducibility of builds, and
helps create smaller OTAs.
Bug:
24204119
Change-Id: I68acfb53be962ffd5c488337517dadb950a13b6f
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.