OSDN Git Service
Colin Cross [Tue, 1 Dec 2015 00:07:45 +0000 (00:07 +0000)]
Merge changes I1de10391,I4399ca26,Iec3b2b0b am:
bff3c9b4c1 am:
bae8872294
am:
dbeab8de65
* commit '
dbeab8de6543db1d0393789cb18ee7fd7ed8fedd':
Use libstdc++ for ijar
Build ijar for apps build
Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files
Colin Cross [Tue, 1 Dec 2015 00:05:38 +0000 (00:05 +0000)]
Merge changes I1de10391,I4399ca26,Iec3b2b0b am:
bff3c9b4c1
am:
bae8872294
* commit '
bae88722945130a0c8ebbb1ef27eaa845e9f03fd':
Use libstdc++ for ijar
Build ijar for apps build
Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files
Colin Cross [Tue, 1 Dec 2015 00:03:27 +0000 (00:03 +0000)]
Merge changes I1de10391,I4399ca26,Iec3b2b0b
am:
bff3c9b4c1
* commit '
bff3c9b4c10dcb3ce3820d3a5e144e3df20313dc':
Use libstdc++ for ijar
Build ijar for apps build
Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files
Colin Cross [Tue, 1 Dec 2015 00:00:36 +0000 (00:00 +0000)]
Merge changes I1de10391,I4399ca26,Iec3b2b0b
* changes:
Use libstdc++ for ijar
Build ijar for apps build
Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files
Chien-Yu Chen [Mon, 30 Nov 2015 21:47:55 +0000 (21:47 +0000)]
Merge "Copy video stop sound"
Tao Bao [Mon, 30 Nov 2015 20:20:45 +0000 (20:20 +0000)]
Merge "releasetools: Allow logging the diff for incrementals." am:
6d6e0481fa am:
e88245ddf0
am:
94792ca281
* commit '
94792ca281e1c87ccdefb3f8c0e91000a6e1b6f5':
releasetools: Allow logging the diff for incrementals.
Tao Bao [Mon, 30 Nov 2015 20:18:45 +0000 (20:18 +0000)]
Merge "releasetools: Allow logging the diff for incrementals." am:
6d6e0481fa
am:
e88245ddf0
* commit '
e88245ddf0a4920ff90866b9d66b2a3e4bd89f18':
releasetools: Allow logging the diff for incrementals.
Tao Bao [Mon, 30 Nov 2015 20:15:39 +0000 (20:15 +0000)]
Merge "releasetools: Allow logging the diff for incrementals."
am:
6d6e0481fa
* commit '
6d6e0481fa86cb552e1b386e5449fe1fde2325cf':
releasetools: Allow logging the diff for incrementals.
Tao Bao [Mon, 30 Nov 2015 20:09:39 +0000 (20:09 +0000)]
Merge "releasetools: Allow logging the diff for incrementals."
Tao Bao [Mon, 30 Nov 2015 17:40:20 +0000 (09:40 -0800)]
releasetools: Allow logging the diff for incrementals.
Add an option "--log_diff <filename>" to ota_from_target_files.py
script. When enabled, it logs the differences between the source
and target builds into <filename> when generating incremental OTAs.
Also move target_files_diff.py into releasetools/ so that it can be
packed into otatools.zip.
Bug:
25372309
Change-Id: Ifd4ed0f2f12ef040ee377621ec8c35a873cec34f
Colin Cross [Thu, 26 Nov 2015 22:08:34 +0000 (14:08 -0800)]
Use libstdc++ for ijar
For some reason ijar won't build against libc++ for TARGET_BUILD_APPS
builds, but does build with libstdc++.
(cherry picked from commit
718bab6aecfe7e23a6afa1361da64c8e0c832705)
Bug:
25904002
Change-Id: I1de103918faa5bb574af6f12cc954e7fed44dc62
Shinichiro Hamaji [Thu, 26 Nov 2015 08:24:40 +0000 (17:24 +0900)]
Build ijar for apps build
This fixes git_master-linux-apps build.
(cherry picked from commit
90847057446374f818b49a742c567f82db02438e)
Change-Id: I4399ca2662e08c9b3cc2ad5a317e84d91b728115
Shinichiro Hamaji [Mon, 9 Nov 2015 07:47:42 +0000 (16:47 +0900)]
Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files
The same optimization was done for binaries in
https://android-review.googlesource.com/#/c/175250/
To create a TOC file from .jar files, this change introduces
ijar, which is designed for this purpose. Only #include lines
were modified from the original version.
https://github.com/bazelbuild/bazel/tree/master/third_party/ijar
Performance:
$ m && touch
frameworks/base/core/java/com/google/android/util/Procedure.java && time
m
Before: 4m30s (1580 targets)
After: 3m57s (772 targets)
Unfortunately, the improvement is small yet, but local
experiments showed we can cut ~2 more minutes if the similar
optimization is done for .dex files.
(cherry picked from commit
c1f5d9c203324b9435414e789c02394ca99c98f7)
Bug:
24597504
Change-Id: Iec3b2b0b0e674bee5d80cce3c300dc8fad6e7c13
Shinichiro Hamaji [Fri, 27 Nov 2015 04:07:51 +0000 (04:07 +0000)]
Merge "Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"" am:
2ff3ad9045 am:
51ef51c4ad
am:
371b8c7f77
* commit '
371b8c7f770f8215e6bda1433e5f236c106b4e64':
Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"
Shinichiro Hamaji [Fri, 27 Nov 2015 04:07:43 +0000 (04:07 +0000)]
Merge "Revert "Build ijar for apps build"" am:
d17c3a57f6 am:
c3725c256b
am:
15bead2c59
* commit '
15bead2c598308b5a6cd17b64c839676d7286ed8':
Revert "Build ijar for apps build"
Shinichiro Hamaji [Fri, 27 Nov 2015 04:05:01 +0000 (04:05 +0000)]
Merge "Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"" am:
2ff3ad9045
am:
51ef51c4ad
* commit '
51ef51c4ad283198d5fb4a2ec9caecdc7a677838':
Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"
Shinichiro Hamaji [Fri, 27 Nov 2015 04:04:53 +0000 (04:04 +0000)]
Merge "Revert "Build ijar for apps build"" am:
d17c3a57f6
am:
c3725c256b
* commit '
c3725c256b5d786007f2565324324b386287725a':
Revert "Build ijar for apps build"
Shinichiro Hamaji [Fri, 27 Nov 2015 04:02:09 +0000 (04:02 +0000)]
Merge "Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files""
am:
2ff3ad9045
* commit '
2ff3ad90455e868a1805d065f0aa2b8babbc6660':
Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"
Shinichiro Hamaji [Fri, 27 Nov 2015 04:02:01 +0000 (04:02 +0000)]
Merge "Revert "Build ijar for apps build""
am:
d17c3a57f6
* commit '
d17c3a57f6f183b97cc557e10e221b4dc1acf47f':
Revert "Build ijar for apps build"
Shinichiro Hamaji [Fri, 27 Nov 2015 03:59:30 +0000 (03:59 +0000)]
Merge "Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files""
Shinichiro Hamaji [Fri, 27 Nov 2015 03:59:18 +0000 (03:59 +0000)]
Merge "Revert "Build ijar for apps build""
Shinichiro Hamaji [Fri, 27 Nov 2015 03:58:51 +0000 (03:58 +0000)]
Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"
This reverts commit
c1f5d9c203324b9435414e789c02394ca99c98f7.
Change-Id: I7e9969a060e3f1380154da65e76134168aee15d8
Shinichiro Hamaji [Fri, 27 Nov 2015 03:57:17 +0000 (03:57 +0000)]
Revert "Build ijar for apps build"
This reverts commit
90847057446374f818b49a742c567f82db02438e.
Change-Id: I8a9958788c51dcec5028ef396cb67abd541ce31f
Colin Cross [Thu, 26 Nov 2015 22:27:35 +0000 (22:27 +0000)]
Merge "Revert "Use libstdc++ for ijar"" am:
41dca40376 am:
6cd88d7514
am:
06c44241da
* commit '
06c44241da5ce7bb055a2ae7160daeb2bf66d85e':
Revert "Use libstdc++ for ijar"
Colin Cross [Thu, 26 Nov 2015 22:25:12 +0000 (22:25 +0000)]
Merge "Revert "Use libstdc++ for ijar"" am:
41dca40376
am:
6cd88d7514
* commit '
6cd88d75147217bc42fed67b558f9e4c836a20a0':
Revert "Use libstdc++ for ijar"
Colin Cross [Thu, 26 Nov 2015 22:23:02 +0000 (22:23 +0000)]
Merge "Revert "Use libstdc++ for ijar""
am:
41dca40376
* commit '
41dca403766d22373ba469d99ba1625d0930d02e':
Revert "Use libstdc++ for ijar"
Colin Cross [Thu, 26 Nov 2015 22:20:38 +0000 (22:20 +0000)]
Merge "Revert "Use libstdc++ for ijar""
Colin Cross [Thu, 26 Nov 2015 22:20:22 +0000 (22:20 +0000)]
Revert "Use libstdc++ for ijar"
This reverts commit
718bab6aecfe7e23a6afa1361da64c8e0c832705.
Change-Id: I9aa222fc2936d7d89ae0700eeef505c6b317d777
Colin Cross [Thu, 26 Nov 2015 22:16:40 +0000 (22:16 +0000)]
Merge "Use libstdc++ for ijar" am:
c97b5272d7 am:
4c1944083f
am:
8713fde1c3
* commit '
8713fde1c3edf9dd6c5799cd3cc25b8f2ec2cb2d':
Use libstdc++ for ijar
Colin Cross [Thu, 26 Nov 2015 22:14:40 +0000 (22:14 +0000)]
Merge "Use libstdc++ for ijar" am:
c97b5272d7
am:
4c1944083f
* commit '
4c1944083f03e1ddf55f16f815b89a337ffc60f6':
Use libstdc++ for ijar
Colin Cross [Thu, 26 Nov 2015 22:12:38 +0000 (22:12 +0000)]
Merge "Use libstdc++ for ijar"
am:
c97b5272d7
* commit '
c97b5272d715ab9f4ff52748bd2f403235f94426':
Use libstdc++ for ijar
Colin Cross [Thu, 26 Nov 2015 22:10:31 +0000 (22:10 +0000)]
Merge "Use libstdc++ for ijar"
Colin Cross [Thu, 26 Nov 2015 22:08:34 +0000 (14:08 -0800)]
Use libstdc++ for ijar
For some reason ijar won't build against libc++ for TARGET_BUILD_APPS
builds, but does build with libstdc++.
Change-Id: I8e900b0f764f0bb8f827705cb9173f07e4f33862
Colin Cross [Thu, 26 Nov 2015 17:40:51 +0000 (17:40 +0000)]
Merge "Build ijar for apps build" am:
ec4db56e58 am:
3b5dbebe8d
am:
93e138b723
* commit '
93e138b7238153f65844df3d2d9be1156d86c399':
Build ijar for apps build
Colin Cross [Thu, 26 Nov 2015 17:38:34 +0000 (17:38 +0000)]
Merge "Build ijar for apps build" am:
ec4db56e58
am:
3b5dbebe8d
* commit '
3b5dbebe8d9a8beac49a8c16605df6afbec4de72':
Build ijar for apps build
Colin Cross [Thu, 26 Nov 2015 17:36:29 +0000 (17:36 +0000)]
Merge "Build ijar for apps build"
am:
ec4db56e58
* commit '
ec4db56e5802171bc2d0237f496e97ec093f0be0':
Build ijar for apps build
Colin Cross [Thu, 26 Nov 2015 17:34:50 +0000 (17:34 +0000)]
Merge "Build ijar for apps build"
Paul Duffin [Thu, 26 Nov 2015 11:49:38 +0000 (11:49 +0000)]
Merge "Fix generated-sources-dir-for for COMMON" am:
623799d3e0 am:
9c4bb4c1c0
am:
fb4a7cf865
* commit '
fb4a7cf86544f2fb78f5fa4e950b6974bcb0965d':
Fix generated-sources-dir-for for COMMON
Paul Duffin [Thu, 26 Nov 2015 11:46:29 +0000 (11:46 +0000)]
Merge "Fix generated-sources-dir-for for COMMON" am:
623799d3e0
am:
9c4bb4c1c0
* commit '
9c4bb4c1c079db6c6c87f30ea861d9bec1ee1df8':
Fix generated-sources-dir-for for COMMON
Paul Duffin [Thu, 26 Nov 2015 11:43:02 +0000 (11:43 +0000)]
Merge "Fix generated-sources-dir-for for COMMON"
am:
623799d3e0
* commit '
623799d3e0aab49b00552fb7862f2528b845bd51':
Fix generated-sources-dir-for for COMMON
Paul Duffin [Thu, 26 Nov 2015 11:39:30 +0000 (11:39 +0000)]
Merge "Fix generated-sources-dir-for for COMMON"
Shinichiro Hamaji [Thu, 26 Nov 2015 08:24:40 +0000 (17:24 +0900)]
Build ijar for apps build
This fixes git_master-linux-apps build.
Change-Id: I1a77b2495d98d89f570cb165d7f25f617c9af9aa
Shinichiro Hamaji [Thu, 26 Nov 2015 05:37:01 +0000 (05:37 +0000)]
Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files" am:
c9a1b27845 am:
27770abe27
am:
b42da32564
* commit '
b42da32564886ab7d3d5a2518b6868cd8fab9c78':
Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files
Shinichiro Hamaji [Thu, 26 Nov 2015 05:33:54 +0000 (05:33 +0000)]
Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files" am:
c9a1b27845
am:
27770abe27
* commit '
27770abe272eb54de5eea5fa94342c1393b681a0':
Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files
Shinichiro Hamaji [Thu, 26 Nov 2015 05:30:54 +0000 (05:30 +0000)]
Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"
am:
c9a1b27845
* commit '
c9a1b278458eddd3065c0e9fc06e12b2cb1c38cb':
Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files
Shinichiro Hamaji [Thu, 26 Nov 2015 05:25:58 +0000 (05:25 +0000)]
Merge "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"
Tao Bao [Thu, 26 Nov 2015 00:07:56 +0000 (00:07 +0000)]
Merge "target_files_diff: Allow writing outputs to file." am:
7b5eddd52b am:
acd1b8e160
am:
fe1373e194
* commit '
fe1373e19465eb0f47fc7285ca758098e30a9354':
target_files_diff: Allow writing outputs to file.
Paul Duffin [Wed, 25 Nov 2015 13:14:23 +0000 (13:14 +0000)]
Fix generated-sources-dir-for for COMMON
When the 4th argument specified is non-empty then it attempts to
use either HOST_OUT_GEN_COMMON or TARGET_OUT_GEN_COMMON
depending on whether the 3rd argument is non-empty or not
respectively. Unfortunately, those two variables do not exist,
the correct names for those variables is HOST_OUT_COMMON_GEN and
TARGET_OUT_COMMON_GET.
Change-Id: I66edb02824c06e0f504ebe04ff80ddbd77a16c95
Michael Wright [Fri, 6 Nov 2015 15:20:51 +0000 (15:20 +0000)]
Add new Test API for CTS testing.
Bug:
25608286
Change-Id: I0334061b548970959e46392dc3a1feed8533548c
Tao Bao [Wed, 25 Nov 2015 00:06:08 +0000 (00:06 +0000)]
Merge "target_files_diff: Allow writing outputs to file." am:
7b5eddd52b
am:
acd1b8e160
* commit '
acd1b8e160c8114bd07be2175388f7dcefe09687':
target_files_diff: Allow writing outputs to file.
Tao Bao [Wed, 25 Nov 2015 00:03:01 +0000 (00:03 +0000)]
Merge "target_files_diff: Allow writing outputs to file."
am:
7b5eddd52b
* commit '
7b5eddd52bfb70485488458a115a33f1af92759a':
target_files_diff: Allow writing outputs to file.
Tao Bao [Tue, 24 Nov 2015 23:57:44 +0000 (23:57 +0000)]
Merge "target_files_diff: Allow writing outputs to file."
Tao Bao [Tue, 24 Nov 2015 23:17:17 +0000 (15:17 -0800)]
target_files_diff: Allow writing outputs to file.
Also clean up some pylint warnings.
Bug:
25372309
Change-Id: I226bfd72cb1310ba77352f8d367803e815e1cfa3
Vince Harron [Tue, 24 Nov 2015 23:01:15 +0000 (23:01 +0000)]
Shorten TARGET_BRAND from generic_<arch> to Android am:
5806531f92 am:
e13b13c7f6 am:
aba12deedb
am:
6fe5ec0db2
* commit '
6fe5ec0db2ba95d793361399d037d89a684cffb6':
Shorten TARGET_BRAND from generic_<arch> to Android
Vince Harron [Tue, 24 Nov 2015 22:57:53 +0000 (22:57 +0000)]
Shorten TARGET_BRAND from generic_<arch> to Android am:
5806531f92 am:
e13b13c7f6
am:
aba12deedb
* commit '
aba12deedb9cdcf8ef01952de1cc51057d8d2bf7':
Shorten TARGET_BRAND from generic_<arch> to Android
Vince Harron [Tue, 24 Nov 2015 22:54:42 +0000 (22:54 +0000)]
Shorten TARGET_BRAND from generic_<arch> to Android am:
5806531f92
am:
e13b13c7f6
* commit '
e13b13c7f67b80a7e99147d76ce307d6bb5296db':
Shorten TARGET_BRAND from generic_<arch> to Android
Vince Harron [Tue, 24 Nov 2015 22:50:50 +0000 (22:50 +0000)]
Shorten TARGET_BRAND from generic_<arch> to Android
am:
5806531f92
* commit '
5806531f92a3670362ec8dceafd0079d51afbd18':
Shorten TARGET_BRAND from generic_<arch> to Android
Ying Wang [Tue, 24 Nov 2015 22:25:06 +0000 (22:25 +0000)]
Ying Wang [Tue, 24 Nov 2015 22:21:25 +0000 (22:21 +0000)]
Ying Wang [Tue, 24 Nov 2015 22:16:45 +0000 (22:16 +0000)]
Ying Wang [Tue, 24 Nov 2015 22:11:14 +0000 (22:11 +0000)]
Merge "Fix typo."
Ying Wang [Tue, 24 Nov 2015 22:09:11 +0000 (14:09 -0800)]
Fix typo.
Change-Id: I299076791c620968fa7a5c420b5ca21ea4d30b51
Ying Wang [Tue, 24 Nov 2015 22:09:49 +0000 (22:09 +0000)]
Merge "Fix typo."
Ying Wang [Tue, 24 Nov 2015 22:09:11 +0000 (14:09 -0800)]
Fix typo.
Change-Id: I299076791c620968fa7a5c420b5ca21ea4d30b51
Ying Wang [Tue, 24 Nov 2015 22:08:42 +0000 (22:08 +0000)]
Merge "Don\'t delete META-INF in jack-java-to-dex when packing resources." am:
81bbac6a0f am:
fdfd0b0d81
am:
929d0ee01a
* commit '
929d0ee01a88517afdd3385f3aac227983a21fb0':
Don't delete META-INF in jack-java-to-dex when packing resources.
Ying Wang [Tue, 24 Nov 2015 22:04:55 +0000 (22:04 +0000)]
Merge "Don\'t delete META-INF in jack-java-to-dex when packing resources." am:
81bbac6a0f
am:
fdfd0b0d81
* commit '
fdfd0b0d8145ccead681d921cfd33ba4c57d64fc':
Don't delete META-INF in jack-java-to-dex when packing resources.
Ying Wang [Tue, 24 Nov 2015 22:01:54 +0000 (22:01 +0000)]
Merge "Don\'t delete META-INF in jack-java-to-dex when packing resources."
am:
81bbac6a0f
* commit '
81bbac6a0fe76f2b007f6f0c2c3dc44f85fd4dd6':
Don't delete META-INF in jack-java-to-dex when packing resources.
Ying Wang [Tue, 24 Nov 2015 21:58:06 +0000 (21:58 +0000)]
Merge "Don't delete META-INF in jack-java-to-dex when packing resources."
Ying Wang [Tue, 24 Nov 2015 19:44:20 +0000 (11:44 -0800)]
Don't delete META-INF in jack-java-to-dex when packing resources.
LOCAL_DONT_DELETE_JAR_META_INF is meant for deleting resources carried
by static Java libraries, see comment in clear_vars.mk.
For a module's own resources, we should pick up whatever in
LOCAL_JAVA_RESOURCE_DIRS.
The same applies when building .jack from a prebult jar in
transform-jar-to-jack.
Bug:
25860887
Change-Id: I20c120e039342a1124362c5f8747eace94b03931
(cherry-pick from commit
996ae38ffd552be2a8420de6651c1982e0723e02)
Ying Wang [Tue, 24 Nov 2015 21:55:46 +0000 (21:55 +0000)]
Merge "Don't delete META-INF in jack-java-to-dex when packing resources."
Chih-hung Hsieh [Tue, 24 Nov 2015 21:25:44 +0000 (21:25 +0000)]
Merge "Move mips64 target to clang by default." am:
b0d9108795 am:
54ac6cd527
am:
c5a9f9cbcc
* commit '
c5a9f9cbcc8cbec4a85f0eb25d225f371546833e':
Move mips64 target to clang by default.
Chih-hung Hsieh [Tue, 24 Nov 2015 21:25:37 +0000 (21:25 +0000)]
Merge "Move mips target to clang by default." am:
80d6b0a9c6 am:
917f4aea1d
am:
7906e14344
* commit '
7906e143446ff636b92ba3ee4abc2db1a46f6dee':
Move mips target to clang by default.
Alex Klyubin [Tue, 24 Nov 2015 21:25:24 +0000 (21:25 +0000)]
Merge "Clean up compiler warnings in signapk." am:
0aaf7aa53c am:
febce01c64
am:
21f2e7bf0f
* commit '
21f2e7bf0fbc5de33c545c1e457d65f6f2d1d4db':
Clean up compiler warnings in signapk.
Shinichiro Hamaji [Tue, 24 Nov 2015 21:25:17 +0000 (21:25 +0000)]
Merge "Prevent findleaves.py from traversing copies of " am:
84639d127b am:
22a2efde22
am:
336c2527e3
* commit '
336c2527e31d1691ac9c9538c7e19f80c6493969':
Prevent findleaves.py from traversing copies of $(OUT_DIR)
Chih-hung Hsieh [Tue, 24 Nov 2015 21:22:04 +0000 (21:22 +0000)]
Merge "Move mips64 target to clang by default." am:
b0d9108795
am:
54ac6cd527
* commit '
54ac6cd527eeb9784a0703a8ef0b017e290c813c':
Move mips64 target to clang by default.
Chih-hung Hsieh [Tue, 24 Nov 2015 21:21:58 +0000 (21:21 +0000)]
Merge "Move mips target to clang by default." am:
80d6b0a9c6
am:
917f4aea1d
* commit '
917f4aea1d99c9155eee218d81d3f63b9b480709':
Move mips target to clang by default.
Chih-hung Hsieh [Tue, 24 Nov 2015 21:17:55 +0000 (21:17 +0000)]
Merge "Move mips64 target to clang by default."
am:
b0d9108795
* commit '
b0d9108795caea4b88be42d208c7a21e73de4c9f':
Move mips64 target to clang by default.
Chih-hung Hsieh [Tue, 24 Nov 2015 21:17:47 +0000 (21:17 +0000)]
Merge "Move mips target to clang by default."
am:
80d6b0a9c6
* commit '
80d6b0a9c607b15a70512996b5a56b0499e426b4':
Move mips target to clang by default.
Chih-hung Hsieh [Tue, 24 Nov 2015 21:13:38 +0000 (21:13 +0000)]
Merge "Move mips64 target to clang by default."
Chih-hung Hsieh [Tue, 24 Nov 2015 21:13:17 +0000 (21:13 +0000)]
Merge "Move mips target to clang by default."
Ying Wang [Tue, 24 Nov 2015 19:44:20 +0000 (11:44 -0800)]
Don't delete META-INF in jack-java-to-dex when packing resources.
LOCAL_DONT_DELETE_JAR_META_INF is meant for deleting resources carried
by static Java libraries, see comment in clear_vars.mk.
For a module's own resources, we should pick up whatever in
LOCAL_JAVA_RESOURCE_DIRS.
The same applies when building .jack from a prebult jar in
transform-jar-to-jack.
Bug:
25860887
Change-Id: I20c120e039342a1124362c5f8747eace94b03931
Vince Harron [Thu, 29 Oct 2015 17:08:23 +0000 (10:08 -0700)]
Shorten TARGET_BRAND from generic_<arch> to Android
Switching to userdebug emulator images increased ro.build.fingerprint
Past the 91 character limit. This should bring the build server
builds under this limit.
Fixing it for local builds will be a bit more difficult.
Bug:
25829506
Change-Id: I7daee3478716adcb860cced1b770a2d00a72f1a2
(cherry picked from commit
efbeab78d3581009b3da20991a3a83d733393f45)
Alex Klyubin [Tue, 24 Nov 2015 17:39:18 +0000 (17:39 +0000)]
Merge "Clean up compiler warnings in signapk." am:
0aaf7aa53c
am:
febce01c64
* commit '
febce01c64c18a4dea9d6f966939c3642b4381ed':
Clean up compiler warnings in signapk.
Alex Klyubin [Tue, 24 Nov 2015 17:36:06 +0000 (17:36 +0000)]
Merge "Clean up compiler warnings in signapk."
am:
0aaf7aa53c
* commit '
0aaf7aa53ce5d1a8b5880303a21b83959bf1a432':
Clean up compiler warnings in signapk.
Alex Klyubin [Tue, 24 Nov 2015 17:30:42 +0000 (17:30 +0000)]
Merge "Clean up compiler warnings in signapk."
Alex Klyubin [Thu, 19 Nov 2015 21:09:57 +0000 (13:09 -0800)]
Clean up compiler warnings in signapk.
Bug:
25794543
Change-Id: Ia7da4fbaed77af4020e5aa0b14fe5e1bd8521edb
Shinichiro Hamaji [Tue, 24 Nov 2015 05:01:29 +0000 (05:01 +0000)]
Merge "Prevent findleaves.py from traversing copies of " am:
84639d127b
am:
22a2efde22
* commit '
22a2efde22b80152f4cdb75ecdc7c5068c64f509':
Prevent findleaves.py from traversing copies of $(OUT_DIR)
Shinichiro Hamaji [Tue, 24 Nov 2015 04:57:26 +0000 (04:57 +0000)]
Merge "Prevent findleaves.py from traversing copies of "
am:
84639d127b
* commit '
84639d127b50734ef670232bfa43a6fb9f3f0576':
Prevent findleaves.py from traversing copies of $(OUT_DIR)
Shinichiro Hamaji [Tue, 24 Nov 2015 04:54:02 +0000 (04:54 +0000)]
Merge "Prevent findleaves.py from traversing copies of $(OUT_DIR)"
Ying Wang [Mon, 23 Nov 2015 22:57:26 +0000 (14:57 -0800)]
Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES
Without this if a Java libraryw with LOCAL_NO_STANDARD_LIBRARIES doesn't
have core-libart in its LOCAL_JAVA_LIBRARIES, it would use core-libart
as bootclasspath but without having dependency on it.
Change-Id: I611a5a5df2bf0ad59e0be50ed1ad1afe8b843e90
Konstantinos Menychtas [Mon, 23 Nov 2015 01:17:23 +0000 (17:17 -0800)]
Increasing sysimage partition size for all boards
This change fixes issue b/
25613506
The predefined, fixed system image partition size is failing
to fit content for NYC release MIPS64 images. This change
increases the system image size for all boards to 1.5GB
(up from 1.25GB) to make sure that the system image sizes are
uniform across all virtual boards, and fit new content.
Change-Id: Id9808ad5318cd2390fc666ac35b0f9cd32870993
Przemyslaw Szczepaniak [Fri, 20 Nov 2015 15:05:03 +0000 (15:05 +0000)]
Allow for 5200 words in dump-words-to-file
After switching to OpenJdk, doc-comment-check target
started to fail due to "Too many words (5082)" while
generating out/target/common/docs/doc-comment-check-timestamp.rsp
This change extends number of dumped words to 5200.
Bug:
25758743
Change-Id: Ifdc23d57c888c83533d237dd0a3bdafd20912cdf
Zach Jang [Sat, 21 Nov 2015 01:22:33 +0000 (01:22 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad am:
645f200ae8 am:
2cd2a76c64 -s ours am:
c7b96cdd5e am:
8909bdfc4a am:
a68c55822c am:
8e9728630b am:
402e6d4c11
am:
8fd4c77f45 -s ours
* commit '
8fd4c77f45efe0a099f90132f90157843f0a1756':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 01:19:10 +0000 (01:19 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad am:
645f200ae8 am:
2cd2a76c64 -s ours am:
c7b96cdd5e am:
8909bdfc4a am:
a68c55822c am:
8e9728630b
am:
402e6d4c11
* commit '
402e6d4c11796c6b1137b21346321707a18a2af5':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 01:15:41 +0000 (01:15 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad am:
645f200ae8 am:
2cd2a76c64 -s ours am:
c7b96cdd5e am:
8909bdfc4a am:
a68c55822c
am:
8e9728630b
* commit '
8e9728630b2e552280b1e90b912e28d4b53dd93b':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 01:12:28 +0000 (01:12 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad am:
645f200ae8 am:
2cd2a76c64 -s ours am:
c7b96cdd5e am:
8909bdfc4a
am:
a68c55822c
* commit '
a68c55822c115db2151b1d155566a06b01756d20':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 01:07:27 +0000 (01:07 +0000)]
Update Security String to 2016-01-01 to mnc-dev am:
170459f438 am:
bcf2866fb1 am:
3ce70dfe46 am:
10c8949d75 am:
daf00af42d
am:
c2aae56b82
* commit '
c2aae56b82322b2dd5322e0d18dce58fd5f8a838':
Update Security String to 2016-01-01 to mnc-dev
Zach Jang [Sat, 21 Nov 2015 01:07:24 +0000 (01:07 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad am:
645f200ae8 am:
2cd2a76c64 -s ours am:
c7b96cdd5e
am:
8909bdfc4a
* commit '
8909bdfc4abd8ffc6511c864fe968530abe40b8a':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 01:01:49 +0000 (01:01 +0000)]
Update Security String to 2016-01-01 - DO NOT MERGE am:
58cdbdc5ad am:
645f200ae8 am:
2cd2a76c64 -s ours
am:
c7b96cdd5e
* commit '
c7b96cdd5e83ea7c62912bc779e7bc49c59023c7':
Update Security String to 2016-01-01 - DO NOT MERGE
Zach Jang [Sat, 21 Nov 2015 01:01:48 +0000 (01:01 +0000)]
Update Security String to 2016-01-01 to mnc-dev am:
170459f438 am:
bcf2866fb1 am:
3ce70dfe46 am:
10c8949d75
am:
daf00af42d
* commit '
daf00af42d67098918a0c06b27002255cc5d34de':
Update Security String to 2016-01-01 to mnc-dev
OSDN Git Service
