Commit Graph

10777 Commits

Author SHA1 Message Date
Przemyslaw Szczepaniak
1a662f48c3 Merge "Add java.util.stream to whitelisted packages" into nyc-dev 2016-03-18 13:08:59 +00:00
Przemyslaw Szczepaniak
068ff11c05 Add java.util.stream to whitelisted packages
Bug: 27692239
Change-Id: I50e671222efc415fb930e5493f1943c5b8f6a71c
(cherry picked from commit fe606f0939)
2016-03-18 13:05:59 +00:00
Przemyslaw Szczepaniak
23649c76ce Merge "Allow for 5400 words in dump-words-to-file" into nyc-dev
am: 1b21b85

* commit '1b21b85b119796d9007e874af99948a803805397':
  Allow for 5400 words in dump-words-to-file
2016-03-18 12:44:23 +00:00
Przemyslaw Szczepaniak
1b21b85b11 Merge "Allow for 5400 words in dump-words-to-file" into nyc-dev 2016-03-18 12:39:45 +00:00
Przemyslaw Szczepaniak
0aeee045bd Allow for 5400 words in dump-words-to-file
After adding java.util.stream,  doc-comment-check target
started to fail due to "Too many words" while
generating out/target/common/docs/doc-comment-check-timestamp.rsp
This change extends number of dumped words to 5400.

Bug: 27692239
Change-Id: Ifa75cada7b90c5737fc7a1d10325f3a49a2238ac
2016-03-18 12:09:44 +00:00
Yohann Roussel
29b1afee9e Remove JILL, JACK_JAR and JILL_JAR
Also ensure that sdk.atree can find jack.jar and jill.jar from prebuilt.

Bug: 27372042

(cherry picked from commit 233584bb80)

Change-Id: Ie266104e51c09fa21ccb09c1f27ad7068472965c
2016-03-18 11:38:05 +01:00
Yohann Roussel
0ee9995724 resolve merge conflicts of c8cfac9 to nyc-dev-plus-aosp
Change-Id: I77317dcaaa4154d6649b36b215df1474721a6503
2016-03-18 10:12:27 +01:00
Yohann Roussel
c8cfac947b Merge "Remove JILL, JACK_JAR and JILL_JAR" 2016-03-18 08:54:30 +00:00
Joe Onorato
4bcbf055b4 Merge "Also turn down the logging for dex2oat on the boot image" into nyc-dev
am: f7cadb8

* commit 'f7cadb8cfd5bf0393d14029a5678df38b63d963b':
  Also turn down the logging for dex2oat on the boot image
2016-03-18 01:11:34 +00:00
Joe Onorato
f7cadb8cfd Merge "Also turn down the logging for dex2oat on the boot image" into nyc-dev 2016-03-18 01:06:39 +00:00
Zach Jang
c103e66529 Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba am: cdbccfd am: 5b24724 am: 592d1c5 am: bbf3687 am: b294912 am: d35bff2
am: 569eec0

* commit '569eec09f557c1b87e288661ef99df71e35cba26':
  Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
2016-03-18 00:27:54 +00:00
Zach Jang
569eec09f5 Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba am: cdbccfd am: 5b24724 am: 592d1c5 am: bbf3687 am: b294912
am: d35bff2

* commit 'd35bff2b9a370bcefd82b0ff0960d90678c7942f':
  Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
2016-03-18 00:25:42 +00:00
Zach Jang
b29491287c Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba am: cdbccfd am: 5b24724 am: 592d1c5
am: bbf3687

* commit 'bbf3687eb83878bbba380799c9f25af1b227bee6':
  Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
2016-03-18 00:20:22 +00:00
Zach Jang
bbf3687eb8 Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba am: cdbccfd am: 5b24724
am: 592d1c5

* commit '592d1c5a46b95015ec831febc953b17b721383e9':
  Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
2016-03-18 00:18:01 +00:00
Zach Jang
592d1c5a46 Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba am: cdbccfd
am: 5b24724

* commit '5b24724ccf81ebbcfd20cebcb9f024c8fed3b5f2':
  Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
2016-03-18 00:15:39 +00:00
Zach Jang
5b24724ccf Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2 am: 7a498ba
am: cdbccfd

* commit 'cdbccfda83da86eb8fd8007cc6c6ec2e59ad4223':
  Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
2016-03-18 00:13:25 +00:00
Zach Jang
2b71be536b Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2
- kernel updates with patches for CVE-2015-1805

b/27724967

Change-Id: Ie9daf35dcba3f844c925358daf2646b7ab5b5f5f
2016-03-17 17:11:47 -07:00
Zach Jang
cdbccfda83 Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
am: 7a498ba

