Commit Graph

26711 Commits

Author SHA1 Message Date
Dan Willemsen ca4b755563 Merge "Warn more clearly when there are duplicate copied headers" 2016-02-23 23:46:25 +00:00
Colin Cross a65f1aee84 Make multiple rules to generate a file an error
Pass -w dupbuild=err to ninja to make defining multiple rules to build a
file an error instead of a warning.  Proceeding with the build would
result in undefined behavior, and nobody notices the warning.

Change-Id: Iadac88f8835121a8685bff835acba638100bb654
2016-02-23 15:40:11 -08:00
Dan Willemsen 6f60f020d7 Warn more clearly when there are duplicate copied headers
When more than one makefile tries to copy a header to the same
destination, the warning is not clear, and hard to track down and assign
blame:

build/core/copy_headers.mk:15: warning: ignoring old commands for target `out/target/product/bullhead/obj/include/qcom/display/copybit.h'

With this change, the same behavior is kept, but the warning message is
more descriptive, and contains the offending Android.mk files:

build/core/Makefile:54: Duplicate header copy: out/target/product/bullhead/obj/include/qcom/display/copybit.h
build/core/Makefile:54: Defined in: hardware/qcom/display/msm8994/libcopybit/Android.mk hardware/qcom/display/msm8994/libcopybit/Android.mk

In this case, a $(CLEAR_VARS) is missing, so the same Android.mk file is
copying the same headers twice.

Bug: 27302058
Change-Id: Icf8f580ae71a78741db21c1d8f3213424459e637
2016-02-23 13:40:07 -08:00
Ying Wang e087824722 Merge "Make sure my_src_jar is set up properly for host prebuilt jar"
am: de4078449f

* commit 'de4078449fd9764d1a63469d6efb0d90b9265ff9':
  Make sure my_src_jar is set up properly for host prebuilt jar
2016-02-23 18:09:22 +00:00
Ying Wang de4078449f Merge "Make sure my_src_jar is set up properly for host prebuilt jar" 2016-02-23 18:06:01 +00:00
Calin Juravle 3d0d0aebba Merge "Add profman to the build scripts"
am: 487479f301

* commit '487479f301e49e8955d0930c760b739507f76ddc':
  Add profman to the build scripts
2016-02-23 14:11:56 +00:00
Calin Juravle 487479f301 Merge "Add profman to the build scripts" 2016-02-23 14:07:40 +00:00
Calin Juravle c9e3d16fdb Add profman to the build scripts
Bug: 26719109
Bug: 26563023

(cherry picked from commit aab43390a0)

Change-Id: Idc49872eebb283436fcdd02fe095e8c8826aff44
2016-02-23 12:02:05 +00:00
Ying Wang 86e74b96fc Make sure my_src_jar is set up properly for host prebuilt jar
Make sure my_src_jar is set up properly for host prebuilt jar when we
need to generate host .jack for host dalvik java libraries.

Change-Id: If85e27147cdc6e6a7a154c1cf308f9d0a71ff068
2016-02-22 16:17:36 -08:00
Elliott Hughes 466a220aed Merge "clang now supports -fdebug-prefix-map=."
am: 622179a175

* commit '622179a17501448a87cfec3a9bc21ea0398cb873':
  clang now supports -fdebug-prefix-map=.
2016-02-20 00:34:07 +00:00
Elliott Hughes 622179a175 Merge "clang now supports -fdebug-prefix-map=." 2016-02-20 00:27:25 +00:00
Elliott Hughes eb295fccb4 clang now supports -fdebug-prefix-map=.
Change-Id: Id0569831f09845871d8e6990c310516bea5a2510
2016-02-19 13:34:57 -08:00
Bill Yi 4a459aee75 Merge commit '75bbddecaa9f9d82c2f2751b389188f0a41e3284' into HEAD 2016-02-17 09:50:15 -08:00
Alex Klyubin d131a5a813 Merge "Switch to production constant for v2 signing scheme ID." 2016-02-17 16:41:14 +00:00
Yohann Roussel 3a30ab182f Merge "Add support for testing obfuscated app with Jack" 2016-02-17 16:05:18 +00:00
Yohann Roussel 505dafb03b Add support for testing obfuscated app with Jack
Bug: 17481317

Change-Id: I80cb4e3991e858a39e7415fb7f1896d6992c950f
2016-02-17 16:01:58 +00:00
Alex Deymo 1bd78f399f Merge "Include Brillo's cannonical .clang-format file." 2016-02-16 22:32:06 +00:00
Alex Deymo 665110e38c Include Brillo's cannonical .clang-format file.
Many Brillo repositories need to share a common .clang-format file to
ensure the same formatting rules. This patch moves the .clang-format
file already in system/core/metricsd to a common location to be shared
by other Brillo repositories.

Bug: 27121653
TEST=symlink from system/update_engine, ran clang-format.

Change-Id: Ie04a5a9cf54b9cc24f180fe3896501db4d883a64
2016-02-16 14:29:45 -08:00
Sami Tolvanen 3e0fdfba85 Merge "Clear logd intermediates" 2016-02-16 21:52:13 +00:00
Dan Willemsen 69a4592aa5 Merge "Define a class for renderscript bitcode files" 2016-02-16 21:23:36 +00:00
Colin Cross 03f0a03857 Merge "makeparallel: unset MAKEFLAGS and MAKELEVEL" 2016-02-16 21:08:59 +00:00
Alex Klyubin 97dd58a071 Switch to production constant for v2 signing scheme ID.
Bug: 25794543
Change-Id: I0e06f31ea3117c6865d18f853f99304964b323b4
2016-02-16 12:42:37 -08:00
Neil Fuller fa23072e8d Merge "Add new package: java.util.function" 2016-02-16 13:15:29 +00:00
Neil Fuller c155d7d1aa Add new package: java.util.function
Bug: 26814204
(cherry-picked from commit 9429a880a3)

Change-Id: Ibd4f7a985ddcdb7564a79326ce846257882e294f
2016-02-16 11:49:14 +00:00
Dan Willemsen c6e194ffad Define a class for renderscript bitcode files
These have been using SHARED_LIBRARIES, but aren't elf shared libraries.
Continue installing them to /system/lib[64], but do not apply any other
normal shared library logic to them.

Change-Id: I3055ff86bb7b116c7107c41578ed6f0f304b1cf1
2016-02-13 00:19:40 -08:00
Dan Willemsen 0a0b9d7bb8 Merge "Remove debug statement" 2016-02-12 23:41:37 +00:00
Chih-hung Hsieh 82953d72ac Merge "Use newest clang static analyzers." 2016-02-12 17:33:40 +00:00
Chih-Hung Hsieh 765c1ea6d7 Use newest clang static analyzers.
* When WITH_STATIC_ANALYZER is set and non-zero, and clang compiler is used,
  call new clang ccc-analyzer or c++-analyzer.
* Otherwise, if WITH_SYNTAX_CHECK is set and non-zero,
  call compiler with -fsyntax-only.
* Replace "--sysroot=path" with "--sysroot path", to work with ccc-analyzer.
* ccc-analyzer executes the original compilation command to generate
  object files before calling clang with --analyze to do static analysis.
* When clang is called with --analyze, macro __clang_analyzer__ is defined.

BUG: 13287788

Change-Id: I5edb25b52998d871385dd000778db2ce83224078
2016-02-11 16:43:51 -08:00
Dan Willemsen 0f745aaf4d Merge "fs_config: error on multiple specifications of android_filesystem_config.h" 2016-02-11 21:01:18 +00:00
Tao Bao 8b56d4ad55 Merge "Makefile: Add the missing library in otatools.zip." 2016-02-11 18:51:04 +00:00
Tao Bao 3124af3028 Makefile: Add the missing library in otatools.zip.
With the change in [1], delta_generator now needs
libprotobuf-cpp-lite.so instead of libprotobuf-cpp-lite-rtti.so to
generate A/B payloads.

[1] commit ab5bd668f6be600a8cceb8772e426c0aa902a5e1

Bug: 27145830
Change-Id: Ib9a93bf0fbe7fa44fc5fb94668d17fa1a2e07b05
(cherry picked from commit fdd2693b65)
2016-02-11 10:50:05 -08:00
William Roberts 78626c480a fs_config: error on multiple specifications of android_filesystem_config.h
Multiple files added to TARGET_ANDROID_FILESYSTEM_CONFIG_H will build,
however the tooling will only respect the first header found. The
sanity check in the makefile will only check the first path found for
proper naming convention. One can end up with a successful build that
does not respect all files in the TARGET_ANDROID_FILESYSTEM_CONFIG_H.

Check that one and only one item is set to
TARGET_ANDROID_FILESYSTEM_CONFIG_H variable.

Output:
*** Multiple fs_config files specified, see "device/lge/bullhead/two/android_filesystem_config.h device/lge/bullhead/one/android_filesystem_config.h"..

Change-Id: I70a43f44713b273cb9a78f54ff16854b9e11af4a
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-02-11 10:47:06 -08:00
Sebastien Hertz 91d20b06f5 Merge "Remove usages of jill.jar, use jack instead" 2016-02-11 08:48:44 +00:00
Sami Tolvanen d7da0ffb20 Clear logd intermediates
Needed by changes from
  Idcdc5bff133f13c1267f0ec0a75cc8cf1ddbda0d

Bug: 26902605
Change-Id: Id3ca7889ede30b54b7af73dd50653ca1a20d59aa
2016-02-10 15:41:03 -08:00
Dan Willemsen dbf0792279 Remove debug statement
Change-Id: Ic8b6082a61e2fb1b09b2b254312d3dc7ef59d987
2016-02-10 14:40:08 -08:00
Alex Klyubin 07d3dbd2ed Merge "Sign APKs using SHA-256 instead of SHA-1 when possible." 2016-02-10 21:35:06 +00:00
Sami Tolvanen 7855c9aadf Merge "Fix metadata location when file system doesn't span the partition" 2016-02-10 18:50:17 +00:00
Dan Willemsen a9556b33ff Merge "Tell Soong about HOST_CROSS_*" 2016-02-10 18:13:22 +00:00
Alex Klyubin 2cfd1d108c 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 c2c49ed0c1).

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
2016-02-10 09:40:31 -08:00
Sami Tolvanen 6a8781a251 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
2016-02-10 09:37:59 -08:00
Yohann Roussel ccfa5c6761 Remove usages of jill.jar, use jack instead
Bug: 27113650
(cherry picked from commit d0bb7bdf5a)

Change-Id: Ie9be0d5c7e43ea857411431bb79db5cbb476484f
2016-02-10 18:07:15 +01:00
Tao Bao 8290ba9e0d Merge "releasetools: Add two new entries to metadata." 2016-02-10 17:05:47 +00:00
Doug Zongker ae91d54e89 Merge "improve performance of blockimgdiff" 2016-02-10 16:52:10 +00:00
Doug Zongker 2d2dd1526d 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
2016-02-10 07:44:21 -08:00
Alex Klyubin f8a36a90c8 Merge "Use Jan 1 2009 as timestamp in OTA update ZIPs." 2016-02-10 01:08:12 +00:00
Dan Willemsen d6e3b84185 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
2016-02-09 16:00:14 -08:00
Neil Fuller dcd446e1e9 Merge "Allow java targets to support 1.8 source / target" 2016-02-09 23:01:40 +00:00
Alex Klyubin f735851fa9 Use Jan 1 2009 as timestamp in OTA update ZIPs.
This is a follow-up to 6c41036bcf where
I forgot to update a section of OTA update ZIP code.

Bug: 26864066
Change-Id: Idbcde71d6377a16807e41c999120eeddd5b4d8a4
2016-02-09 13:09:57 -08:00
Dan Willemsen 8c4f25f12f Merge "Add 64-bit windows cross-compiles" 2016-02-09 20:54:10 +00:00
Dan Willemsen 74606c40cd Merge "Disable java when JAVA_NOT_REQUIRED is set" 2016-02-09 05:21:39 +00:00