OSDN Git Service
Colin Cross [Thu, 3 Dec 2015 21:56:25 +0000 (21:56 +0000)]
Merge "Remove extra definition of AIDL"
am:
77f411e116
* commit '
77f411e116981ae1de9f060b128e4df0b2facd57':
Remove extra definition of AIDL
Colin Cross [Thu, 3 Dec 2015 21:41:59 +0000 (21:41 +0000)]
Merge "Remove extra definition of AIDL"
Colin Cross [Thu, 3 Dec 2015 00:33:04 +0000 (16:33 -0800)]
Use prebuilt tools in place
Don't install the prebuilt SDK tools for TARGET_BUILD_APPS builds, just
execute them in place. Avoids issues with duplicate rules for the
prebuilts and source modules when building with TARGET_BUILD_APPS in a
full platform tree.
Change-Id: I3cdb4f1a8208e8750310a5cc6130657613b683d1
(cherry picked from commit
fd08247bcfa47508da3cea41a004310cf28dd0fa)
Colin Cross [Thu, 3 Dec 2015 21:32:18 +0000 (13:32 -0800)]
Remove extra definition of AIDL
AIDL is defined in the sometimes-prebuilt tools section, remove the
extra definition that was overriding it.
Change-Id: I677bf46475fd5fd4a9258c77d91ecee806e5f205
Colin Cross [Thu, 3 Dec 2015 20:24:30 +0000 (20:24 +0000)]
Merge "Use prebuilt tools in place" am:
50e0646dbe am:
8581e58b3b
am:
64747f5101
* commit '
64747f5101f3a4f2385faa493643a513bd67a557':
Use prebuilt tools in place
Colin Cross [Thu, 3 Dec 2015 20:21:32 +0000 (20:21 +0000)]
Merge "Use prebuilt tools in place" am:
50e0646dbe
am:
8581e58b3b
* commit '
8581e58b3b845905f19a66a62bb735ac7fdbcf9e':
Use prebuilt tools in place
Colin Cross [Thu, 3 Dec 2015 20:18:38 +0000 (20:18 +0000)]
Merge "Use prebuilt tools in place"
am:
50e0646dbe
* commit '
50e0646dbe1fb52918b38c75aefc49d24bfd9a24':
Use prebuilt tools in place
Colin Cross [Thu, 3 Dec 2015 20:12:48 +0000 (20:12 +0000)]
Merge "Use prebuilt tools in place"
Shinichiro Hamaji [Thu, 3 Dec 2015 17:29:50 +0000 (17:29 +0000)]
Merge "Remove warnings from ijar/classfile.cc" am:
128053b91b am:
8707422e4e
am:
ba1277549d
* commit '
ba1277549d322091ecbfc6b3738c9590f65ef823':
Remove warnings from ijar/classfile.cc
Shinichiro Hamaji [Thu, 3 Dec 2015 05:45:48 +0000 (05:45 +0000)]
Merge "Remove warnings from ijar/classfile.cc" am:
128053b91b
am:
8707422e4e
* commit '
8707422e4ee24ca96befbf2bf54deca2590bedfa':
Remove warnings from ijar/classfile.cc
Shinichiro Hamaji [Thu, 3 Dec 2015 05:42:52 +0000 (05:42 +0000)]
Merge "Remove warnings from ijar/classfile.cc"
am:
128053b91b
* commit '
128053b91b959d0664c33659063c5246eb57a594':
Remove warnings from ijar/classfile.cc
Shinichiro Hamaji [Thu, 3 Dec 2015 05:39:24 +0000 (05:39 +0000)]
Merge "Remove warnings from ijar/classfile.cc"
Alex Klyubin [Thu, 3 Dec 2015 03:02:01 +0000 (19:02 -0800)]
Make signapk align .so entries to 4096 bytes.
This makes signapk align uncompressed .so entries to memory page
boundary (4096 bytes) to enable such libraries to be loaded at runtime
through memory-mapping the APK.
With this change in place, there should no longer be a need to run
zipalign after (or before) signapk.
Bug:
25794543
Change-Id: I74775af15a683791f57fcbd3497a79951b3f63a1
Tao Bao [Thu, 3 Dec 2015 01:38:34 +0000 (01:38 +0000)]
Merge "releasetools: Always use recovery mount options." am:
643d466f7b am:
1709cf3768
am:
50aa7c731b
* commit '
50aa7c731b338d32d676326589652f21249dc2c9':
releasetools: Always use recovery mount options.
Tao Bao [Thu, 3 Dec 2015 01:35:04 +0000 (01:35 +0000)]
Merge "releasetools: Always use recovery mount options." am:
643d466f7b
am:
1709cf3768
* commit '
1709cf3768b54c1abc267b5ee92f57023e206c26':
releasetools: Always use recovery mount options.
Tao Bao [Thu, 3 Dec 2015 01:30:40 +0000 (01:30 +0000)]
Merge "releasetools: Always use recovery mount options."
am:
643d466f7b
* commit '
643d466f7b853ab4009723e2da200e3a6642d2ad':
releasetools: Always use recovery mount options.
Tao Bao [Thu, 3 Dec 2015 01:24:15 +0000 (01:24 +0000)]
Merge "releasetools: Always use recovery mount options."
Colin Cross [Thu, 3 Dec 2015 01:22:29 +0000 (01:22 +0000)]
Merge "Provide path to mainDexClasses" am:
62e99632c6 am:
4e7bf63314
am:
7e68aa8251
* commit '
7e68aa8251afde9f885b7961aff5bbbabe840031':
Provide path to mainDexClasses
Colin Cross [Thu, 3 Dec 2015 01:18:49 +0000 (01:18 +0000)]
Merge "Provide path to mainDexClasses" am:
62e99632c6
am:
4e7bf63314
* commit '
4e7bf63314c8684bf26219c67d220341a03e4789':
Provide path to mainDexClasses
Colin Cross [Thu, 3 Dec 2015 01:13:57 +0000 (01:13 +0000)]
Merge "Provide path to mainDexClasses"
am:
62e99632c6
* commit '
62e99632c61ef74fb04cf2bf6e079844e5dd8ae1':
Provide path to mainDexClasses
Colin Cross [Thu, 3 Dec 2015 00:33:04 +0000 (16:33 -0800)]
Use prebuilt tools in place
Don't install the prebuilt SDK tools for TARGET_BUILD_APPS builds, just
execute them in place. Avoids issues with duplicate rules for the
prebuilts and source modules when building with TARGET_BUILD_APPS in a
full platform tree.
Change-Id: I3cdb4f1a8208e8750310a5cc6130657613b683d1
Colin Cross [Thu, 3 Dec 2015 01:10:47 +0000 (01:10 +0000)]
Merge "Provide path to mainDexClasses"
Colin Cross [Thu, 3 Dec 2015 00:25:49 +0000 (16:25 -0800)]
Provide path to mainDexClasses
Set MAINDEXCLASSES to the path to mainDexClasses.
Change-Id: I82532e8ea8dc7349178347e080fa0c63078ca9f5
Tao Bao [Wed, 2 Dec 2015 23:49:13 +0000 (15:49 -0800)]
releasetools: Always use recovery mount options.
Change-Id: I6e96c417ffb5ad36405f4a6f5342f80f358f375f
Tao Bao [Wed, 2 Dec 2015 22:10:02 +0000 (22:10 +0000)]
Merge "releasetools: Abort the update on apply_patch failures." am:
2a23c0c859 am:
d77af53fc6
am:
21362f024b
* commit '
21362f024b62e9ebab89c9a813229b4bd0bc9369':
releasetools: Abort the update on apply_patch failures.
Tao Bao [Wed, 2 Dec 2015 22:05:02 +0000 (22:05 +0000)]
Merge "releasetools: Abort the update on apply_patch failures." am:
2a23c0c859
am:
d77af53fc6
* commit '
d77af53fc673229a1e9b59d99592272f689df10f':
releasetools: Abort the update on apply_patch failures.
Tao Bao [Wed, 2 Dec 2015 22:00:18 +0000 (22:00 +0000)]
Merge "releasetools: Abort the update on apply_patch failures."
am:
2a23c0c859
* commit '
2a23c0c85919bada137985f9e3b32514185b38c5':
releasetools: Abort the update on apply_patch failures.
Tao Bao [Wed, 2 Dec 2015 21:56:42 +0000 (21:56 +0000)]
Merge "releasetools: Abort the update on apply_patch failures."
Tao Bao [Wed, 2 Dec 2015 01:46:46 +0000 (17:46 -0800)]
releasetools: Abort the update on apply_patch failures.
We used to silently ignore the return value from apply_patch() even if
it had failed. It gives us more trouble to investigate the failure when
the affected file/partition gets touched in subsequent OTAs. This CL
adds the checking of the return value and aborts the update accordingly.
Bug:
25893277
Change-Id: Ie5e1c563576e503343e6a5b28ed4d7039f6f919c
Ying Wang [Wed, 2 Dec 2015 17:58:00 +0000 (17:58 +0000)]
Merge "make USER limited to 6 characters when generating BF_BUILD_NUMBER" am:
88ca8aff3e am:
79215cdeab
am:
4c6b66e617
* commit '
4c6b66e6172ffcc879ff48f2a245f670471f52e2':
make USER limited to 6 characters when generating BF_BUILD_NUMBER
Ying Wang [Wed, 2 Dec 2015 17:55:18 +0000 (17:55 +0000)]
Merge "make USER limited to 6 characters when generating BF_BUILD_NUMBER" am:
88ca8aff3e
am:
79215cdeab
* commit '
79215cdeabbc43e47cbfe212eed02e6958ebfb8b':
make USER limited to 6 characters when generating BF_BUILD_NUMBER
Ying Wang [Wed, 2 Dec 2015 17:53:17 +0000 (17:53 +0000)]
Merge "make USER limited to 6 characters when generating BF_BUILD_NUMBER"
am:
88ca8aff3e
* commit '
88ca8aff3e4c6f776444ca8267b044b314f6aa0f':
make USER limited to 6 characters when generating BF_BUILD_NUMBER
Ying Wang [Wed, 2 Dec 2015 17:48:21 +0000 (17:48 +0000)]
Merge "make USER limited to 6 characters when generating BF_BUILD_NUMBER"
wei qiao [Tue, 1 Dec 2015 06:20:55 +0000 (14:20 +0800)]
make USER limited to 6 characters when generating BF_BUILD_NUMBER
the value of USER is dependent from the compilation environment,so
when compiling one same device project, the BUILD_FINGERPRINT may
exceed 91 characters because ${USER} is long, but with short ${USER}
the compilation can pass.
Signed-off-by: wei qiao <qiaowei224@gmail.com>
Change-Id: Ia0f7dfa9cf7d605f1f2603f70dd0e6877482eb8a
Shinichiro Hamaji [Tue, 1 Dec 2015 07:43:24 +0000 (16:43 +0900)]
Remove warnings from ijar/classfile.cc
Also add -Werror.
Change-Id: I2f9fda288d31bd34735856ade33916c93c45922a
Tao Bao [Tue, 1 Dec 2015 02:34:58 +0000 (02:34 +0000)]
Merge "Stop packaging obsolete OTA tools." am:
b98fa19703 am:
e82ea963e8
am:
2867533add
* commit '
2867533add946cd9d2294ed3b4976f5ecf7aa76e':
Stop packaging obsolete OTA tools.
Tao Bao [Tue, 1 Dec 2015 02:31:24 +0000 (02:31 +0000)]
Merge "Stop packaging obsolete OTA tools." am:
b98fa19703
am:
e82ea963e8
* commit '
e82ea963e8cf5d7eb2dd6d2c7aacee86ddfba853':
Stop packaging obsolete OTA tools.
Tao Bao [Tue, 1 Dec 2015 02:28:19 +0000 (02:28 +0000)]
Merge "Stop packaging obsolete OTA tools."
am:
b98fa19703
* commit '
b98fa19703ed0c7608f926007b1df257127ea777':
Stop packaging obsolete OTA tools.
Tao Bao [Tue, 1 Dec 2015 02:25:02 +0000 (02:25 +0000)]
Merge "Stop packaging obsolete OTA tools."
Colin Cross [Tue, 1 Dec 2015 01:52:33 +0000 (01:52 +0000)]
Merge "Make export_includes a restat rule" am:
615d66e2c2 am:
b16a63cbb0
am:
ceac25c571
* commit '
ceac25c5719aab39d7a15fd1c1578d8839a86911':
Make export_includes a restat rule
Colin Cross [Tue, 1 Dec 2015 01:49:01 +0000 (01:49 +0000)]
Merge "Make export_includes a restat rule" am:
615d66e2c2
am:
b16a63cbb0
* commit '
b16a63cbb0582637b0e6f28792ae6d8de718e357':
Make export_includes a restat rule
Colin Cross [Tue, 1 Dec 2015 01:45:58 +0000 (01:45 +0000)]
Merge "Make export_includes a restat rule"
am:
615d66e2c2
* commit '
615d66e2c21603552dc952db9493f43bbcc7f2b1':
Make export_includes a restat rule
Colin Cross [Tue, 1 Dec 2015 01:42:26 +0000 (01:42 +0000)]
Merge "Make export_includes a restat rule"
Colin Cross [Tue, 1 Dec 2015 01:33:26 +0000 (17:33 -0800)]
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
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:22:24 +0000 (12:22 -0800)]
Stop packaging obsolete OTA tools.
applypatch, applypatch_static and sqlite3 are no longer needed.
Bug:
24621915
Change-Id: I6de5bc45bc8434b9c387e1d3d1b6c347c23a5290
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
Neil Fuller [Wed, 25 Nov 2015 10:23:17 +0000 (10:23 +0000)]
Remove synchronized from the public API docs
The information is not useful. Javadoc hasn't included this
information for years.
Bug:
25767152
Change-Id: Ic0a398851b90fbf85785d5cf946e7f4c1aaa4be4
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