Commit Graph

9634 Commits

Author SHA1 Message Date
TreeHugger Robot 2c7fd2d170 Merge "Describe required format for for PLATFORM_SECURITY_PATCH" into nyc-dev 2016-04-28 05:07:55 +00:00
Mohamad Ayyash b88afd7aca Merge "Rename incr ext4 base_fs path vars. Add to product_var_list." into nyc-dev 2016-04-27 21:15:05 +00:00
Igor Murashkin 5ec15a52b1 old-cts: Add testng and libcoreoj test support
Bug: 27521545
Change-Id: I2a954401ce47604987a437a2741bcab252d32708
2016-04-26 17:47:45 -07:00
Adam Lesinski d4d6a50fbb Call aapt2 link with argument-list
Also follow symbolic links when looking for assets.

Bug:22775504

Change-Id: I78b4e2b7d7750dfecafd64e29cf0e19dff851155
2016-04-26 13:32:01 -07:00
Narayan Kamath 9a611b27fc Merge "Revert "old-cts: Add testng and libcoreoj test support"" into nyc-dev 2016-04-26 13:22:08 +00:00
Narayan Kamath 51b3f1da0b Revert "old-cts: Add testng and libcoreoj test support"
This reverts commit 1d4ad6a527.

This topic has been reverted because it causes build flakiness and
bogus verification failures on most active changes.

Change-Id: I4a935c9a861e063e28ddc1c35bc3fa015174e81d
2016-04-26 13:14:55 +00:00
Igor Murashkin 1cb8adb1fa Merge "old-cts: Add testng and libcoreoj test support" into nyc-dev 2016-04-25 23:39:16 +00:00
Mohamad Ayyash 1868a601b7 Rename incr ext4 base_fs path vars. Add to product_var_list.
BUG: 27698960
Change-Id: I4624f782846ee54525d0ac29b866a04c0d67aa40
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-04-25 15:47:42 -07:00
Keun Soo Yim 3d4847525f build rule change for VTS (vendor test suite)'s metadata files
Change-Id: I76b81529a97b672e08632703d2f6a2777ee8811e
2016-04-25 13:06:57 -07:00
Baligh Uddin 69cf5dfc4d DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
Bug: 23967152
2016-04-24 12:40:03 -07:00
Zach Jang b5658074c3 Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77 am: d4b8d2b am: 63398dd am: d402579
am: 3f578d2

* commit '3f578d27312e5c075daf7e66787a1b4fe64a8a4e':
  Update security patch string to 2016-06-01

Change-Id: Ia5b128d3719872fd991417620e9bee82dbc5da24
2016-04-20 22:11:57 +00:00
Zach Jang d402579bc0 Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77 am: d4b8d2b
am: 63398dd

* commit '63398dd7ea01ea331e2ea362c3235b79fefd5cfe':
  Update security patch string to 2016-06-01

Change-Id: Icea8df8e59f72146ecf737473cbba19d0b6aba5d
2016-04-20 21:47:54 +00:00
Zach Jang 63398dd7ea Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77
am: d4b8d2b

* commit 'd4b8d2b59f804544e09cb3e600ff290792470999':
  Update security patch string to 2016-06-01

Change-Id: I837a9f96b9d35f315b2bf92e600084ecb879b264
2016-04-20 21:42:16 +00:00
Zach Jang d4b8d2b59f Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757
am: 05a8c77

* commit '05a8c77e4231828db15aee343f79ebd2dd6607dd':
  Update security patch string to 2016-06-01

Change-Id: I427cd7ac7b33d5f5891ccd96a4fbaeb0a0f7c5e7
2016-04-20 21:35:11 +00:00
Zach Jang 05a8c77e42 Update security patch string to 2016-06-01 am: 0a3b3d4
am: 0ca3757

* commit '0ca37573e53bc3a481daa3a807dfc6960227fb0f':
  Update security patch string to 2016-06-01

Change-Id: I91bf9e0ce857dbb6cde8132e97499011b2325ba2
2016-04-20 19:50:19 +00:00
Zach Jang 0ca37573e5 Update security patch string to 2016-06-01
am: 0a3b3d4

* commit '0a3b3d40c10e76e75d11a0c3cddc3ea637871886':
  Update security patch string to 2016-06-01

