Commit Graph

27432 Commits

Author SHA1 Message Date
Neil Fuller cd7a94da67 Merge "Revert "Revert "Make OpenJDK 8 the default""" 2016-01-14 13:23:52 +00:00
Dan Willemsen cd1bcb8b40 Merge "Allow building kati & makeparallel with soong" am: 77cde9e244
am: 766eeb747e

* commit '766eeb747ef5714f6027f371394ca08c6bc1057e':
  Allow building kati & makeparallel with soong
2016-01-14 02:08:54 +00:00
Dan Willemsen 766eeb747e Merge "Allow building kati & makeparallel with soong"
am: 77cde9e244

* commit '77cde9e244de9b043793ef528818de0ffea862e1':
  Allow building kati & makeparallel with soong
2016-01-14 02:05:24 +00:00
Dan Willemsen 77cde9e244 Merge "Allow building kati & makeparallel with soong" 2016-01-14 00:40:26 +00:00
Andy Huang b7da60c2fa Merge "remove Exchange2 from core.mk" into mnc-dr1.5-dev am: 0936632c93 am: 624ecb988b
am: 400d9ff4ba

* commit '400d9ff4ba0a606d5bf1f7c29cb2d61f3de4b4cc':
  remove Exchange2 from core.mk
2016-01-13 23:42:59 +00:00
Stephen Hines cb7aa7951d Merge "Switch to Vista instead of Win2K." am: c8299320da
am: 4f14e16324

* commit '4f14e1632484b6a661967e3feaa9325b4bdc7a6e':
  Switch to Vista instead of Win2K.
2016-01-13 23:42:52 +00:00
Colin Cross a30aef56bb Merge "makeparallel: print path on exec failure" am: e56ef1bee7
am: dc74441928

* commit 'dc74441928aa3b7b8d0dfbac7beb02f1607d2f44':
  makeparallel: print path on exec failure
2016-01-13 23:42:45 +00:00
Colin Cross 651fc65988 Merge "Ignore Android.mk files with USE_SOONG=true" am: 19f6638026
am: 1ed08efbb9  -s ours

* commit '1ed08efbb95af6b8e4bca6b24ab9e10958cfebbd':
  Ignore Android.mk files with USE_SOONG=true
2016-01-13 23:42:36 +00:00
Andy Huang 400d9ff4ba Merge "remove Exchange2 from core.mk" into mnc-dr1.5-dev am: 0936632c93
am: 624ecb988b

* commit '624ecb988b037a4eee46d06b3618bee1e5d2b9cb':
  remove Exchange2 from core.mk
2016-01-13 21:28:07 +00:00
Andy Huang 624ecb988b Merge "remove Exchange2 from core.mk" into mnc-dr1.5-dev
am: 0936632c93

* commit '0936632c93caf436732a85bbf7beb3c5cecafd5b':
  remove Exchange2 from core.mk
2016-01-13 21:26:14 +00:00
Andy Huang 0936632c93 Merge "remove Exchange2 from core.mk" into mnc-dr1.5-dev 2016-01-13 21:23:07 +00:00
Dan Willemsen 3f60c4b6c0 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
2016-01-13 13:08:29 -08:00
Stephen Hines 4f14e16324 Merge "Switch to Vista instead of Win2K."
am: c8299320da

* commit 'c8299320dac3a399430be37e0581bc263bef997e':
  Switch to Vista instead of Win2K.
2016-01-13 20:52:09 +00:00
Stephen Hines c8299320da Merge "Switch to Vista instead of Win2K." 2016-01-13 20:47:13 +00:00
Colin Cross dc74441928 Merge "makeparallel: print path on exec failure"
am: e56ef1bee7

* commit 'e56ef1bee78f7b9a0c74c25087a869f382599080':
  makeparallel: print path on exec failure
2016-01-13 20:43:27 +00:00
Colin Cross 1ed08efbb9 Merge "Ignore Android.mk files with USE_SOONG=true"
am: 19f6638026

* commit '19f6638026b8481e04003fcbd5a8ef017a66d9c8':
  Ignore Android.mk files with USE_SOONG=true
2016-01-13 20:43:22 +00:00
Colin Cross e56ef1bee7 Merge "makeparallel: print path on exec failure" 2016-01-13 20:32:45 +00:00
Colin Cross 19f6638026 Merge "Ignore Android.mk files with USE_SOONG=true" 2016-01-13 20:32:26 +00:00
Alex Klyubin 44e2ccaad1 Merge "Unconditionally use SHA-256 when minSdkVersion is 18 or higher." am: fbee4f2e42
am: 45f1403b7e

* commit '45f1403b7ef6d5a9ad4910a0f1fdd4c676893049':
  Unconditionally use SHA-256 when minSdkVersion is 18 or higher.
2016-01-13 18:50:24 +00:00
Dan Willemsen 942ba5db8c Merge "Remove -Wa,noexecstack from unsupported arm clang flags" am: d29a84161e
am: b2cfef28fb

* commit 'b2cfef28fbeb3ad010d042e41c273f71e9e3ebd2':
  Remove -Wa,noexecstack from unsupported arm clang flags
2016-01-13 18:50:18 +00:00
Tao Bao 1269cfbd02 Merge "Fix mounting /sdcard under recovery." am: 948b9c30b4
am: 506cbfa8b4

* commit '506cbfa8b4f8e70900527311528a60053dae1c61':
  Fix mounting /sdcard under recovery.
2016-01-13 18:50:12 +00:00
Alex Klyubin 614470e77d Merge "List SHA-1 digests of APK entries\' contents in .SF files." am: 6b452b2767
am: bad18cd9cf

