OSDN Git Service
The Android Automerger [Thu, 31 Mar 2016 21:08:19 +0000 (14:08 -0700)]
"NRC91C"
The Android Automerger [Thu, 31 Mar 2016 20:00:52 +0000 (13:00 -0700)]
"NRC91B"
The Android Automerger [Thu, 31 Mar 2016 07:06:08 +0000 (00:06 -0700)]
"NRC91"
The Android Automerger [Thu, 31 Mar 2016 07:02:35 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Philip P. Moltmann [Thu, 31 Mar 2016 01:33:15 +0000 (01:33 +0000)]
Merge "Add PrintServiceRecommendationService to the default distro" into nyc-dev
Andreas Gampe [Wed, 30 Mar 2016 23:05:59 +0000 (23:05 +0000)]
Merge "Build: Switch eng build boot dexopt to verify-at-runtime" into nyc-dev
The Android Automerger [Wed, 30 Mar 2016 22:40:48 +0000 (15:40 -0700)]
"NRC90B"
Colin Cross [Wed, 30 Mar 2016 22:18:33 +0000 (22:18 +0000)]
Merge changes Ib0fdae2e,Ib8b9e0f8 into nyc-dev
* changes:
Handle symlinked OUT_DIRs (again)
Handle out being a symlink
Andreas Gampe [Wed, 30 Mar 2016 19:18:34 +0000 (12:18 -0700)]
Build: Switch eng build boot dexopt to verify-at-runtime
To have faster turnaround.
Bug:
26794212
Change-Id: I1d7877ec8c9cfff62bf14cbd23a790ee7a0b2734
Dan Willemsen [Tue, 22 Mar 2016 21:44:17 +0000 (14:44 -0700)]
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
cc60f013576627bee37cd4d6c58bf740d35d0434)
[ccross: resolved conflicts in nyc-dev]
Dan Willemsen [Sat, 12 Mar 2016 00:11:25 +0000 (16:11 -0800)]
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
d53c0c7b45c3b18949fc62b784a8e8a877323493)
[ccross: resolved conflicts in nyc-dev]
The Android Automerger [Wed, 30 Mar 2016 07:06:53 +0000 (00:06 -0700)]
"NRC90"
The Android Automerger [Wed, 30 Mar 2016 07:02:42 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Tue, 29 Mar 2016 23:44:10 +0000 (16:44 -0700)]
"NRC89C"
Ying Wang [Tue, 29 Mar 2016 21:31:24 +0000 (21:31 +0000)]
Merge "Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt" into nyc-dev
Allen Hair [Tue, 29 Mar 2016 21:18:24 +0000 (21:18 +0000)]
Merge "Only add jacocoagent if the package contains some java code." into nyc-dev
The Android Automerger [Tue, 29 Mar 2016 21:13:52 +0000 (14:13 -0700)]
"NRC89B"
Ying Wang [Tue, 29 Mar 2016 19:41:42 +0000 (12:41 -0700)]
Set PRIVATE_TARGET_AAPT_CHARACTERISTICS even when running with the old aapt
In commit
e758f9319dcb6cc9693af03cc03d385167a35a8d 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
Colin Cross [Tue, 29 Mar 2016 17:47:51 +0000 (10:47 -0700)]
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
Shinichiro Hamaji [Tue, 15 Mar 2016 21:40:04 +0000 (06:40 +0900)]
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
72904774a35d395116bb784b5d2adc1a8d637e8e)
Shinichiro Hamaji [Thu, 3 Mar 2016 09:12:52 +0000 (18:12 +0900)]
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
4037c4225a484130a5510671e788794d23204262)
The Android Automerger [Tue, 29 Mar 2016 07:07:11 +0000 (00:07 -0700)]
"NRC89"
The Android Automerger [Tue, 29 Mar 2016 07:02:28 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Mon, 28 Mar 2016 23:40:32 +0000 (16:40 -0700)]
"NRC88C"
Philip P. Moltmann [Mon, 14 Mar 2016 22:02:57 +0000 (15:02 -0700)]
Add PrintServiceRecommendationService to the default distro
Bug:
24533249
Change-Id: I0736b842c813c63924d026b2ab5d5e92ff92df76
The Android Automerger [Mon, 28 Mar 2016 21:36:42 +0000 (14:36 -0700)]
"NRC88B"
Baligh Uddin [Mon, 28 Mar 2016 20:07:14 +0000 (13:07 -0700)]
Add ability to package verifiedboot keys
Allen Hair [Mon, 28 Mar 2016 19:52:37 +0000 (12:52 -0700)]
Only add jacocoagent if the package contains some java code.
Bug:
27877982
Change-Id: I8bf05d67a823402e7e488990753cc9005ec5e90b
The Android Automerger [Mon, 28 Mar 2016 07:07:32 +0000 (00:07 -0700)]
"NRC88"
The Android Automerger [Mon, 28 Mar 2016 07:02:15 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Sun, 27 Mar 2016 07:07:02 +0000 (00:07 -0700)]
"NRC87"
The Android Automerger [Sun, 27 Mar 2016 07:03:01 +0000 (00:03 -0700)]
merge in nyc-release history after reset to nyc-dev
Andreas Gampe [Sat, 26 Mar 2016 00:02:05 +0000 (17:02 -0700)]
Build: Add first-boot dexopt settings defaults
Needed for factory-reset/first-boot/upgrade to N.
Bug:
27689078
Change-Id: I010e38c8a10445f87e95e1ff8d9daf1d051f2b06
Joe Onorato [Sat, 26 Mar 2016 00:36:02 +0000 (00:36 +0000)]
Merge "Set WifiHAL to only log debug by default." into nyc-dev
Joe Onorato [Fri, 25 Mar 2016 22:33:32 +0000 (15:33 -0700)]
Set WifiHAL to only log debug by default.
This is not the proper way to really fix this, but it is the best thing to
do in the time period we have for N. In the future they will be moving
more to a dumpsys style approach.
Change-Id: I98ec7928cd93a3edfb93cdbf3703132ac6658699
Shinichiro Hamaji [Fri, 26 Feb 2016 07:58:13 +0000 (16:58 +0900)]
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
f4511161d505681f4c5d4ff356fe61f4b78e7cf6)
Colin Cross [Fri, 25 Mar 2016 19:54:29 +0000 (19:54 +0000)]
Merge "Ignore Android.mk files with USE_SOONG=true" into nyc-dev
The Android Automerger [Fri, 25 Mar 2016 17:44:25 +0000 (10:44 -0700)]
"NRC84D"
Prathmesh Prabhu [Fri, 25 Mar 2016 17:18:21 +0000 (17:18 +0000)]
Merge "Emulator: Bump mips(64) system image partition size to 1.75 GB." into nyc-dev
Ying Wang [Fri, 25 Mar 2016 00:24:38 +0000 (17:24 -0700)]
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
Prathmesh Prabhu [Thu, 24 Mar 2016 20:38:06 +0000 (13:38 -0700)]
Emulator: Bump mips(64) system image partition size to 1.75 GB.
BUG:
27834040
Change-Id: I71861b023e8155df951036053ab0561e153d04fd
(cherry picked from commit
8a17ace10e709ce40fa75359aaba3eacb794be18)
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
(cherry picked from commit
861ab99536bf1a7a3b15dd08c17b9047fc88014b)
The Android Automerger [Thu, 24 Mar 2016 20:39:45 +0000 (13:39 -0700)]
"NRC84C"
Alex Klyubin [Thu, 24 Mar 2016 18:26:53 +0000 (18:26 +0000)]
Merge "Fix bug in APK entry alignment." into nyc-dev
Tianjie Xu [Thu, 24 Mar 2016 17:24:33 +0000 (17:24 +0000)]
Merge "Adjust the size limit for splitting large files" into mnc-dr-dev am:
7d55185 am:
2c355a1
am:
8c6a2a6
* commit '
8c6a2a601260b7433f792ebc2529e2d90e9cdae9':
Adjust the size limit for splitting large files
Tianjie Xu [Thu, 24 Mar 2016 17:22:07 +0000 (17:22 +0000)]
Merge "Adjust the size limit for splitting large files" into mnc-dr-dev am:
7d55185
am:
2c355a1
* commit '
2c355a15bed912df7c77e9738d03d84f5a200194':
Adjust the size limit for splitting large files
Tianjie Xu [Thu, 24 Mar 2016 17:19:42 +0000 (17:19 +0000)]
Merge "Adjust the size limit for splitting large files" into mnc-dr-dev
am:
7d55185
* commit '
7d551850ddea337b2b35938012e0d13a38c6af65':
Adjust the size limit for splitting large files
Tao Bao [Thu, 24 Mar 2016 17:12:00 +0000 (17:12 +0000)]
Merge "Adjust the size limit for splitting large files" into mnc-dr-dev
The Android Automerger [Thu, 24 Mar 2016 17:01:41 +0000 (10:01 -0700)]
"NRC84B"
The Android Automerger [Thu, 24 Mar 2016 16:59:01 +0000 (09:59 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Thu, 24 Mar 2016 07:05:35 +0000 (00:05 -0700)]
"NRC84"
The Android Automerger [Thu, 24 Mar 2016 07:02:32 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Alex Klyubin [Wed, 23 Mar 2016 20:05:27 +0000 (13:05 -0700)]
Fix bug in APK entry alignment.
APK entry alignment logic assumes that input entries have zero-length
comment and extra fields. When the assumption is broken, the logic
silently breaks alignment of output entries. This happens, for
example, when the APK to be signed is already aligned and thus may
contain entries with non-empty extra fields.
Given that APKs are not supposed to use comment and extra fields for
anything useful and given that this signer already discards comment
and extra fields of compressed entries, this change makes the signer
discard comment and extra fields of STORED input entries as well.
This unbreaks the existing alignment logic.
Bug:
27814973
(cherry picked from commit
37a0ecd32935685151f0cfb5a5466e6e360a0b8f)
Change-Id: If2e0df6d3298e9736ef175bb0d9a05d450164c9f
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
(cherry picked from commit
bb86e1d9c298940a11da0a3d47ed40f7b709194d)
The Android Automerger [Wed, 23 Mar 2016 23:17:52 +0000 (16:17 -0700)]
"NRC83D"
Andreas Gampe [Wed, 23 Mar 2016 02:44:24 +0000 (19:44 -0700)]
Build: Provide default values for dexopt settings
Provide default values for system properties used by the package
manager.
Bug:
27689078
Change-Id: Iedab0c0b1da6c905658546df7992f77fd6b55da1
The Android Automerger [Wed, 23 Mar 2016 20:47:42 +0000 (13:47 -0700)]
"NRC83C"
The Android Automerger [Wed, 23 Mar 2016 18:06:29 +0000 (11:06 -0700)]
"NRC83B"
The Android Automerger [Wed, 23 Mar 2016 07:04:50 +0000 (00:04 -0700)]
"NRC83"
The Android Automerger [Wed, 23 Mar 2016 07:02:31 +0000 (00:02 -0700)]
merge in nyc-release history after reset to nyc-dev
Zach Jang [Wed, 23 Mar 2016 01:10:42 +0000 (01:10 +0000)]
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
Zach Jang [Wed, 23 Mar 2016 01:07:14 +0000 (01:07 +0000)]
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
* commit '
0cf7987b7e96d2178fbb028e36992ffb1b589b38':
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
Zach Jang [Wed, 23 Mar 2016 01:03:47 +0000 (01:03 +0000)]
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
Zach Jang [Wed, 23 Mar 2016 01:00:15 +0000 (01:00 +0000)]
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
Zach Jang [Wed, 23 Mar 2016 00:56:45 +0000 (00:56 +0000)]
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
Zach Jang [Wed, 23 Mar 2016 00:53:20 +0000 (00:53 +0000)]
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
Zach Jang [Wed, 23 Mar 2016 00:49:48 +0000 (00:49 +0000)]
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
The Android Automerger [Wed, 23 Mar 2016 00:02:53 +0000 (17:02 -0700)]
"NRC82D"
smain@google.com [Tue, 22 Mar 2016 22:31:19 +0000 (15:31 -0700)]
remove the 'refonly' templates.
no longer needed, as the standard templates now have conditions to handle the reference only design.
bug:
27667787
Change-Id: I7c627ad4cace0bb1c77c494b3052eca3c9609a5c
smain@google.com [Tue, 22 Mar 2016 20:37:59 +0000 (13:37 -0700)]
add the 'reference only' header design as a condition to the normal templates.
also add override for implementation to the to-root link path.
bug:
27667787
Change-Id: I79892ddb7c5053d5325afcd50016c726b34e1361
The Android Automerger [Tue, 22 Mar 2016 17:56:31 +0000 (10:56 -0700)]
"NRC82C"
The Android Automerger [Tue, 22 Mar 2016 15:09:08 +0000 (08:09 -0700)]
"NRC82B"
The Android Automerger [Tue, 22 Mar 2016 15:08:08 +0000 (08:08 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Tue, 22 Mar 2016 12:49:03 +0000 (05:49 -0700)]
"NRC82"
The Android Automerger [Tue, 22 Mar 2016 07:00:43 +0000 (00:00 -0700)]
merge in nyc-release history after reset to nyc-dev
Pierre Imai [Tue, 22 Mar 2016 02:49:32 +0000 (02:49 +0000)]
Merge "Remove references to deleted dhcpcd" into nyc-dev
Zach Jang [Tue, 22 Mar 2016 01:03:01 +0000 (01:03 +0000)]
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
Zach Jang [Tue, 22 Mar 2016 00:59:40 +0000 (00:59 +0000)]
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
* commit '
87582a8758970cc1178c9c63a7e5f8d97b02aa5d':
Update Security String to 2016-04-02 in preparation for April 2016 Security OTA v2 - kernel updates with patches for CVE-2015-1805
Zach Jang [Tue, 22 Mar 2016 00:56:58 +0000 (00:56 +0000)]
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
Zach Jang [Tue, 22 Mar 2016 00:54:07 +0000 (00:54 +0000)]
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
Zach Jang [Tue, 22 Mar 2016 00:51:24 +0000 (00:51 +0000)]
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
Zach Jang [Tue, 22 Mar 2016 00:48:45 +0000 (00:48 +0000)]
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
Zach Jang [Tue, 22 Mar 2016 00:45:26 +0000 (00:45 +0000)]
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
Zach Jang [Tue, 22 Mar 2016 00:42:55 +0000 (17:42 -0700)]
Update Security String to 2016-05-01 in preparation for May 2016 Security OTA
b/
27724973
Change-Id: I572123586730e45b304f352c8b0fd6371ff5788b
The Android Automerger [Mon, 21 Mar 2016 21:20:27 +0000 (14:20 -0700)]
"NRC81B"
The Android Automerger [Mon, 21 Mar 2016 07:01:16 +0000 (00:01 -0700)]
"NRC81"
The Android Automerger [Mon, 21 Mar 2016 07:00:16 +0000 (00:00 -0700)]
merge in nyc-release history after reset to nyc-dev
Pirama Arumuga Nainar [Thu, 17 Mar 2016 18:06:51 +0000 (11:06 -0700)]
Switch to clang-
2690385
http://b/
26987366
(cherry picked from commit
760aec5fdfa60354373ed805a93616c34ded91ff)
Change-Id: Ib26fa27c214b67024ad43a1e0b1db277d7c7f929
Pirama Arumuga Nainar [Thu, 17 Mar 2016 18:04:37 +0000 (11:04 -0700)]
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
41f4b242e38c6f95fff133cfb6f07691f56f672b)
Change-Id: I50751f410a2f7c83532cec9b96c50d9afe1224c1
The Android Automerger [Sun, 20 Mar 2016 07:05:31 +0000 (00:05 -0700)]
"NRC80"
The Android Automerger [Sun, 20 Mar 2016 07:00:46 +0000 (00:00 -0700)]
merge in nyc-release history after reset to nyc-dev
The Android Automerger [Fri, 18 Mar 2016 22:51:30 +0000 (15:51 -0700)]
NRC77H
The Android Automerger [Fri, 18 Mar 2016 21:36:28 +0000 (14:36 -0700)]
"NRC77G"
The Android Automerger [Fri, 18 Mar 2016 18:40:55 +0000 (11:40 -0700)]
"NRC77F"
Yohann Roussel [Wed, 16 Mar 2016 09:33:02 +0000 (10:33 +0100)]
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
22313f2b2a4aba8d284be4324233379d95886e23)
Change-Id: I1e7f2f5dcc7f95a44f5ebf2e4ba99931ff3ba014
Przemyslaw Szczepaniak [Fri, 18 Mar 2016 13:08:58 +0000 (13:08 +0000)]
Merge "Add java.util.stream to whitelisted packages" into nyc-dev
Przemyslaw Szczepaniak [Wed, 16 Mar 2016 13:45:23 +0000 (13:45 +0000)]
Add java.util.stream to whitelisted packages
Bug:
27692239
Change-Id: I50e671222efc415fb930e5493f1943c5b8f6a71c
(cherry picked from commit
fe606f0939ef59a52d013d9398133437b8edb5dd)
Przemyslaw Szczepaniak [Fri, 18 Mar 2016 12:39:45 +0000 (12:39 +0000)]
Merge "Allow for 5400 words in dump-words-to-file" into nyc-dev
Przemyslaw Szczepaniak [Wed, 24 Feb 2016 12:07:21 +0000 (12:07 +0000)]
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
Yohann Roussel [Thu, 17 Mar 2016 11:02:27 +0000 (12:02 +0100)]
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
233584bb806202364544f964b63561a7350fdc97)
Change-Id: Ie266104e51c09fa21ccb09c1f27ad7068472965c