Change-Id: I276f6d99393230230e514c6613d7a7d858a78a9a
2016-04-20 18:49:54 +00:00
TreeHugger Robot 816dd48126 Merge "Make jack_check_timestamp depend on setup-jack-server" into nyc-dev 2016-04-20 01:54:54 +00:00
Colin Cross febe2bcc21 Make jack_check_timestamp depend on setup-jack-server
Some builds were failing with:
[  3% 2226/61362] /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
FAILED: /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
No Jack server running. Try 'jack-admin start-server'

While jack-admin was running concurrently:
[  3% 2226/61362] /bin/bash -c "(prebuilts/sdk/tools/jack-admin stop-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin kill-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin uninstall-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin install-server prebuilts/sdk/tools/jack-launcher.jar prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar  2>&1 || (exit 0) ) && (mkdir -p \"/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/\" ) && (JACK_SERVER_VM_ARGUMENTS=\"-Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/jack-server-%u-%g.log\" prebuilts/sdk/tools/jack-admin start-server 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update server prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar 4.8.ALPHA 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-2.28.RELEASE.jar 2.28.RELEASE || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.26.ALPHA.jar 3.26.ALPHA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.27.BETA.jar 3.27.BETA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.30.BETA.jar 3.30.BETA || exit 47 )"
Stopping background server
Killing background server
No Jack server to kill
Removing jack server from "/Users/android-build/.jack-server"
Installing jack server in "/Users/android-build/.jack-server"
Launching Jack server java -XX:MaxJavaStackTraceDepth=-1 -Djava.io.tmpdir=/buildbot/tmp -Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/jack-server-%u-%g.log -cp /Users/android-build/.jack-server/launcher.jar com.android.jack.launcher.ServerLauncher

Change-Id: Ib35f313daee93dc6a3548e652cbcd4cb4d304f93
2016-04-19 17:22:29 -07:00
Ying Wang 8f8099c96a Don't reset LOCAL_*MODULE_STEM.
By resetting we lose LOCAL_*MODULE_STEM values for the second include
of the *_internal.mk.
We don't need to reset because we now store the default value to a
temporary variable my_*module_stem in configure_module_stem.mk.

Bug: 27775991

(cherry picked from commit c160c3f21a)

Change-Id: I5d9b7f7214d98a1bf953fadb9951a8af1e993057
2016-04-19 14:26:58 -07:00
Zach Jang 0a3b3d40c1 Update security patch string to 2016-06-01
b/28269112

Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c
2016-04-19 10:56:31 -07:00
Sebastien Hertz ad84f802fc Merge "Allow to force min sdk given to Jack" into nyc-dev 2016-04-14 23:17:18 +00:00
Tao Bao 8fe9274ab9 Merge "Makefile: Pack squashfs and f2fs tools into otatools.zip." into nyc-dev 2016-04-14 22:11:18 +00:00
Yohann Roussel d98c42071a Allow to force min sdk given to Jack
Allows setting the min sdk version for target Jack commands,
overriding the default value obtained from LOCAL_SDK_CURRENT.

Bug: 28188420

(cherry picked from commit 109141ccc9)

Change-Id: Id9c5275bc71b8d9042173bf1e40aa3199e9508e6
2016-04-14 23:25:14 +02:00
Tao Bao cffaf73f84 Makefile: Pack squashfs and f2fs tools into otatools.zip.
The following tools are essential to create squashfs and f2fs images
during signing (if applicable).

squashfs: mksquashfs and mksquashfsimage.sh
f2fs: make_f2fs and mkf2fsuserimg.sh

Bug: 28179154
Change-Id: Ia48bc6d9a40d2667bc6f2c973bd0c55eed7a06fc
2016-04-14 13:33:35 -07:00
Ying Wang 2e2c137913 Reject Google's build of JDK.
Bug: 28097637

(cherry picked from commit 22b23b9b00)

Change-Id: Ieb809cdd0ba930b9ea65b8b0d31a81be112cc52e
2016-04-14 12:30:25 -07:00
Andreas Gampe 4b941608e9 Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS" into nyc-dev 2016-04-12 22:19:04 +00:00
Andreas Gampe 7928bc8554 Build: Add ART_BOOT_IMAGE_EXTRA_ARGS
Allow to modify the boot image compilation. Can be used to easily
dump initialization failures.

