OSDN Git Service
Dan Albert [Wed, 9 Dec 2015 23:41:01 +0000 (23:41 +0000)]
Merge "Build NDK binaries with --hash-style=both."
Dan Albert [Wed, 9 Dec 2015 22:52:25 +0000 (14:52 -0800)]
Build NDK binaries with --hash-style=both.
Change-Id: I1c3b7415c654b783c6bb7e38a40d4c279826400f
Alex Klyubin [Tue, 8 Dec 2015 20:15:11 +0000 (20:15 +0000)]
Merge "Do not run zipalign when re-signing APKs."
Alex Klyubin [Fri, 4 Dec 2015 17:21:08 +0000 (09:21 -0800)]
Do not run zipalign when re-signing APKs.
Running zipalign is no longer needed because signapk takes care of
alignment.
Bug:
25794543
Change-Id: I1080240a67ea6f1b41585fff83d18d57fdcf44e2
Ying Wang [Tue, 8 Dec 2015 17:59:55 +0000 (17:59 +0000)]
Merge "Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES"
am:
616b8a5370
* commit '
616b8a5370e6ad5cb8519fbe2c00eaa6637da260':
Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES
Ying Wang [Tue, 8 Dec 2015 17:56:05 +0000 (17:56 +0000)]
Merge "Set -bootclasspath to "" if LOCAL_NO_STANDARD_LIBRARIES"
Elliott Hughes [Tue, 8 Dec 2015 02:58:25 +0000 (18:58 -0800)]
Merge "Revert "enable -fstack-protector-strong""
am:
27ab42654e
* commit '
27ab42654ebd5ffdc55bb6b727723e6980649ef9':
Revert "enable -fstack-protector-strong"
Alex Klyubin [Tue, 8 Dec 2015 02:58:19 +0000 (18:58 -0800)]
Merge "Do not run zipalign when building APK (except prebuilts)."
am:
b437f58006
* commit '
b437f58006af3d8b15eb3308ab5174da1a7c6c0d':
Do not run zipalign when building APK (except prebuilts).
Ying Wang [Tue, 8 Dec 2015 02:58:12 +0000 (18:58 -0800)]
Merge "Fix TARGET_ASAN build."
am:
9bbc67b55a
* commit '
9bbc67b55ac6876920b3ca5a73673d0a10c3fb52':
Fix TARGET_ASAN build.
Dimitry Ivanov [Tue, 8 Dec 2015 02:58:05 +0000 (18:58 -0800)]
Merge "Include libGLESv3.so to PRODUCT_PACKAGES"
am:
73661d4220
* commit '
73661d4220b85987ee5e5f34a3fc538283c19c34':
Include libGLESv3.so to PRODUCT_PACKAGES
Elliott Hughes [Tue, 8 Dec 2015 02:54:01 +0000 (02:54 +0000)]
Merge "Revert "enable -fstack-protector-strong""
Elliott Hughes [Tue, 8 Dec 2015 02:53:51 +0000 (02:53 +0000)]
Revert "enable -fstack-protector-strong"
This reverts commit
8765b1035f813be2c26988a73cf3e9815aa5adf6.
This prevents x86 from booting.
http://b/
26046864
Change-Id: Ica3f7e7e639c99fd3158df3643acb49307197881
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
(cherry-pick from commit
c6a301756cd6bc58691cde69513b28e7ee0d1ac6)
Alex Klyubin [Mon, 7 Dec 2015 22:08:14 +0000 (22:08 +0000)]
Merge "Do not run zipalign when building APK (except prebuilts)."
Ying Wang [Mon, 7 Dec 2015 19:32:21 +0000 (19:32 +0000)]
Merge "Fix TARGET_ASAN build."
Dimitry Ivanov [Mon, 7 Dec 2015 19:00:58 +0000 (19:00 +0000)]
Merge "Include libGLESv3.so to PRODUCT_PACKAGES"
Ying Wang [Mon, 7 Dec 2015 18:45:19 +0000 (10:45 -0800)]
Fix TARGET_ASAN build.
Bug:
26044735
Change-Id: I9c6b3b16637ca2d0da4765e896a9f03c1d5dc51c
Nick Kralevich [Sat, 5 Dec 2015 22:23:57 +0000 (14:23 -0800)]
Merge "enable -fstack-protector-strong"
am:
2a49aba35b
* commit '
2a49aba35b9b9216df1da245f1af13c6faa5a850':
enable -fstack-protector-strong
Nick Kralevich [Sat, 5 Dec 2015 22:20:46 +0000 (22:20 +0000)]
Merge "enable -fstack-protector-strong"
Daniel Micay [Fri, 4 Dec 2015 22:36:26 +0000 (17:36 -0500)]
enable -fstack-protector-strong
This results in nearly all functions with the possibility of stack
corruption getting stack canaries, because it applies to any function
taking a reference to the frame or with a local array rather than just
the functions with arrays larger than 8 bytes. It was developed for use
in Chrome (and Chrome OS) and has also been adopted by various other
distributions (Arch, Fedora, Ubuntu, etc).
The code size increase ranges from ~1.5% to ~2.5%, compared to ~0.3% to
~0.7% with the more conservative switch. The increase in the performance
loss is usually minimal. The overall size increase once everything other
than C and C++ code is taken into account is minimal, and it greatly
improves the mitigation of stack buffer overflow vulnerabilities.
https://lwn.net/Articles/584225/
Change-Id: Ie83d381e09d94deb34c5ff142a101ba3d14cf3ba
Ying Wang [Sat, 5 Dec 2015 00:53:25 +0000 (00:53 +0000)]
Merge "Gmake doesn\'t like newline in macro expansion result."
am:
c7d5e54dfe
* commit '
c7d5e54dfe71766dc60adcf06e6ec1a2b12cdda9':
Gmake doesn't like newline in macro expansion result.
Ying Wang [Sat, 5 Dec 2015 00:49:46 +0000 (00:49 +0000)]
Merge "Gmake doesn't like newline in macro expansion result."
Ying Wang [Sat, 5 Dec 2015 00:44:03 +0000 (16:44 -0800)]
Gmake doesn't like newline in macro expansion result.
When $(call func) in the makefile text expansion includes newline, gmake
reports error "missing separator". But it's fine if the expansion includes
only spaces. That's a bit odd.
This change fixes the "missing separator".
Change-Id: I094e5ae1725699ebfa4ed66544eef037dd68714c
Dan Willemsen [Fri, 4 Dec 2015 23:17:58 +0000 (15:17 -0800)]
Merge "Sanity check LOCAL_SRC_FILES_EXCLUDE"
am:
cc3b2a5854
* commit '
cc3b2a58548832ab7a6620d6b607d315f06dfc06':
Sanity check LOCAL_SRC_FILES_EXCLUDE
Dan Willemsen [Fri, 4 Dec 2015 23:12:16 +0000 (23:12 +0000)]
Merge "Sanity check LOCAL_SRC_FILES_EXCLUDE"
Alex Klyubin [Fri, 4 Dec 2015 18:07:41 +0000 (10:07 -0800)]
Do not run zipalign when building APK (except prebuilts).
This changes the build system to no longer run zipalign except for
those prebuilts which do not need to re-signed.
Running zipalign is no longer needed because signapk takes care of
alignment. For those prebuilts which do not need to be re-signed
signapk is not invoked and thus zipalign is still needed because the
prebuilts may not have been aligned properly. This exemption will go
away once prebuilts are properly aligned.
Bug:
25794543
Change-Id: I31f10af80b9baa3c9481cb36f41e5e5046e852f9
Alex Klyubin [Fri, 4 Dec 2015 17:10:01 +0000 (17:10 +0000)]
Merge "Make signapk align .so entries to 4096 bytes."
am:
dbb5527a9e
* commit '
dbb5527a9ef27f292794d1e51ae56d1df68c328b':
Make signapk align .so entries to 4096 bytes.
Alex Klyubin [Fri, 4 Dec 2015 17:05:27 +0000 (17:05 +0000)]
Merge "Make signapk align .so entries to 4096 bytes."
Dan Willemsen [Fri, 4 Dec 2015 06:58:39 +0000 (22:58 -0800)]
Sanity check LOCAL_SRC_FILES_EXCLUDE
Error out if there is a file listed in LOCAL_SRC_FILES_EXCLUDE but not in
LOCAL_SRC_FILES. This should catch typos or other mistakes that would
otherwise be missed.
Change-Id: Iaddf575a6ce35238998ac47b59591a7d05fbcd0d
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 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: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 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: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: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: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: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: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: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: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
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: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: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: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: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: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: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: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"
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
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
Ying Wang [Tue, 24 Nov 2015 22:16:45 +0000 (22:16 +0000)]
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: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)
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."
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."