* commit 'bad18cd9cff1c89f26da2ab771730eb682c9a73f':
  List SHA-1 digests of APK entries' contents in .SF files.
2016-01-13 18:50:06 +00:00
Tom Cherry 6ebff7a4d4 Merge "Remove special case handling of "ro." properties" am: 560fde999a
am: ca0091e26f

* commit 'ca0091e26fa31618d4693cad1f572d3e4e12bffe':
  Remove special case handling of "ro." properties
2016-01-13 18:50:00 +00:00
Clay Murphy c067e1d1bc Merge "Docs: Shorten feedback button text." am: a3a9d929a6
am: 308033ba6b

* commit '308033ba6b9947bc860b27dc990a5c26d8f50f49':
  Docs: Shorten feedback button text.
2016-01-13 18:49:14 +00:00
Alex Klyubin 45f1403b7e 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.
2016-01-13 18:46:25 +00:00
Ying Wang c6bafa661c Merge "Generate .c for .y and .l" am: 873eeec194
am: 0f0b6962ed

* commit '0f0b6962edcf65cf284bed22288d9eeb5b0478cc':
  Generate .c for .y and .l
2016-01-13 18:45:09 +00:00
Ying Wang 0afedd89f7 Merge "Move "include configure_local_jack.mk"" am: 5799af6563
am: 50b3d28dcc

* commit '50b3d28dcc66c6af4821d9655c782365a11fe284':
  Move "include configure_local_jack.mk"
2016-01-13 18:45:01 +00:00
Alex Klyubin fbee4f2e42 Merge "Unconditionally use SHA-256 when minSdkVersion is 18 or higher." 2016-01-13 17:15:34 +00:00
Ying Wang f0ebe165b9 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
2016-01-12 21:07:27 -08:00
Zach Jang c6c48b01d9 Updating security patch string to 2016-03-01 am: c24c6ccd4d am: 293887c43e am: 53e7d9bf7f am: c9da4cce57 am: 6c61548bb7 am: 6facd249d5 am: 1b29f2f9c9 am: b0b568b5c8
am: a9ac12d276

* commit 'a9ac12d276448e30cadf34099dea7001d67a2c43':
  Updating security patch string to 2016-03-01
2016-01-13 02:11:25 +00:00
Stephen Hines 625e7159ff 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
2016-01-12 17:56:47 -08:00
Dan Willemsen b2cfef28fb Merge "Remove -Wa,noexecstack from unsupported arm clang flags"
am: d29a84161e

* commit 'd29a84161edf1c82b988c8b181638b9b37540e6d':
  Remove -Wa,noexecstack from unsupported arm clang flags
2016-01-13 01:02:40 +00:00
Dan Willemsen d29a84161e Merge "Remove -Wa,noexecstack from unsupported arm clang flags" 2016-01-13 00:56:59 +00:00
Dan Willemsen d1baa0f001 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
2016-01-12 15:54:57 -08:00
Tao Bao 506cbfa8b4 Merge "Fix mounting /sdcard under recovery."
am: 948b9c30b4

* commit '948b9c30b4197a709846e604c8e571d90161b17f':
  Fix mounting /sdcard under recovery.
2016-01-12 22:32:11 +00:00
Tao Bao 948b9c30b4 Merge "Fix mounting /sdcard under recovery." 2016-01-12 22:18:52 +00:00
Alex Klyubin c2c49ed0c1 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
2016-01-12 13:31:59 -08:00
Alex Klyubin bad18cd9cf 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.
2016-01-12 21:26:01 +00:00
Alex Klyubin 6b452b2767 Merge "List SHA-1 digests of APK entries' contents in .SF files." 2016-01-12 21:22:12 +00:00
Tom Cherry ca0091e26f Merge "Remove special case handling of "ro." properties"
am: 560fde999a

* commit '560fde999ad87379e8adfbe36958a33db4eb1c81':
  Remove special case handling of "ro." properties
2016-01-12 20:54:38 +00:00
Alex Klyubin 8502937cff List SHA-1 digests of APK entries' contents in .SF files.
Due to a bug introduced in 8562fd478d
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
2016-01-12 12:36:46 -08:00
Tom Cherry 560fde999a Merge "Remove special case handling of "ro." properties" 2016-01-12 20:36:32 +00:00
Clay Murphy 308033ba6b Merge "Docs: Shorten feedback button text."
am: a3a9d929a6

* commit 'a3a9d929a61bf0574d8372d5932af6bde2e12920':
  Docs: Shorten feedback button text.
2016-01-12 19:49:33 +00:00
Tao Bao 3f56a33041 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
2016-01-12 11:40:30 -08:00
Clay Murphy a3a9d929a6 Merge "Docs: Shorten feedback button text." 2016-01-12 19:32:26 +00:00
Ying Wang 0f0b6962ed Merge "Generate .c for .y and .l"
am: 873eeec194

* commit '873eeec1944c46cd50779cd4fc8d4cd8ca0457ea':
  Generate .c for .y and .l
2016-01-12 18:57:03 +00:00
Ying Wang 50b3d28dcc Merge "Move "include configure_local_jack.mk""
am: 5799af6563

* commit '5799af6563c2da0a3730f1d4e007052c429ccaf8':
  Move "include configure_local_jack.mk"
2016-01-12 18:56:53 +00:00
Clay Murphy b43f809da9 Docs: Shorten feedback button text.
Bug: 26452230
Change-Id: I8069d5087775a38f23e2aae86eb16fea81a65cd3
2016-01-12 10:55:44 -08:00
Ying Wang 873eeec194 Merge "Generate .c for .y and .l" 2016-01-12 17:35:30 +00:00
Ying Wang 5799af6563 Merge "Move "include configure_local_jack.mk"" 2016-01-12 17:34:26 +00:00