Bug: 27265238

(cherry picked from commit 907fb03273)

Change-Id: I9d54c562a2e623b23b7c1dea9cdbe303786c95dd
2016-04-12 14:24:50 -07:00
Ying Wang 8419b7f35e Include classes.jar with class files in aar.
As we switched to Jack the LOCAL_BUILT_MODULE (javalib.jar) now
include .jayce files.

Change-Id: If802e02bb20a9e105ca9563e6fe483f7acce00e6
2016-04-12 12:57:36 -07:00
Julien Desprez 188a1dd18f Benchmark have their own folder
Benchmark tests use a separate folder from native tests.

Bug: 27465556
Change-Id: Ife0f43062e36ffc856f41683ddc4d91a7787333e
2016-04-12 18:57:36 +01:00
Dan Willemsen 758f872836 Merge "Ensure prebuilt executables are executable" into nyc-dev 2016-04-11 19:59:10 +00:00
Dan Willemsen 23f326a67d Ensure prebuilt executables are executable
Use 'chmod +x' to make sure that they're executable, even if the source
file is not.

Bug: 28097475
Change-Id: Id155f6b4ff188f5c909fd6237fd64183af264f79
(cherry picked from commit 08420cbc8a)
2016-04-11 11:21:47 -07:00
Sebastien Hertz 18da8dd97a Update code coverage filtering
Replaces old LOCAL_EMMA_COVERAGE_FILTER by new variables:
- LOCAL_JACK_COVERAGE_INCLUDE_FILTER for included classes
- LOCAL_JACK_COVERAGE_EXCLUDE_FILTER for excluded classes
Both variables can contain a comma-separated list of class names,
where * and ? are accepted wildcard (like foo.?ar.*).

When code coverage is enabled, we will use these variables to
pass code coverage filters on the Jack command-line.

Bug: 28014424

(cherry picked from commit 74ec3f49d1)

Change-Id: Ie4253981c0e6a62422ab84dfd67ef5eebc0b0284
2016-04-11 16:43:12 +02:00
Ian Pedowitz 839ec10bbc PLATFORM_PREVIEW_SDK_VERSION = 3 for DP3
Bug: 27150977
Change-Id: I8f13cec505a73678fb605ee3bce00519d16c2f7e
2016-04-08 14:05:00 -07:00
Igor Murashkin 1d4ad6a527 old-cts: Add testng and libcoreoj test support
Bug: 27521545
Change-Id: I2a954401ce47604987a437a2741bcab252d32707
2016-04-07 16:55:08 -07:00
Joe Onorato 4b60ee5b7b Merge changes I8f95f3f8,Ic2e384ad into nyc-dev
* changes:
  Add generation of a module-info.json file
  Remove unused module-info.txt generation.
2016-04-07 18:34:43 +00:00
Joe Onorato 48bd6f53f4 Add generation of a module-info.json file
This outputs all of the modules that the build system knows about
for this invocation.

Change-Id: I8f95f3f8443c18f7898ce90e287432cbd2b6db6d
2016-04-06 19:11:51 -07:00
Joe Onorato 969b6f8ada Remove unused module-info.txt generation.
Change-Id: Ic2e384ad3e2bae8e76a98818c18a99bf5d427b0e
2016-04-06 14:49:55 -07:00
Sebastien Hertz e771251424 Merge "Fix code coverage for apps" into nyc-dev 2016-04-05 07:11:48 +00:00
Mohamad Ayyash 21e6bf3b38 Merge "Always build squashfs host tools" into nyc-dev 2016-04-04 19:46:48 +00:00
Mohamad Ayyash 5d65020e44 Always build squashfs host tools
Now that mac compatibility has been fixed

BUG: 27657762
Change-Id: I49933ccedf74b9d172967dad721971a752047da6
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-04-04 12:31:41 -07:00
Julien Desprez 1287843ab7 Add vts to build in ninja
Bug: 27687012
Change-Id: Icb94e3eee71a8f54f13f868fa2461b2063e7ca6d
2016-04-01 15:39:48 +01:00
Miao Wang a529cebde8 Merge "[RenderScript] Update the build rules for x86_64 support lib." into nyc-dev 2016-03-31 22:25:10 +00:00
Johan Redestig 8d3311f50d DO NOT MERGE ANYWHERE - Add libbase to otatools
build_verity_tree uses libbase since b104044.