* commit '7a498bafff136f1996042c6794ababcaff11d600':
  Updating Security Patch String to: 2016-03-18 - March 2016 OTA v2
2016-03-18 00:10:53 +00:00
Zach Jang
7a498bafff Updating Security Patch String to: 2016-03-18
- March 2016 OTA v2

b/27724091

Change-Id: If448a426d78388208e15254ef30b42873a729647
2016-03-17 17:04:32 -07:00
Pirama Arumuga Nainar
760aec5fdf Switch to clang-2690385
http://b/26987366

Change-Id: I1226f24b50319e321ea538362b2f26fcd227ca39
2016-03-17 13:30:22 -07:00
Pirama Arumuga Nainar
41f4b242e3 Update RenderScript build rules for rebase to LLVM r256229
http://b/26987366

- Use clang-2690385 to build RenderScript toolchain.
- Use armv7-linux-androideabi as the triple used to build RenderScript
  runtime libraries.

Change-Id: I582e8b25bbc38b101a2e765028ed61edbce7bdc2
2016-03-17 13:30:02 -07:00
Colin Cross
50a8120f02 Remove support for device libstdc++ as stl
Prevent platform modules from linking against libstdc++ as their STL
implementation.  NDK modules may still use libstdc++.

Change-Id: I317c9bb90ca7d2e0c1f5770bbdff8075dfe3cc83
2016-03-17 13:10:56 -07:00
Sen Jiang
80bcf0f580 Merge "Add zlib_fingerprint to target_files.zip"
am: 4e9a86f

* commit '4e9a86fb6e9a9f31c505dfa68285067964f70a8f':
  Add zlib_fingerprint to target_files.zip
2016-03-17 19:53:04 +00:00
Sen Jiang
4e9a86fb6e Merge "Add zlib_fingerprint to target_files.zip" 2016-03-17 19:47:42 +00:00
Joe Onorato
632db649fb Also turn down the logging for dex2oat on the boot image
Bug: 27499257
Change-Id: I190ce72b44e49451dab44902e2ca33dd5c2815ce
2016-03-17 10:38:03 -07:00
Chih-Hung Hsieh
baf5f3c67f Merge "Link in ASAN library if my_global_santitize is set."
am: 9d5fb14

* commit '9d5fb14b2d551e522c51f78361b77653191c8c91':
  Link in ASAN library if my_global_santitize is set.
2016-03-17 16:36:15 +00:00
Chih-hung Hsieh
9d5fb14b2d Merge "Link in ASAN library if my_global_santitize is set." 2016-03-17 16:26:32 +00:00
Yohann Roussel
233584bb80 Remove JILL, JACK_JAR and JILL_JAR
Also ensure that sdk.atree can find jack.jar and jill.jar from prebuilt.

Bug: 27372042
Change-Id: Ie266104e51c09fa21ccb09c1f27ad7068472965c
2016-03-17 15:21:28 +01:00
Dan Willemsen
9307713c30 Merge "Add SOONG_ALLOW_MISSING_DEPENDENCIES"
am: b6d813c

* commit 'b6d813ce0ac661e4055fcbcd36eb259d521412f3':
  Add SOONG_ALLOW_MISSING_DEPENDENCIES
2016-03-16 20:20:33 +00:00
Dan Willemsen
b6d813ce0a Merge "Add SOONG_ALLOW_MISSING_DEPENDENCIES" 2016-03-16 20:14:27 +00:00
Dan Willemsen
721f9bd316 Add SOONG_ALLOW_MISSING_DEPENDENCIES
Split out Soong's missing dependency option from Unbundled_build. There
are builds other than unbundled builds that don't have a full platform
tree (AOSP llvm branch is one example).

When this is set to true, Soong will defer the error for missing
dependencies until a module is attempted to be built, instead of when
it is reading and generating the build rules. So for platform builds it
will still fail early if something is missing.

Change-Id: I56cb881ff55f5928b77cddc0d67086c3d37e43d7
2016-03-16 12:41:20 -07:00
Przemyslaw Szczepaniak
43195cfdc6 Merge "Add java.util.stream to whitelisted packages"
am: 44fb624

* commit '44fb6241bed675b959dabf0732b97bff9e99795a':
  Add java.util.stream to whitelisted packages
2016-03-16 18:55:14 +00:00
Sen Jiang
4438fd909e Add zlib_fingerprint to target_files.zip
Test: make dist on edison-userdebug
Bug: 27156099

Change-Id: I4ba9095ecc5bb1730b8d0ba2d56d20fdbff3acaa
2016-03-16 11:28:19 -07:00
Yohann Roussel
22a9e788a7 Fix jack min sdk version for ub branches
Bug: 27371864

(cherry picked from commit d6101b6786)

