OSDN Git Service
Sami Tolvanen [Wed, 10 Feb 2016 18:41:26 +0000 (10:41 -0800)]
Clear logd intermediates
Needed by changes from
Idcdc5bff133f13c1267f0ec0a75cc8cf1ddbda0d
Bug:
26902605
Change-Id: Id3ca7889ede30b54b7af73dd50653ca1a20d59aa
Alex Klyubin [Wed, 10 Feb 2016 21:35:05 +0000 (21:35 +0000)]
Merge "Sign APKs using SHA-256 instead of SHA-1 when possible."
Sami Tolvanen [Wed, 10 Feb 2016 18:50:17 +0000 (18:50 +0000)]
Merge "Fix metadata location when file system doesn't span the partition"
Dan Willemsen [Wed, 10 Feb 2016 18:13:22 +0000 (18:13 +0000)]
Merge "Tell Soong about HOST_CROSS_*"
Alex Klyubin [Wed, 13 Jan 2016 18:32:47 +0000 (10:32 -0800)]
Sign APKs using SHA-256 instead of SHA-1 when possible.
This changes the build system to provide the signapk tool with the
minSdkVersion of the APK being signed. signapk in turn will then use
SHA-256 instead of SHA-1 if minSdkVersion is 18 (JB MR2) or higher
(see
c2c49ed0c13846f7f96249c7419971dfcddc9215).
To avoid increasing incremental OTA update package sizes for already
released platforms, release build scripts disable the above logic when
signing target files ZIPs for pre-N platforms.
Bug:
25643280
Change-Id: I3f2faaf49c6fa392ffbf1ee9f30de476f9f73231
Sami Tolvanen [Tue, 9 Feb 2016 20:28:58 +0000 (12:28 -0800)]
Fix metadata location when file system doesn't span the partition
Pad the sparse image with a zero fill chunk to correctly position
verity and FEC metadata at the end of the partition.
Bug:
27073791
Change-Id: I9f70d579a42e5007d50e9c02a98a608d2815f0ed
Tao Bao [Wed, 10 Feb 2016 17:05:47 +0000 (17:05 +0000)]
Merge "releasetools: Add two new entries to metadata."
Doug Zongker [Wed, 10 Feb 2016 16:52:10 +0000 (16:52 +0000)]
Merge "improve performance of blockimgdiff"
Doug Zongker [Tue, 9 Feb 2016 16:28:09 +0000 (08:28 -0800)]
improve performance of blockimgdiff
Substantially improves the performance of some BlockImageDiff steps on
large images. GenerateDigraph and AssertSequenceGood are now linear in
the number of blocks in the target image rather than quadratic in the
size of the partition. FindVertexSequence tracks the score of each
vertex, the set of sources and sinks, and maintains a heap for finding
the best vertex to use for the greedy step, instead of repeatedly
re-scanning the set of remaining vertexes.
Change-Id: Ifeea5053d80ef4f06a5aa239c9a1797dd5e47841
Alex Klyubin [Wed, 10 Feb 2016 01:08:12 +0000 (01:08 +0000)]
Merge "Use Jan 1 2009 as timestamp in OTA update ZIPs."
Dan Willemsen [Tue, 9 Feb 2016 22:55:13 +0000 (14:55 -0800)]
Tell Soong about HOST_CROSS_*
This configures Soong to build windows binaries, which requires support
for 64-bit windows binaries in BUILD_PREBUILT for USE_SOONG=true.
module_arch_supported.mk did not support 64-bit being the secondary
architecture when evaluating multilib conditionals. All other uses of
HOST_*_IS_64_BIT already check the proper version.
Change-Id: Iff664733e6991f4adbe8ddd620b091bbb55d1d86
Neil Fuller [Tue, 9 Feb 2016 23:01:40 +0000 (23:01 +0000)]
Merge "Allow java targets to support 1.8 source / target"
Alex Klyubin [Tue, 9 Feb 2016 21:09:57 +0000 (13:09 -0800)]
Use Jan 1 2009 as timestamp in OTA update ZIPs.
This is a follow-up to
6c41036bcf35fe39162b50d27533f0f3bfab3028 where
I forgot to update a section of OTA update ZIP code.
Bug:
26864066
Change-Id: Idbcde71d6377a16807e41c999120eeddd5b4d8a4
Dan Willemsen [Tue, 9 Feb 2016 20:54:10 +0000 (20:54 +0000)]
Merge "Add 64-bit windows cross-compiles"
Dan Willemsen [Tue, 9 Feb 2016 05:21:39 +0000 (05:21 +0000)]
Merge "Disable java when JAVA_NOT_REQUIRED is set"
Dan Willemsen [Sat, 6 Feb 2016 02:24:17 +0000 (18:24 -0800)]
Disable java when JAVA_NOT_REQUIRED is set
Change-Id: Id3056cde93302be20000bf7af33aeed0fa8fdf52
Dan Willemsen [Mon, 8 Feb 2016 22:40:33 +0000 (22:40 +0000)]
Merge "Revert "Do not diff .odex files""
Dan Willemsen [Mon, 8 Feb 2016 20:48:48 +0000 (20:48 +0000)]
Revert "Do not diff .odex files"
The bug has been fixed, .odex files are deterministic.
This reverts commit
c4438d3d29389d0df0b744c339d67f4a673be96c.
Bug:
26956807
Change-Id: Iaa42dfba5cf79ee64ac20cf4f1f3a4598f4275f4
Tao Bao [Thu, 4 Feb 2016 22:26:02 +0000 (14:26 -0800)]
releasetools: Add two new entries to metadata.
Add "ota-required-cache" into the metadata file in an OTA package,
which shows the minimum free space on /cache to apply the update.
Add "ota-type" into the metadata file, which shows the OTA type for
this package (i.e. one of FILE, BLOCK and AB).
Also add the cache free space check into updater-script when generating
block-based incremental OTAs (we only had such lines for file-based
incrementals before).
Bug:
26731903
Change-Id: Id6ff0fc4cdfb1443636b0b3800b0f8bddb5bb1d0
Dan Willemsen [Sat, 6 Feb 2016 00:20:19 +0000 (16:20 -0800)]
Add 64-bit windows cross-compiles
This is mostly the same as the existing 2ND_HOST / HOST_CROSS support.
The interesting thing I did here was make x86 the 'first' architecture,
and x86_64 the second. This way LOCAL_MULTILIB := first defaults to
32-bit windows modules.
windows-x86/bin <- defaults to 32-bit executables
windows-x86/lib <- 32-bit libraries, like before
windows-x86/lib64 <- 64-bit libraries
windows-x86/obj <- 32-bit intermediates
windows-x86/obj64 <- 64-bit intermediates
Then modules are registered with the names:
host_cross_liblog <- 32-bit, like before
host_cross_liblog_64 <- 64-bit
Bug:
26957718
Change-Id: I9f119411acb43e973ec1e6bca3c1dc291c91556c
Alex Deymo [Fri, 5 Feb 2016 23:11:18 +0000 (23:11 +0000)]
Merge "ota_from_target_files: Include the payload properties."
Dan Willemsen [Fri, 5 Feb 2016 18:12:20 +0000 (18:12 +0000)]
Merge "Fix unused src tracking for generated .o files"
Alex Deymo [Fri, 5 Feb 2016 06:29:29 +0000 (22:29 -0800)]
ota_from_target_files: Include the payload properties.
When building an A/B OTA package, include the payload.bin properties as
a key-value pairs text file, so it can easily be passed to
update_engine during payload application.
Bug:
26991255
TEST=`ota_from_target_files out/dist/${BOARD}-target_files.zip full-ota.zip` includes the properties.
Change-Id: I445c8a8e412a8e16b48b6ee626db8e27d48a38a9
Colin Cross [Thu, 4 Feb 2016 23:49:41 +0000 (23:49 +0000)]
Merge "Don't build otatools for PDK"
Chih-hung Hsieh [Thu, 4 Feb 2016 23:22:19 +0000 (23:22 +0000)]
Merge "Remove USE_CLANG_PLATFORM_BUILD in BoardConfig.mk"
Colin Cross [Thu, 4 Feb 2016 23:13:31 +0000 (23:13 +0000)]
Merge "Build .toc when building a module by name"
Colin Cross [Thu, 4 Feb 2016 23:09:23 +0000 (15:09 -0800)]
Don't build otatools for PDK
Change-Id: I5e73d103300ac938f80b3ff0af978c123d649fed
Dan Willemsen [Thu, 4 Feb 2016 22:18:48 +0000 (14:18 -0800)]
Fix unused src tracking for generated .o files
*.o files that are passed in via LOCAL_GENERATED_SOURCES are added
directly to all_objects, they are not mixed with the normal_objects that
we track. So omit them from they my_gen_src_files list so that we don't
warn that they're unused.
Change-Id: I94b85504032e70fbcc00207d6200557700dd0a89
Colin Cross [Thu, 4 Feb 2016 21:28:04 +0000 (13:28 -0800)]
Build .toc when building a module by name
Building a module by name with make <module name>, or with mm or mma
through all_modules, should also build the .toc file so that future uses
of mm on modules that depend on this one can find the .toc file.
Bug:
26936761
Change-Id: Id0c592f0860a10b732b2b5b13c7e967c9bcb1c6b
Stephen Hines [Thu, 4 Feb 2016 19:46:07 +0000 (19:46 +0000)]
Merge "Fix LLVM_RTLIB_PATH for new prebuilts."
Stephen Hines [Thu, 4 Feb 2016 19:43:41 +0000 (11:43 -0800)]
Fix LLVM_RTLIB_PATH for new prebuilts.
This moved from lib/ to lib64/, but wasn't noticed because no one builds
with the profiler on by default.
Change-Id: I0155263b4a50437ea0864338fb34baefc3df59d2
Chih-Hung Hsieh [Thu, 4 Feb 2016 18:55:56 +0000 (10:55 -0800)]
Remove USE_CLANG_PLATFORM_BUILD in BoardConfig.mk
Use global default USE_CLANG_PLATFORM_BUILD set in core/envsetup.mk,
or user provided environment variable USE_CLANG_PLATFORM_BUILD.
BUG:
26102335
Change-Id: I7e12219a60f36bb44797bb028b4a5873a67c9210
Stephen Hines [Thu, 4 Feb 2016 07:34:05 +0000 (07:34 +0000)]
Merge "Switch to clang-
2577113."
Dan Willemsen [Wed, 3 Feb 2016 18:57:07 +0000 (18:57 +0000)]
Merge changes I2e00bb66,I00890229
* changes:
Do not diff .odex files
Diff libpac.so now that it is deterministic
Dan Willemsen [Wed, 3 Feb 2016 18:46:39 +0000 (10:46 -0800)]
Do not diff .odex files
They still are not deterministic -- only the boot images were made
deterministic (.oat/.art).
Bug:
26956807
Change-Id: I2e00bb6662b4c8d184c48ef9aa34b39142c94893
Dan Willemsen [Wed, 3 Feb 2016 18:45:25 +0000 (10:45 -0800)]
Diff libpac.so now that it is deterministic
Bug:
25348136
Change-Id: I008902299281b5ddd55a9b8c405d53eea2d56c8b
Neil Fuller [Sat, 16 Jan 2016 03:41:26 +0000 (19:41 -0800)]
Allow java targets to support 1.8 source / target
This change enables build rules to specify:
LOCAL_JAVA_LANGUAGE_VERSION := 1.8
to enable -source 1.8 -target 1.8 for javac and
equivalent flags for Jack.
Bug:
26753820
(cherry-picked from commit
cdfbe4a8522b9a13ffe6ac1f826a1d6760f87d60)
Change-Id: I361c99dd599e7b4a041f02c9562e461da2b0502e
Colin Cross [Tue, 2 Feb 2016 20:34:30 +0000 (20:34 +0000)]
Merge "Move PDK selection into config.mk"
Dan Willemsen [Tue, 2 Feb 2016 17:56:57 +0000 (17:56 +0000)]
Merge "Fix typo"
Stephen Hines [Fri, 22 Jan 2016 23:12:49 +0000 (15:12 -0800)]
Switch to clang-
2577113.
Bug: http://b/
25282907
This is actually based on clang/LLVM upstream revision r256229.
Change-Id: I335be68f196e5b55ac2816fa854e97b841b54240
Sebastien Hertz [Tue, 2 Feb 2016 07:31:37 +0000 (07:31 +0000)]
Merge "Support code coverage with Jack"
Dan Willemsen [Tue, 2 Feb 2016 05:40:17 +0000 (21:40 -0800)]
Fix typo
This was producing a number of unused source warnings for prebuilt files
using LOCAL_SRC_FILES_<arch>.
Change-Id: I48d1face7baf642f3ef17f957448ccb73788765f
Dan Willemsen [Tue, 2 Feb 2016 05:18:05 +0000 (05:18 +0000)]
Merge "Track ObjC object mapping"
Dan Willemsen [Tue, 2 Feb 2016 02:55:23 +0000 (18:55 -0800)]
Track ObjC object mapping
Objective-C .m/.mm files were not being tracked, so they were showing
up as unused source files (on Darwin). They were also triggering an
internal build system warning because the new object list did not
match the current list.
Change-Id: I01fff8c5587fe168106c60782080d60744311f6f
Colin Cross [Tue, 26 Jan 2016 23:59:50 +0000 (15:59 -0800)]
Move PDK selection into config.mk
config.mk needs to know TARGET_BUILD_PDK in order to select prebuilt
tools. Move the selection of TARGET_BUILD_PDK into config.mk.
Change-Id: I1f73c92917887f27259b2db64b3779a2fe0df162
Shinichiro Hamaji [Mon, 1 Feb 2016 23:04:44 +0000 (23:04 +0000)]
Merge "Use dependency files generated by llvm-rs-cc for Java"
Dan Willemsen [Mon, 1 Feb 2016 22:38:53 +0000 (22:38 +0000)]
Merge "Diff .art/.oat/.odex files now that they are deterministic"
Dan Willemsen [Mon, 1 Feb 2016 21:38:25 +0000 (13:38 -0800)]
Diff .art/.oat/.odex files now that they are deterministic
This also whitelists the ro.build.user property, which may change based
on host username.
Bug:
26687569
Change-Id: I8f3244c2325dd80a7961c474655f0c50670d1b46
Colin Cross [Mon, 1 Feb 2016 18:57:50 +0000 (18:57 +0000)]
Merge "Don't force color diagnostics outside of ninja"
Shinichiro Hamaji [Mon, 1 Feb 2016 08:59:01 +0000 (17:59 +0900)]
Use dependency files generated by llvm-rs-cc for Java
This is a reland of
4c474617d491fe98fa02571349138fb757959232
This time, we use awk instead of sed, and the script works
on Mac.
For C++ code llvm-rs-cc defines two targets but it defines
three targets for Java. The sed script was updated to handle
both cases appropriately.
Bug:
26839129
Change-Id: I1bca7d253764554d552950e03deedabaa9b7f17e
Shinichiro Hamaji [Mon, 1 Feb 2016 08:16:42 +0000 (08:16 +0000)]
Merge "Revert "Use dependency files generated by llvm-rs-cc for Java""
Shinichiro Hamaji [Mon, 1 Feb 2016 08:08:26 +0000 (08:08 +0000)]
Revert "Use dependency files generated by llvm-rs-cc for Java"
This reverts commit
4c474617d491fe98fa02571349138fb757959232.
Change-Id: I66c46360d0ccf927c807ddd5cfbc56cbd97ed4a2
Shinichiro Hamaji [Mon, 1 Feb 2016 07:50:32 +0000 (07:50 +0000)]
Merge "Use dependency files generated by llvm-rs-cc for Java"
Shinichiro Hamaji [Mon, 1 Feb 2016 07:50:01 +0000 (07:50 +0000)]
Merge "Use .KATI_DEPFILE for files generated by aidl-java"
Dan Willemsen [Sat, 30 Jan 2016 02:44:27 +0000 (02:44 +0000)]
Merge "Use Jan 1 2009 as timestamp in APKs and OTA update ZIPs."
Dan Willemsen [Sat, 30 Jan 2016 02:44:12 +0000 (02:44 +0000)]
Merge "Order objects based on LOCAL_SRC_FILES and LOCAL_GENERATED_SOURCES"
Alex Klyubin [Fri, 29 Jan 2016 23:58:27 +0000 (23:58 +0000)]
Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible." This is breaking CTS."
Alex Klyubin [Fri, 29 Jan 2016 23:56:44 +0000 (23:56 +0000)]
Revert "Sign APKs using SHA-256 instead of SHA-1 when possible." This is breaking CTS.
This reverts commit
c2a36afd6772d9286e8071693f80648beef763a3.
Change-Id: I4389bf99aeb213198c1c501ba9462bd4a4540d0a
Lee Campbell [Fri, 29 Jan 2016 23:42:19 +0000 (23:42 +0000)]
Merge "brillo: Remove dependency on java for Brillo"
Lee Campbell [Fri, 29 Jan 2016 00:12:01 +0000 (16:12 -0800)]
brillo: Remove dependency on java for Brillo
Brillo does not require Java. Add a JAVA_NOT_REQUIRED
flag to the build system to make the jdk requirment optional
Also don't build signapk for Brillo
BUG:
25281898
Change-Id: I31e68cc7d076bf6c234699c77c0ea1ea428be4f5
Alex Klyubin [Fri, 29 Jan 2016 21:06:50 +0000 (13:06 -0800)]
Use Jan 1 2009 as timestamp in APKs and OTA update ZIPs.
Previously, the timestamp was one hour ahead of NotBefore of the
signer's certificate, adjusted for the current timezone. With this
change the MS-DOS timestamp in output APK/ZIP files is
Jan 1 2009 00:00:00.
Bug:
26864066
Change-Id: Id6263c38ac7042489ab695454f8e0fb2d85a3958
Alex Klyubin [Fri, 29 Jan 2016 20:17:49 +0000 (20:17 +0000)]
Merge "Sign APKs using SHA-256 instead of SHA-1 when possible."
Alex Klyubin [Wed, 13 Jan 2016 18:32:47 +0000 (10:32 -0800)]
Sign APKs using SHA-256 instead of SHA-1 when possible.
This changes the build system to provide the signapk tool with the
minSdkVersion of the APK being signed. signapk in turn will then use
SHA-256 instead of SHA-1 if minSdkVersion is 18 (JB MR2) or higher
(see
c2c49ed0c13846f7f96249c7419971dfcddc9215).
To avoid increasing incremental OTA update package sizes for already
released platforms, release build scripts disable the above logic when
signing target files ZIPs for pre-N platforms.
Bug:
25643280
(cherry picked from commit
de5bc04717505ad0e5b55605bccf43974f4c5c7a)
Change-Id: I4b100750e47788ab6ed897a0a5abfd33542e8676
Shinichiro Hamaji [Thu, 28 Jan 2016 08:00:33 +0000 (17:00 +0900)]
Use dependency files generated by llvm-rs-cc for Java
This is similar to
2e45fd036ad308cfa6094b181a67f97002ebf10f
but this CL is for generated java code.
For C++ code llvm-rs-cc defines two targets but it defines
three targets for Java. The sed script was updated to handle
both cases appropriately.
Bug:
26839129
Change-Id: I5c7705c67f3c65c4c14f74558e603f8ec9f35879
Shinichiro Hamaji [Thu, 28 Jan 2016 07:10:00 +0000 (16:10 +0900)]
Use .KATI_DEPFILE for files generated by aidl-java
Bug:
26839129
Change-Id: Ief611969b28aea3bb12097ba91d40f3e5010d647
Dan Willemsen [Wed, 20 Jan 2016 04:07:08 +0000 (20:07 -0800)]
Order objects based on LOCAL_SRC_FILES and LOCAL_GENERATED_SOURCES
We have been reordering objects to the linker based on how they were
generated. In soong, they're ordered based on the order listed in the
src_files.
Keep track of which source files created which object files so that we
can create the ordered list. Optionally change the order, based on
BINARY_OBJECTS_ORDER. That way we can compare make and soong builds.
Since we're keeping track of the used source files, warn when an entry
in LOCAL_SRC_FILES is not used. (whether it is an unused file like a
header, or a typo)
LOCAL_GENERATED_SOURCES is not verified, since it is valid to add
headers and other files in that list (to set up dependencies).
Change-Id: I1dfbbb3aa570c11c1db3b7133e46ed0b8c3b8989
Sebastien Hertz [Thu, 19 Nov 2015 16:53:00 +0000 (17:53 +0100)]
Support code coverage with Jack
Building an app with Jack and with the environment variable
EMMA_INSTRUMENT_STATIC set to true will apply code coverage
onto the app targeting Jacoco.
Bug:
20115492
Change-Id: Ief3640fa3faa466f7f6aaa9739e06d3db24110a0
Alex Klyubin [Wed, 27 Jan 2016 17:49:40 +0000 (17:49 +0000)]
Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible.""
Alex Klyubin [Wed, 27 Jan 2016 17:45:42 +0000 (17:45 +0000)]
Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."
This reverts commit
74df828cb574a6f30be9b9dcf286773ca1835f72. This commit is breaking a build, again...
Change-Id: I2df561d68302ba4c83e90a64a7bf203645033a3b
Alex Klyubin [Wed, 27 Jan 2016 16:55:16 +0000 (16:55 +0000)]
Merge "Sign APKs using SHA-256 instead of SHA-1 when possible."
Neil Fuller [Wed, 27 Jan 2016 13:25:43 +0000 (13:25 +0000)]
Merge "Doclava template changes associated with default methods"
Neil Fuller [Thu, 14 Jan 2016 22:44:11 +0000 (22:44 +0000)]
Doclava template changes associated with default methods
The ordering of method declaration modifiers changed slightly
to reflect the ordering given in:
http://docs.oracle.com/javase/specs/jls/se8/html/jls-8.html#jls-8.4.3
http://docs.oracle.com/javase/specs/jls/se8/html/jls-9.html#jls-9.4
Bug:
26241119
(cherry-picked from commit
ca59875e12e47162fc765bc43d6651b555c04d81)
Change-Id: I8489ad5010fc811b22167af50ba29221aac8b6cb
Shinichiro Hamaji [Wed, 27 Jan 2016 08:36:04 +0000 (08:36 +0000)]
Merge "Write clean_steps.mk with multiple commands"
Shinichiro Hamaji [Wed, 27 Jan 2016 05:59:56 +0000 (14:59 +0900)]
Write clean_steps.mk with multiple commands
$(INTERNAL_CLEAN_STEPS) could be too big to be fit in a single
command line.
Bug:
26707439
Change-Id: Ieed6c772980d06c2418a9246b025bca7a6f568aa
Alex Deymo [Wed, 27 Jan 2016 03:28:53 +0000 (03:28 +0000)]
Merge "Place the META/ dir first in the target_files.zip."
Alex Deymo [Wed, 27 Jan 2016 02:47:44 +0000 (18:47 -0800)]
Place the META/ dir first in the target_files.zip.
To help early verification of a target_files.zip being uploaded to our
servers, we place the META/ directory first in the .zip file, so checks
against the product_id.txt and product_version.txt don't need to wait
for the whole file to upload.
Note that META/*filesystem_config.txt files are generated and added to
the .zip file at a later point, so they are not included at the
beginning.
Bug:
26806325
TEST=`make dist` and `unzip -l out/dist/edison-target_files-eng.$USER.zip` shows most META/ files first.
Change-Id: I1955645412688f5c7823063ed56606b251daccfd
Kevin Cernekee [Tue, 26 Jan 2016 23:45:37 +0000 (23:45 +0000)]
Merge "README: Update docs"
Alex Klyubin [Wed, 13 Jan 2016 18:32:47 +0000 (10:32 -0800)]
Sign APKs using SHA-256 instead of SHA-1 when possible.
This changes the build system to provide the signapk tool with the
minSdkVersion of the APK being signed. signapk in turn will then use
SHA-256 instead of SHA-1 if minSdkVersion is 18 (JB MR2) or higher
(see
c2c49ed0c13846f7f96249c7419971dfcddc9215).
To avoid increasing incremental OTA update package sizes for already
released platforms, release build scripts disable the above logic when
signing target files ZIPs for pre-N platforms.
Bug:
25643280
Change-Id: I058393e0971d0d6559dbd69ea902754c6c7cab14
(cherry picked from commit
de5bc04717505ad0e5b55605bccf43974f4c5c7a)
Neil Fuller [Tue, 26 Jan 2016 10:33:54 +0000 (10:33 +0000)]
Merge "Revert "Revert "Make OpenJDK 8 the default"""
Shinichiro Hamaji [Tue, 26 Jan 2016 06:36:02 +0000 (06:36 +0000)]
Merge "Use dependency files generated by llvm-rs-cc"
Shinichiro Hamaji [Mon, 25 Jan 2016 09:59:43 +0000 (18:59 +0900)]
Use dependency files generated by llvm-rs-cc
This was a regression since kati has been introduced. This CL
introduces include-depfile function to make it easier to write
Makefiles which work with both make and kati.
As ninja can handle only a single dependency file per a build
rule, now we merge multiple .d files generated by llvm-rs-cc
into a .d file.
Change-Id: Iaf64a8f0523ab98115837e6e06abd50f06620363
Christopher Ferris [Mon, 25 Jan 2016 21:27:57 +0000 (21:27 +0000)]
Merge "Add libc_malloc_debug to the always build list."
Josh Gao [Mon, 25 Jan 2016 18:23:35 +0000 (18:23 +0000)]
Merge "Error out if MALLOC_IMPL is defined."
Alex Klyubin [Mon, 25 Jan 2016 17:19:02 +0000 (17:19 +0000)]
Merge "Revert "Sign APKs using SHA-256 instead of SHA-1 when possible.""
Alex Klyubin [Mon, 25 Jan 2016 17:17:09 +0000 (17:17 +0000)]
Revert "Sign APKs using SHA-256 instead of SHA-1 when possible."
This reverts commit
de5bc04717505ad0e5b55605bccf43974f4c5c7a because it's breaking some builds. Turns out some APKs have multiple sdkVersion attributes returned by aapt.
Change-Id: I013d6ef5eac473dd3900e0b9edf4c32cdc838bab
Neil Fuller [Mon, 25 Jan 2016 17:12:41 +0000 (17:12 +0000)]
Revert "Revert "Make OpenJDK 8 the default""
Reapply the switch to JDK 8 on aosp/master.
This reverts commit
85bddfdedffb425d85657314591a57191113806b.
Change-Id: If2e8733ba78b007d37914c0512cd6be1bd4c1e69
Neil Fuller [Mon, 25 Jan 2016 17:11:12 +0000 (17:11 +0000)]
Merge "Revert "Make OpenJDK 8 the default""
Neil Fuller [Mon, 25 Jan 2016 17:04:14 +0000 (17:04 +0000)]
Revert "Make OpenJDK 8 the default"
Temporary revert to help out Brillo folks.
It will be resubmitted tomorrow.
This reverts commit
4495f6afb8c23950c24dc9ee114050582da08f05.
Change-Id: Id378c7d3a6e72e9be50f9404b19d5763568987a5
Alex Klyubin [Mon, 25 Jan 2016 16:42:27 +0000 (16:42 +0000)]
Merge "Sign APKs using SHA-256 instead of SHA-1 when possible."
Neil Fuller [Mon, 25 Jan 2016 10:45:34 +0000 (10:45 +0000)]
Merge "Make OpenJDK 8 the default"
Neil Fuller [Wed, 16 Dec 2015 18:59:08 +0000 (18:59 +0000)]
Make OpenJDK 8 the default
To return to OpenJDK 7:
export LEGACY_USE_JAVA7=true
And run envsetup.sh/lunch again.
Bug:
25786468
Change-Id: I8e00591a24d13e3b8b6baaafe0fdff6536c58770
Stephen Hines [Fri, 22 Jan 2016 23:22:44 +0000 (23:22 +0000)]
Merge "Add an RS_CLANG variable as well for RenderScript."
Stephen Hines [Fri, 22 Jan 2016 23:11:34 +0000 (15:11 -0800)]
Add an RS_CLANG variable as well for RenderScript.
Change-Id: I33a73c4c2b19aa17bc18a64c92a86565111de3d0
Stephen Hines [Fri, 22 Jan 2016 21:20:19 +0000 (21:20 +0000)]
Merge "Add clang rules for RS_LLVM_* tools."
Josh Gao [Fri, 22 Jan 2016 19:24:59 +0000 (11:24 -0800)]
Error out if MALLOC_IMPL is defined.
Bug: http://b/
26390299
Change-Id: Icd3ce6853c8207b1a9ce1f9d546a61d5b113f15a
James Hawkins [Fri, 22 Jan 2016 18:09:05 +0000 (18:09 +0000)]
Merge "bootstat: Add bootstat to the embedded target to support logging boot time across devices."
Tao Bao [Fri, 22 Jan 2016 17:23:28 +0000 (17:23 +0000)]
Merge "Generate OTA packages for A/B update."
Stephen Hines [Fri, 22 Jan 2016 07:50:53 +0000 (23:50 -0800)]
Add clang rules for RS_LLVM_* tools.
This change adds new variables for RS_LLVM_* tools, which correspond
to the version of LLVM checked in currently to external/, instead of
mapping to the latest host prebuilts. This will help prevent version
differences for newer IR generated by the updated host prebuilts, which
then might not be readable with the on-device LLVM bits we build from
external/.
Change-Id: I6c7b0fa9082e9c8244cc508cb23960569a057740
Alex Klyubin [Fri, 22 Jan 2016 04:07:45 +0000 (04:07 +0000)]
Merge "Make signapk sign using APK Signature Scheme v2."
Tao Bao [Fri, 22 Jan 2016 01:28:30 +0000 (01:28 +0000)]
Merge "CleanSpec: Clean up $(PRODUCT_OUT)/recovery/root/sdcard."