Change-Id: I6d3406a107ceb6cd58d1a51aa79935209d4c435f
2016-03-31 14:20:38 -07:00
Miao Wang 57ef7ea490 [RenderScript] Update the build rules for x86_64 support lib.
Bug: 19735423

  - Unlike other archs, x86_64 has both usr/lib and usr/lib64. we need
    to search for libm.so and libc.so in lib64/. Otherwise the linker
    will report error.

Change-Id: I2859bee066a9eb100828d90da8adf0f9817d77e6
2016-03-31 14:05:33 -07:00
Ying Wang 9109282846 Merge "Add core-lambda-stubs to default classpath for target libs compiling using javac" into nyc-dev 2016-03-31 18:06:27 +00:00
Sebastien Hertz d9641e01f3 Fix code coverage for apps
When building apps with EMMA_INSTRUMENT=true, we must ensure that
jacoco is at least on the classpath (or even embedded for unbundled
branches) and that proguard will ignore jacoco classes. Otherwise
the Jack compilation would fail.

For unbundled build, we include the proguard configuration file
build/core/proguard.jacoco.flags to ignore jacoco classes.

For full build, we ensure jacoco is on the classpath during the
jack compilation.

Bug: 27607712
Change-Id: I0ad37d74e63028a8144a125f052dc1c5fa10fc66
2016-03-31 18:33:57 +02:00
Sebastien Hertz 301d5955da Merge "Rename emma coverage files" into nyc-dev 2016-03-31 06:58:30 +00:00
Colin Cross bbb7b1b620 Merge changes Ib0fdae2e,Ib8b9e0f8 into nyc-dev
* changes:
  Handle symlinked OUT_DIRs (again)
  Handle out being a symlink
2016-03-30 22:18:34 +00:00
Dan Willemsen ae18638b04 Handle symlinked OUT_DIRs (again)
My previous attempt at properly handling symlinked OUT_DIRs only worked
if the symlink was to a different directory, not one in the same
directory.

This time, make sure that both make and soong use the same
representation of the output directory by passing BUILDDIR to
bootstrap.bash. Soong has been updated to pick whether to use a relative
or absolute path back to the source tree depending on what makes sense.
If the BUILDDIR or the path back to the source tree change, re-run the
bootstrap.

Also, move the $OUT_DIR/Android.mk and $OUT_DIR/CleanSpec.mk generation
to before Kati runs. In the case that $TOP/out was symlinked to
$TOP/out.angler:

 1) Soong generates out.angler/soong/Android.mk
 2) Kati's find generator produces in-memory tree of the filesystem
 3) $(shell ) creates out.angler/Android.mk
 4) The emulated findleaves Android.mk search finds
    out.angler/soong/Android.mk since the in-memory tree is never updated.

This doesn't happen in the normal case, because we pass --prune=$OUT_DIR
to findleaves.

Change-Id: Ib0fdae2e80f75ddcf33a3c8c5ea0978f5308b437
(cherry picked from commit cc60f01357)
[ccross: resolved conflicts in nyc-dev]
2016-03-30 12:24:57 -07:00
Dan Willemsen 4e2677eaf1 Handle out being a symlink
Soong needs to be able to reverse the relative path to out. Switch to
absolute paths if .. won't work because of out being a symlink to
somewhere else.

Bug: 27612837
Change-Id: Ib8b9e0f80523148cfd4b69a03d164578916d8fd5
(cherry picked from commit d53c0c7b45)
[ccross: resolved conflicts in nyc-dev]
2016-03-30 12:24:44 -07:00
Neil Fuller b08544ed7d Add core-lambda-stubs to default classpath for target libs compiling using javac
In order to compile lambda code javac requires various invokedynamic-
related classes to be present. This change adds stubs needed for
javac to compile lambdas.

