Commit Graph

9824 Commits

Author SHA1 Message Date
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
Ying Wang
234985a127 Merge "Fix warning of "overriding commands for target ...boot.oat"." into nyc-dev 2016-03-15 20:59:25 +00:00
Ying Wang
222ebac10c Fix warning of "overriding commands for target ...boot.oat".
There seems to be bug in Kati that when we write it as:
LIBART_TARGET_BOOT_ART_EXTRA_FILES += boot.oat $(patsubst
%.art,%.oat,$(LIBART_TARGET_BOOT_ART_EXTRA_FILES))

boot.oat ends up in the value twice.
This works around the bug, filed as bug/27676615.

Bug: 27546601
Change-Id: Ifc330280496083a4c817e53bc5c77c86e48a2426
2016-03-15 12:26:55 -07:00
Sami Tolvanen
a8c37be285 Revert "Revert "build: pass version and patch level to mkbootimg""
This reverts commit 494a9090f9.

Bug: 27498078
Bug: 22914603
Change-Id: Iee6a784271ec32c6bfcc0a6ad3f0395d82016df3
(cherry picked from commit 3303d909a1)
2016-03-15 11:23:56 -07:00
Ying Wang
3a61eeb6cb Rebuild odex files in PDK fusion build.
To rebuild odex files of Java libraries and apps,
we store the jars/apks without stripping the classes.dex inside the
platform.zip. We also save the build variables that may affect how we
rebuild an odex in pdk_dexpreopt_config.mk in the platform.zip.
We store the files and configuration only for libraries/apps that get
installed to the system.img (or vendor.img).

In PDK fusion build, we auto-generate prebuilt module definitions for
the javalib.jar and package.dex.apk carried in the platform.zip, using
configuration stored in pdk_dexpreopt_config.mk.
With the prebult modules, we override the implicit rule that directly
copies the odex from the platform.zip.
To rebuild odex of javalib.jar, we added support for prebuilt shared Java
library to prebiult_internal.mk. An installable prebuilt Java library is
treated as shared Java library, i.e. with classes.dex in the jar instead
of a set of .class files.
For apks in the platform.zip, we install the stripped version from
platform files inside platform.zip, instead of the package.dex.apk,
using a new variable LOCAL_REPLACE_PREBUILT_APK_INSTALLED. We can't
strip package.dex.apk because we can't re-sign the stripped apk at this
point.

We generate prebuilt module only if it's not already defined in the
source tree.

Bug: 27543283
Change-Id: I9e146f8b713d6f57c397fd28d88c9ab700757ca1
2016-03-14 21:01:46 -07:00
Sami Tolvanen
b3038bedcd Merge "Revert "build: pass version and patch level to mkbootimg"" into nyc-dev 2016-03-14 15:49:15 +00:00
Sami Tolvanen
1bca9fb6d4 Revert "build: pass version and patch level to mkbootimg"
This reverts commit e555f77962.

Bug: 27580174
Change-Id: I0fd1ddb64d2fd4f91b0ecbc1ab8953a1324a10eb
2016-03-14 15:47:11 +00:00
Ian Pedowitz
e5df61318e PLATFORM_PREVIEW_SDK_VERSION = 2 for DP2
Bug: 27150977
Change-Id: I8b86b5565dbdf81dffb4bc9ba0eef8a3c3f91d20
2016-03-11 22:13:36 -08:00
Stephen Hines
efd50b725b Switch to clang-2658975.
Bug: http://b/27482631

This fixes an issue where krait compiles were not passing the proper
flags to the assembler when -no-integrated-as is used. This was
preventing ART from switching to clang in some cases.

(cherry picked from commit c503d8ef58)

Change-Id: I4a0efb78f37fee73bf61841f0347328b8f61c192
2016-03-11 15:03:18 -08:00
Andreas Gampe
6f0a902081 Merge changes I4a2692f3,Ifd8d3a2c into nyc-dev
* changes:
  Build: Only preopt boot images in eng builds
  Revert "Don't preopt on eng builds."
2016-03-11 16:20:51 +00:00
Andreas Gampe
4df565786a Build: Only preopt boot images in eng builds
As a middle way between full preopt/high performance/long builds,
and no preopt/low performance/fast turnaround, preopt only the
boot image in eng builds.

Bug: 26794212
Change-Id: I4a2692f3ce84823cd40c6b7d672fd73257739ef8
2016-03-10 15:34:46 -08:00
Andreas Gampe
6c6c51aa79 Revert "Don't preopt on eng builds."
This reverts commit 7effde0048.

Bug: 25801231
Bug: 26794212
2016-03-10 15:07:27 -08:00
Ying Wang
bd07ad01b5 Add dependency on boot_singer and vboot_singer if necessary.
Change-Id: Ic10c2ae6a0debf51100a30eb11217e77060a6066
2016-03-10 21:01:54 +00:00
Neil Fuller
e82f56c4f7 Merge "Make the language version selection smarter" into nyc-dev 2016-03-10 09:45:55 +00:00
Joe Onorato
401ffaeb75 Turn off excess printing during the build which makes errors harder to find.
Change-Id: I588de5ddc0aa7dcaacc4ea185c13c2fa3748888a
2016-03-09 15:25:07 -08:00