Tao Bao
0ed2001f91
Merge "Stop packaging obsolete OTA tools." am: b98fa19703
am: e82ea963e8
...
am: 2867533add
* commit '2867533add946cd9d2294ed3b4976f5ecf7aa76e':
Stop packaging obsolete OTA tools.
2015-12-01 02:34:58 +00:00
Tao Bao
2867533add
Merge "Stop packaging obsolete OTA tools." am: b98fa19703
...
am: e82ea963e8
* commit 'e82ea963e8cf5d7eb2dd6d2c7aacee86ddfba853':
Stop packaging obsolete OTA tools.
2015-12-01 02:31:24 +00:00
Tao Bao
e82ea963e8
Merge "Stop packaging obsolete OTA tools."
...
am: b98fa19703
* commit 'b98fa19703ed0c7608f926007b1df257127ea777':
Stop packaging obsolete OTA tools.
2015-12-01 02:28:19 +00:00
Tao Bao
b98fa19703
Merge "Stop packaging obsolete OTA tools."
2015-12-01 02:25:02 +00:00
Colin Cross
699cc1ddf4
Merge "Make export_includes a restat rule" am: 615d66e2c2
am: b16a63cbb0
...
am: ceac25c571
* commit 'ceac25c5719aab39d7a15fd1c1578d8839a86911':
Make export_includes a restat rule
2015-12-01 01:52:33 +00:00
Colin Cross
ceac25c571
Merge "Make export_includes a restat rule" am: 615d66e2c2
...
am: b16a63cbb0
* commit 'b16a63cbb0582637b0e6f28792ae6d8de718e357':
Make export_includes a restat rule
2015-12-01 01:49:01 +00:00
Colin Cross
b16a63cbb0
Merge "Make export_includes a restat rule"
...
am: 615d66e2c2
* commit '615d66e2c21603552dc952db9493f43bbcc7f2b1':
Make export_includes a restat rule
2015-12-01 01:45:58 +00:00
Colin Cross
615d66e2c2
Merge "Make export_includes a restat rule"
2015-12-01 01:42:26 +00:00
Colin Cross
6b9bddde6f
Make export_includes a restat rule
...
There is currently an intentional incremental rebuild issue with
import_includes. export_includes might get updated with an identical
version, but we don't want to force everything downstream of it to
rebuild.
When BUILDING_WITH_NINJA==true, only update export_includes if it
changes, and use .KATI_RESTAT to only run downstream rules if it
changes. import_includes will only be updated if one of the
export_includes files is updated, so object files can have a normal
dependency on import_includes instead of an order-only dependency.
All downstream object files will now be recompiled if their imported
include paths change.
Bug: 25910568
Change-Id: I626f3b24ac02ac1309049cf1ce66cfe8ec816513
2015-11-30 17:33:26 -08:00
Colin Cross
f344fe0850
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
2015-12-01 00:07:45 +00:00
Colin Cross
dbeab8de65
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
2015-12-01 00:05:38 +00:00
Colin Cross
bae8872294
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
2015-12-01 00:03:27 +00:00
Colin Cross
bff3c9b4c1
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
2015-12-01 00:00:36 +00:00
Chien-Yu Chen
3ee276a009
Merge "Copy video stop sound"
2015-11-30 21:47:55 +00:00
Tao Bao
a04fca31bf
Stop packaging obsolete OTA tools.
...
applypatch, applypatch_static and sqlite3 are no longer needed.
Bug: 24621915
Change-Id: I6de5bc45bc8434b9c387e1d3d1b6c347c23a5290
2015-11-30 12:22:24 -08:00
Tao Bao
4f3b8b00d7
Merge "releasetools: Allow logging the diff for incrementals." am: 6d6e0481fa
am: e88245ddf0
...
am: 94792ca281
* commit '94792ca281e1c87ccdefb3f8c0e91000a6e1b6f5':
releasetools: Allow logging the diff for incrementals.
2015-11-30 20:20:45 +00:00
Tao Bao
94792ca281
Merge "releasetools: Allow logging the diff for incrementals." am: 6d6e0481fa
...
am: e88245ddf0
* commit 'e88245ddf0a4920ff90866b9d66b2a3e4bd89f18':
releasetools: Allow logging the diff for incrementals.
2015-11-30 20:18:45 +00:00
Tao Bao
e88245ddf0
Merge "releasetools: Allow logging the diff for incrementals."
...
am: 6d6e0481fa
* commit '6d6e0481fa86cb552e1b386e5449fe1fde2325cf':
releasetools: Allow logging the diff for incrementals.
2015-11-30 20:15:39 +00:00
Tao Bao
6d6e0481fa
Merge "releasetools: Allow logging the diff for incrementals."
2015-11-30 20:09:39 +00:00
Tao Bao
d62c603573
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
2015-11-30 11:26:40 -08:00
Colin Cross
b15149cb2f
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 718bab6aec
)
Bug: 25904002
Change-Id: I1de103918faa5bb574af6f12cc954e7fed44dc62
2015-11-30 11:16:30 -08:00
Shinichiro Hamaji
80876a6303
Build ijar for apps build
...
This fixes git_master-linux-apps build.
(cherry picked from commit 9084705744
)
Change-Id: I4399ca2662e08c9b3cc2ad5a317e84d91b728115
2015-11-30 11:16:28 -08:00
Shinichiro Hamaji
89b255ab71
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 c1f5d9c203
)
Bug: 24597504
Change-Id: Iec3b2b0b0e674bee5d80cce3c300dc8fad6e7c13
2015-11-30 11:16:23 -08:00
Shinichiro Hamaji
d973ed9f47
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"
2015-11-27 04:07:51 +00:00
Shinichiro Hamaji
4479f015a0
Merge "Revert "Build ijar for apps build"" am: d17c3a57f6
am: c3725c256b
...
am: 15bead2c59
* commit '15bead2c598308b5a6cd17b64c839676d7286ed8':
Revert "Build ijar for apps build"
2015-11-27 04:07:43 +00:00
Shinichiro Hamaji
371b8c7f77
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"
2015-11-27 04:05:01 +00:00
Shinichiro Hamaji
15bead2c59
Merge "Revert "Build ijar for apps build"" am: d17c3a57f6
...
am: c3725c256b
* commit 'c3725c256b5d786007f2565324324b386287725a':
Revert "Build ijar for apps build"
2015-11-27 04:04:53 +00:00
Shinichiro Hamaji
51ef51c4ad
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"
2015-11-27 04:02:09 +00:00
Shinichiro Hamaji
c3725c256b
Merge "Revert "Build ijar for apps build""
...
am: d17c3a57f6
* commit 'd17c3a57f6f183b97cc557e10e221b4dc1acf47f':
Revert "Build ijar for apps build"
2015-11-27 04:02:01 +00:00
Shinichiro Hamaji
2ff3ad9045
Merge "Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files""
2015-11-27 03:59:30 +00:00
Shinichiro Hamaji
d17c3a57f6
Merge "Revert "Build ijar for apps build""
2015-11-27 03:59:18 +00:00
Shinichiro Hamaji
3ae7f66bab
Revert "Use .KATI_RESTAT to reduce unnecessary rebuilds of .jar files"
...
This reverts commit c1f5d9c203
.
Change-Id: I7e9969a060e3f1380154da65e76134168aee15d8
2015-11-27 03:58:51 +00:00
Shinichiro Hamaji
ea2da50e17
Revert "Build ijar for apps build"
...
This reverts commit 9084705744
.
Change-Id: I8a9958788c51dcec5028ef396cb67abd541ce31f
2015-11-27 03:57:17 +00:00
Colin Cross
49a1e1e766
Merge "Revert "Use libstdc++ for ijar"" am: 41dca40376
am: 6cd88d7514
...
am: 06c44241da
* commit '06c44241da5ce7bb055a2ae7160daeb2bf66d85e':
Revert "Use libstdc++ for ijar"
2015-11-26 22:27:35 +00:00
Colin Cross
06c44241da
Merge "Revert "Use libstdc++ for ijar"" am: 41dca40376
...
am: 6cd88d7514
* commit '6cd88d75147217bc42fed67b558f9e4c836a20a0':
Revert "Use libstdc++ for ijar"
2015-11-26 22:25:12 +00:00
Colin Cross
6cd88d7514
Merge "Revert "Use libstdc++ for ijar""
...
am: 41dca40376
* commit '41dca403766d22373ba469d99ba1625d0930d02e':
Revert "Use libstdc++ for ijar"
2015-11-26 22:23:02 +00:00
Colin Cross
41dca40376
Merge "Revert "Use libstdc++ for ijar""
2015-11-26 22:20:38 +00:00
Colin Cross
39cca23d41
Revert "Use libstdc++ for ijar"
...
This reverts commit 718bab6aec
.
Change-Id: I9aa222fc2936d7d89ae0700eeef505c6b317d777
2015-11-26 22:20:22 +00:00
Colin Cross
2e73dffd0d
Merge "Use libstdc++ for ijar" am: c97b5272d7
am: 4c1944083f
...
am: 8713fde1c3
* commit '8713fde1c3edf9dd6c5799cd3cc25b8f2ec2cb2d':
Use libstdc++ for ijar
2015-11-26 22:16:40 +00:00
Colin Cross
8713fde1c3
Merge "Use libstdc++ for ijar" am: c97b5272d7
...
am: 4c1944083f
* commit '4c1944083f03e1ddf55f16f815b89a337ffc60f6':
Use libstdc++ for ijar
2015-11-26 22:14:40 +00:00
Colin Cross
4c1944083f
Merge "Use libstdc++ for ijar"
...
am: c97b5272d7
* commit 'c97b5272d715ab9f4ff52748bd2f403235f94426':
Use libstdc++ for ijar
2015-11-26 22:12:38 +00:00
Colin Cross
c97b5272d7
Merge "Use libstdc++ for ijar"
2015-11-26 22:10:31 +00:00
Colin Cross
718bab6aec
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
2015-11-26 14:09:50 -08:00
Colin Cross
b06dd07cc3
Merge "Build ijar for apps build" am: ec4db56e58
am: 3b5dbebe8d
...
am: 93e138b723
* commit '93e138b7238153f65844df3d2d9be1156d86c399':
Build ijar for apps build
2015-11-26 17:40:51 +00:00
Colin Cross
93e138b723
Merge "Build ijar for apps build" am: ec4db56e58
...
am: 3b5dbebe8d
* commit '3b5dbebe8d9a8beac49a8c16605df6afbec4de72':
Build ijar for apps build
2015-11-26 17:38:34 +00:00
Colin Cross
3b5dbebe8d
Merge "Build ijar for apps build"
...
am: ec4db56e58
* commit 'ec4db56e5802171bc2d0237f496e97ec093f0be0':
Build ijar for apps build
2015-11-26 17:36:29 +00:00
Colin Cross
ec4db56e58
Merge "Build ijar for apps build"
2015-11-26 17:34:50 +00:00
Paul Duffin
3c0045b2cf
Merge "Fix generated-sources-dir-for for COMMON" am: 623799d3e0
am: 9c4bb4c1c0
...
am: fb4a7cf865
* commit 'fb4a7cf86544f2fb78f5fa4e950b6974bcb0965d':
Fix generated-sources-dir-for for COMMON
2015-11-26 11:49:38 +00:00
Paul Duffin
fb4a7cf865
Merge "Fix generated-sources-dir-for for COMMON" am: 623799d3e0
...
am: 9c4bb4c1c0
* commit '9c4bb4c1c079db6c6c87f30ea861d9bec1ee1df8':
Fix generated-sources-dir-for for COMMON
2015-11-26 11:46:29 +00:00
Paul Duffin
9c4bb4c1c0
Merge "Fix generated-sources-dir-for for COMMON"
...
am: 623799d3e0
* commit '623799d3e0aab49b00552fb7862f2528b845bd51':
Fix generated-sources-dir-for for COMMON
2015-11-26 11:43:02 +00:00