Bug: 27475234
Bug: 26753820
Bug: 26604040
Change-Id: Ifc79eebabfc6b64c0daf6b9ca236d1967a45a735
2016-03-30 11:01:33 -07:00
Sebastien Hertz 6ec1f057dc Rename emma coverage files
We no longer use emma with Jack. However, during the process of a
full build, we may run the emma task and overwrite the coverage file
generated by Jack with the one from emma because they use the same
filename.

This CL renames coverage files generated by emma so they no longer
break those created by Jack.

Keep coverage.em file name for host rules where Jack is not called.

Bug: 27822188

(cherry picked from commit 491c9ce48a
&& commit 8f0e52c3a6)

Change-Id: I26beee5a8d42a2ef1d476661e4b591fb09f1276f
2016-03-30 19:03:34 +02:00
Shawn Willden f041559cd4 Describe required format for for PLATFORM_SECURITY_PATCH
Hardware-backed keystore attestation and version binding rely on
PLATFORM_SECURITY_PATCH having the format YYYY-MM-DD.

Bug: 22914603
Change-Id: If116e3ca5611920021b098d6b610ae609956aa5c
2016-03-30 07:55:32 -06:00
Ying Wang 19b8145447 Merge "Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt" into nyc-dev 2016-03-29 21:31:24 +00:00
Allen Hair eda71810b8 Merge "Only add jacocoagent if the package contains some java code." into nyc-dev 2016-03-29 21:18:24 +00:00
Ying Wang 6f9bd2a972 Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt
In commit e758f9319d we switched from
TARGET_AAPT_CHARACTERISTICS to PRIVATE_TARGET_AAPT_CHARACTERISTICS in
add-assets-to-package but forgot to set the variable when we are running
the old aapt.

Bug: 27874886
Change-Id: I03ced3030dcb9f024eef5b23dbfd5d99157952ea
2016-03-29 12:41:42 -07:00
Colin Cross 4aca571552 Remove -d keepdepfile from ninja command line DO NOT MERGE
keepdepfile is not supported by the ninja prebuilt in nyc-dev.

Bug: 27886012
Change-Id: Ia4f0b15916618b1b7caa2abb53e25f87737b5288
2016-03-29 12:10:53 -07:00
Shinichiro Hamaji 0f846c73e1 Replace last -includes by .KATI_DEPFILE
There was a typo in binary.mk. compile-dotdot-XXX-file in
definitions.mk was also using -include.

Bug: 26839129
Bug: 27886012
Change-Id: I4a0145fb70413998cc65d30d2efcd68af07b4800
(cherry picked from commit 72904774a3)
2016-03-29 12:10:48 -07:00
Shinichiro Hamaji 2fb7b61a2e Use KATI_DEPFILE for .P associated with object files
Also specify "-d keepdepfile" to ninja so .P files won't be
deleted by ninja.

-include for .s files are removed because GCC doesn't
generate .d files for .s files.

Bug: 26839129
Bug: 27886012
Change-Id: If00e93c7a33449ec314a5cdba438475a32979f4e
(cherry picked from commit 4037c4225a)
2016-03-29 12:10:03 -07:00
Baligh Uddin f9d685008d Add ability to package verifiedboot keys 2016-03-28 13:09:03 -07:00
Allen Hair 0f85562384 Only add jacocoagent if the package contains some java code.
Bug: 27877982
Change-Id: I8bf05d67a823402e7e488990753cc9005ec5e90b
2016-03-28 12:52:37 -07:00
Shinichiro Hamaji a73d4297a0 Link everything in libpthread.a to ckati
With this workaround, we can delete a lot of unnecessary code
in ckati: https://github.com/google/kati/commit/8380fb8525adfb5

Bug: 26839129
Change-Id: I3de1bf4cd6f2a65ee9322e8504459621871612fc
(cherry picked from commit f4511161d5)
2016-03-25 14:01:16 -07:00
Colin Cross c031c758c6 Merge "Ignore Android.mk files with USE_SOONG=true" into nyc-dev 2016-03-25 19:54:30 +00:00
Ying Wang efaf5efd06 Use $(BUILD_SYSTEM) as the LOCAL_PATH of auto-generated modules.
So that we don't mess up with the vendor path check by accident.