Change-Id: Idd926f5667fbe4275f8f1d80733b8c4471570874
2016-03-16 17:59:18 +01:00
Yohann Roussel
fd8bdb4f3b Fix jack min sdk version for ub branches
am: d6101b6

* commit 'd6101b678688bce96d67f8d945537f405f648194':
  Fix jack min sdk version for ub branches
2016-03-16 16:45:11 +00:00
Yohann Roussel
26912851ab resolve merge conflicts of 63de777 to nyc-dev-plus-aosp
Change-Id: I5dadd6f7bbf494665f9deb0cfafcce65530825d0
2016-03-16 17:33:38 +01:00
Yohann Roussel
d6101b6786 Fix jack min sdk version for ub branches
Bug: 27371864
Change-Id: Idd926f5667fbe4275f8f1d80733b8c4471570874
2016-03-16 17:20:20 +01:00
Przemyslaw Szczepaniak
44fb6241be Merge "Add java.util.stream to whitelisted packages" 2016-03-16 15:52:57 +00:00
Yohann Roussel
63de777488 Merge "Inform Jack of the min sdk" into nyc-dev 2016-03-16 15:41:58 +00:00
Yohann Roussel
740ec8fe8a Inform Jack of the min sdk
Set Jack min sdk according to LOCAL_SDK_VERSION. Gives Jack current
version when LOCAL_SDK_VERSION is not available.

Bug: 27371864

(cherry picked from commit c6383d6ec6)

Change-Id: Ieba0219494f29d2737d2ca234317c3af7e5e72c8
2016-03-16 15:41:00 +01:00
Przemyslaw Szczepaniak
fe606f0939 Add java.util.stream to whitelisted packages
Bug: 27692239
Change-Id: I50e671222efc415fb930e5493f1943c5b8f6a71c
2016-03-16 13:45:23 +00:00
Yohann Roussel
c6383d6ec6 Inform Jack of the min sdk
Set Jack min sdk according to LOCAL_SDK_VERSION. Gives Jack current
version when LOCAL_SDK_VERSION is not available.

Bug: 27371864

Change-Id: I5db233fe09aed0fae37fe9a92658bc8f24b86cdf
2016-03-16 11:55:46 +01:00
Yohann Roussel
22313f2b2a Remove rules for building dex with dx
This is just to ensure no dex file is built with dx any more, cleaning
of the build rules from Jack optionality is still to be done.

Bug: 27218410
Change-Id: Iea2c66802b6c64c52690ad9d6d487bdce5f50b79
2016-03-16 10:33:02 +01:00
Sen Jiang
8d754a5e0b Merge "Revert "Add zlib_fingerprint to target_files.zip""
am: d2ca52d

* commit 'd2ca52df8c7ac08c3191118fa8606816d20ac119':
  Revert "Add zlib_fingerprint to target_files.zip"
2016-03-16 04:12:44 +00:00
Sen Jiang
d2ca52df8c Merge "Revert "Add zlib_fingerprint to target_files.zip"" 2016-03-16 04:04:41 +00:00
Sen Jiang
040141becb Revert "Add zlib_fingerprint to target_files.zip"
This reverts commit d8c715bf34.

Change-Id: Ie0c3c5b2db89fe076d678b67f013c20e836d825f
2016-03-16 03:38:29 +00:00
Sen Jiang
e55b1ffa8c Merge "Add zlib_fingerprint to target_files.zip"
am: 65aa976

* commit '65aa9761539736e4ab5622d0cff5d8160cc620f8':
  Add zlib_fingerprint to target_files.zip
2016-03-16 03:06:32 +00:00
Sen Jiang
65aa976153 Merge "Add zlib_fingerprint to target_files.zip" 2016-03-16 02:59:36 +00:00
Ying Wang
8d7e09cee1 Fix error introduced in merge commit c9a19779a2.
Change-Id: I0f49519f4c9dd16052e85a7b820e1ed8f4300380
2016-03-15 16:58:51 -07:00
Chih-Hung Hsieh
ad741e6d66 Link in ASAN library if my_global_santitize is set.
* When my_global_santitize is set and requires ASAN,
  link with ASAN library even when local module is not
  instrumented with ASAN, unless the local module is
  the ASAN library itself.
* Add -Wl,--as-needed to my_ldflags for shared libraries
  so that unneeded ASAN library would not become
  a dependent of the built .so file.
* Change shared file and executable file link argument order
  so that -Wl flags will have effect on linked-in libraries.
* Remove unused ADDRESS_SANITIZER_CONFIG_EXTRA_SHARED_LIBRARIES.

BUG: 27614834

Change-Id: I4eda6003f1f24e498cba91c043dbe1fabe522686
2016-03-15 16:53:46 -07:00