Bug: 27543283
Change-Id: I6c34caefe3ff4abfdd8349a32c68fcca524cfd8e
2016-03-24 17:24:38 -07:00
Colin Cross 946a08cf51 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
(cherry picked from commit 861ab99536)
2016-03-24 14:36:48 -07:00
Zach Jang 901590ae2a Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea am: 6bbd684 am: f32d07d am: 0cf7987
am: ae7c301

* commit 'ae7c3010265171b2c215c5a30049320ba50265a7':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 01:10:42 +00:00
Zach Jang 0cf7987b7e Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea am: 6bbd684
am: f32d07d

* commit 'f32d07dd9328401525e333a34464a1d1f363e524':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 01:03:47 +00:00
Zach Jang f32d07dd93 Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483 am: 08d9bea
am: 6bbd684

* commit '6bbd684464a1307f074e6c173a9147d6e2a626f1':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 01:00:15 +00:00
Zach Jang 6bbd684464 Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780 am: 274e483
am: 08d9bea

* commit '08d9bea41096f7c055cf67860a07436da6712b01':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 00:56:45 +00:00
Zach Jang 08d9bea410 Update Security String to 2016-05-01 in preparation for May 2016 Security OTA am: 175b780
am: 274e483

* commit '274e48378f92c711d28876380f34e263159cb81b':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 00:53:20 +00:00
Zach Jang 274e48378f Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
am: 175b780

* commit '175b7800f484edceee404abf21973859d5793c0d':
  Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
2016-03-23 00:49:48 +00:00
Zach Jang 6faa48a0b5 Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5 am: df28b90 am: b90d094 am: fa24625 am: d7bf980 am: 87582a8
am: 880e914

* commit '880e914ec6b8ce053ad5b766a2907afaf0c79673':
  Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
2016-03-22 01:03:01 +00:00
Zach Jang 87582a8758 Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5 am: df28b90 am: b90d094 am: fa24625
am: d7bf980

* commit 'd7bf9800f4f5fdc83b2ffb163207025459b26b36':
  Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
2016-03-22 00:56:58 +00:00
Zach Jang d7bf9800f4 Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5 am: df28b90 am: b90d094
am: fa24625

* commit 'fa2462551694090da0d0c941d805165c2e2f6dc2':
  Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
2016-03-22 00:54:07 +00:00
Zach Jang fa24625516 Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5 am: df28b90
am: b90d094

* commit 'b90d09439a5901f78e9eae332f163cdc1ff98f49':
  Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
2016-03-22 00:51:24 +00:00
Zach Jang b90d09439a Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805 am: 2b71be5
am: df28b90

* commit 'df28b90a7c45a02c4ba9896ad89f745a48fac7df':
  Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
2016-03-22 00:48:45 +00:00
Zach Jang df28b90a7c Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
am: 2b71be5

* commit '2b71be536b6de0d16d0ae3224d1b00c41bec467e':
  Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
2016-03-22 00:45:26 +00:00
Zach Jang 175b7800f4 Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
b/27724973

Change-Id: I572123586730e45b304f352c8b0fd6371ff5788b
2016-03-21 17:42:55 -07:00
Pirama Arumuga Nainar 83bebe3fc5 Switch to clang-2690385
http://b/26987366

(cherry picked from commit 760aec5fdf)

Change-Id: Ib26fa27c214b67024ad43a1e0b1db277d7c7f929
2016-03-20 22:57:32 -07:00
Pirama Arumuga Nainar 27b18f5c95 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.

(cherry picked from commit 41f4b242e3)

Change-Id: I50751f410a2f7c83532cec9b96c50d9afe1224c1
2016-03-20 22:53:04 -07:00
Yohann Roussel 2ae244c578 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

(cherry picked from commit 22313f2b2a)

Change-Id: I1e7f2f5dcc7f95a44f5ebf2e4ba99931ff3ba014
2016-03-18 16:03:00 +01:00
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 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
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 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
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
Yohann Roussel d6101b6786 Fix jack min sdk version for ub branches
Bug: 27371864
Change-Id: Idd926f5667fbe4275f8f1d80733b8c4471570874
2016-03-16 17:20:20 +01: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
Ying Wang fc16dca602 Merge "Rebuild odex files in PDK fusion build." into nyc-dev 2016-03-15 21:23:50 +00:00