Commit Graph

26672 Commits

Author SHA1 Message Date
Ying Wang ad68d904a1 Merge "Fix dumping variables of absolute paths."
am: dd70b91060

* commit 'dd70b9106079f39738c129c6f874576748f92d3e':
  Fix dumping variables of absolute paths.
2016-03-07 20:04:13 +00:00
Ying Wang dd70b91060 Merge "Fix dumping variables of absolute paths." 2016-03-07 19:58:14 +00:00
Sami Tolvanen 8fb47f191f build: pass version and patch level to mkbootimg
Add --os_version and --os_patch_level arguments to mkbootimg.

Needs matching changes from
  I57682611e0c27fec5ed284da7d9a788383ff98b1

Bug: 27498078
Bug: 22914603
Change-Id: I04e20b0de40d864aac92ac7bcf466a6cbde3d0e4
2016-03-07 11:55:22 -08:00
Ying Wang 80ceadc945 Fix dumping variables of absolute paths.
Calling $(abspath) is better than checking and prepending $(PWD) if
necessary.

Bug: 27429759
Change-Id: Ia156f8a5d6b88b6090f4d23c7f9166bd62d3ab70
2016-03-07 11:30:35 -08:00
Martin Blumenstingl 764f9339f1 Removed duplicate definition of E2FSCK
Change-Id: I810711ad05e198ee1f9606c37649e80df7b55fa5
2016-03-06 22:38:19 +01:00
Ying Wang 87545466a8 Merge "Delete relics left behind by commit 86e6b7ed51 ."
am: 880c9ffe7a

* commit '880c9ffe7a47c163f986f7bc02963bbde1c83c0f':
  Delete relics left behind by commit 86e6b7ed51 .
2016-03-05 00:32:27 +00:00
Ying Wang 880c9ffe7a Merge "Delete relics left behind by commit 86e6b7ed51 ." 2016-03-05 00:29:00 +00:00
Ying Wang 2fdafd2596 Delete relics left behind by commit 86e6b7ed51 .
Change-Id: I81febc28f471727fc37335b11e47749753a57997
(cherry-pick from commit 0f59fdf30d)
2016-03-04 16:28:01 -08:00
Dan Willemsen 14950e0db7 Merge "Tell soong about MALLOC_SVELTE"
am: fd2691c35f

* commit 'fd2691c35f6e0c7b5339befa8afefaebdfb72283':
  Tell soong about MALLOC_SVELTE
2016-03-04 23:55:48 +00:00
Dan Willemsen fd2691c35f Merge "Tell soong about MALLOC_SVELTE" 2016-03-04 23:53:36 +00:00
Tao Bao dca2200c8a releasetools: Fix the bug in AssertSequenceGood.
We use a bitset for blocks in the target image to assert a block hasn't
been touched before reading. Skip checking the blocks that are in the
source image only.

Change-Id: I3a77292da673c813bd20d8dc177ff36419d8ecae
2016-03-04 15:26:26 -08:00
Stephen Hines c503d8ef58 Switch to clang-2658975.
Bug: http://b/27482631

This fixes an issue where krait compiles were not passing the proper
flags to the assembler when -no-integrated-as is used. This was
preventing ART from switching to clang in some cases.

Change-Id: I24966bf1ff84305df3586ab01d1aae7d5922aa11
2016-03-04 14:40:56 -08:00
Dan Albert 1bbd4dac85 Merge "Get gtest includes from the exported headers."
am: f8b170dc52

* commit 'f8b170dc52575f16a63bfd6b6710efb46580c8b2':
  Get gtest includes from the exported headers.
2016-03-04 22:34:39 +00:00
Dan Albert f8b170dc52 Merge "Get gtest includes from the exported headers." 2016-03-04 22:30:58 +00:00
Ying Wang 058ebbc1cc Merge "Small fixes."
am: dfa0d1063a

* commit 'dfa0d1063a8b07c22d79116be799ffda537211e8':
  Small fixes.
2016-03-04 22:10:23 +00:00
Ying Wang dfa0d1063a Merge "Small fixes." 2016-03-04 21:58:08 +00:00
Ying Wang f0cb397a9e Small fixes.
Change-Id: Ia949ed0bc93edb78d0b029f3bd3dd584e9a00dc8
2016-03-04 13:56:23 -08:00
Elliott Hughes 577f8407e9 Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark.
Bug: http://b/24803663
Change-Id: I1565cf680298a1765e88162d8b0e59dedba29bd7
2016-03-04 13:37:43 -08:00
Dan Willemsen 851983bbf2 Merge "Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S"
am: 6d813d8c92

* commit '6d813d8c9223ba6e55e98f23a8a8c2248466feff':
  Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S
2016-03-04 20:59:24 +00:00
Dan Willemsen 6d813d8c92 Merge "Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S" 2016-03-04 20:52:57 +00:00
Dan Willemsen a7808accf4 Reexport include dirs for whole static libs
When a static library uses LOCAL_EXPORT_C_INCLUDE_DIRS, then is included
entirely in another library with LOCAL_WHOLE_STATIC_LIBRARIES, all the
symbols are reexported, so reexport the headers too.

Change-Id: I92cf17894fc991a5b5ecb59ca5e095e407c98de4
2016-03-04 12:47:37 -08:00
Tao Bao aa82bd62cb Merge "releasetools: Fix one missing case for --oem_no_mount."
am: 4e677900f7

* commit '4e677900f7b0017fcd926dc66d778e355e6a1bae':
  releasetools: Fix one missing case for --oem_no_mount.
2016-03-04 19:30:01 +00:00
Tao Bao 4e677900f7 Merge "releasetools: Fix one missing case for --oem_no_mount." 2016-03-04 19:20:15 +00:00
Ying Wang be81620114 Merge "Speed up lunch/tapas/etc. shell utility functions."
am: d3c08f8b76

* commit 'd3c08f8b763c1d8f865896cf7d03d1794bdd14fe':
  Speed up lunch/tapas/etc. shell utility functions.
2016-03-04 19:06:53 +00:00
Ying Wang d3c08f8b76 Merge "Speed up lunch/tapas/etc. shell utility functions." 2016-03-04 19:03:56 +00:00
Ying Wang 08800fd905 Speed up lunch/tapas/etc. shell utility functions.
1. Combined ~10 calls to the make build system to only one.
   We added a phony target "dump-many-vars" to the build system to dump
   "<var>=<value>" pairs. We then store the pairs as shell variables.
   With this cache get_build_var/get_abs_build_var can just return
   the shell variables instead of querying the build system.
2. Prune .git when we search for AndroidProduct.mks.

In internal source tree lunch time was reduced from ~15s to ~1.5s.

Bug: 27429759
Change-Id: I24e88598f6fab598ef26518885fd5e86e71a772d
2016-03-04 11:01:57 -08:00
Ying Wang 9f68962c47 Merge "Align up java-lib-files and java-lib-deps."
am: 58b8c86f84

* commit '58b8c86f84ad0bf8fb3bb7dfc259fd1e3ce0dae1':
  Align up java-lib-files and java-lib-deps.
2016-03-04 18:54:25 +00:00
Ying Wang 58b8c86f84 Merge "Align up java-lib-files and java-lib-deps." 2016-03-04 18:40:05 +00:00
Ying Wang ea04f821fc Align up java-lib-files and java-lib-deps.
- For host Java libraries, java-lib-files should return javalib.jar.
- Host dalvik Java libraries are special: factor out
  host-dex-java-lib-files.
- Be explict that jack-lib-deps equals jack-lib-files.

Bug: 27451686
Change-Id: I9235384354e119ef7ebbf29b7e525d1ceea242e0
(cherry-pick from commit 063d0455e0)
2016-03-04 10:39:24 -08:00
Tao Bao 1bb5a18918 releasetools: Fix one missing case for --oem_no_mount.
The CL in [1] added support for --oem_no_mount. It missed one place that
guards the OEM mounting.

[1] commit 8608cde944

Change-Id: I6ecaa94cd0866e0fd4fc88cb0aa3ebf55cde2968
2016-03-04 09:45:39 -08:00
Neil Fuller 55d4ec523e Merge "Add JarJar support to BUILD_HOST_JAVA_LIBRARY"
am: b97ce3bb61

* commit 'b97ce3bb613c1ea18c9aea42e829ac34039b7679':
  Add JarJar support to BUILD_HOST_JAVA_LIBRARY
2016-03-04 13:09:22 +00:00
Neil Fuller b97ce3bb61 Merge "Add JarJar support to BUILD_HOST_JAVA_LIBRARY" 2016-03-04 12:58:45 +00:00
Neil Fuller 432bdaa2f7 Add JarJar support to BUILD_HOST_JAVA_LIBRARY
This will allow us to convert icu4j-icudata / icu4j-icutzdata
targets to "host" targets rather than "target" targets.
Right now they are forcing Jack off just so they can use
javac + jarjar (even though the resulting file is used on
host).

Bug: 27218410
(cherry picked from commit 30b21ad579)

Change-Id: I4f16896606bcfdd00164078eeb142d05b29bb832
2016-03-04 12:02:40 +00:00
Dan Willemsen df9acac680 Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S
Target assembly files do not get these cflags, align the host
definitions to do the same.

Change-Id: Idadfa1f367c3ebea44460c5798225a85dd319371
2016-03-03 17:38:16 -08:00
Yabin Cui a72e7dbd9c Merge "Enable LOCAL_POST_LINK_CMD for non-static executables."
am: 1f310530fc

* commit '1f310530fcd3c15b0d5d2b067d1ad320bc4faef2':
  Enable LOCAL_POST_LINK_CMD for non-static executables.
2016-03-03 19:02:56 +00:00
Yabin Cui 1f310530fc Merge "Enable LOCAL_POST_LINK_CMD for non-static executables." 2016-03-03 18:59:38 +00:00
Shinichiro Hamaji 4037c4225a Use KATI_DEPFILE for .P associated with object files
Also specify "-d keepdepfile" to ninja so .P files won't be
deleted by ninja.

-include for .s files are removed because GCC doesn't
generate .d files for .s files.

Bug: 26839129
Change-Id: If00e93c7a33449ec314a5cdba438475a32979f4e
2016-03-03 18:19:37 +09:00
Yabin Cui 273e9109c1 Enable LOCAL_POST_LINK_CMD for non-static executables.
It is needed to insert testdata section into simpleperf cts test.

Bug: 27387280
Change-Id: I58cea106d135f535626d8624a016bd2aaceeb8ea
2016-03-02 17:04:11 -08:00
Dan Albert e5ecdc967d Get gtest includes from the exported headers.
Change-Id: I47db781a36318664fabff8a5e75031c6bee674e4
2016-03-02 13:05:46 -08:00
Ying Wang 6aa24e6301 Merge "Clean generated source dir if .proto/.rs is gonee."
am: 591fa1284a

* commit '591fa1284aa29ec8b2ff8917ce86f81c5b14ad0a':
  Clean generated source dir if .proto/.rs is gonee.
2016-03-02 19:21:23 +00:00
Ying Wang 96d79c5366 Merge "Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS"
am: de9e5d40ef

* commit 'de9e5d40ef8d9433ad22bb41fa428c7cec5e1549':
  Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS
2016-03-02 19:21:12 +00:00
Ying Wang 591fa1284a Merge "Clean generated source dir if .proto/.rs is gonee." 2016-03-02 19:01:28 +00:00
Ying Wang de9e5d40ef Merge "Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS" 2016-03-02 19:01:24 +00:00
Ying Wang ce7ea68394 Clean generated source dir if .proto/.rs is gonee.
Similar to how we clean the generated source dir if .aidl becomes
obsolete.

Bug: 26688474
Change-Id: I66c5b6d6513259b5f4f4bac84f384f4bf953d82a
(cherry-pick from commit d5ffec9383)
2016-03-02 10:59:59 -08:00
Ying Wang 6efe88ba95 Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS
So that we can disable only one in multilib modules.

Bug: 27442756
Change-Id: I4ca379fac997f9165c47cb93d34bf1f483f5a241
(cherry-pick from commit b6eb8ddbde)
2016-03-02 10:59:23 -08:00
Dan Willemsen e39455faa2 Merge "Ensure prebuilt executables are executable"
am: c92dc59c86

* commit 'c92dc59c86f09526735625c605b8e7ded1070e90':
  Ensure prebuilt executables are executable
2016-03-02 18:25:58 +00:00
Dan Willemsen c92dc59c86 Merge "Ensure prebuilt executables are executable" 2016-03-02 18:12:07 +00:00
Yohann Roussel 4fd0463191 Merge "Use Jack to check build"
am: 6a9d0f9718

* commit '6a9d0f9718f127475d702ae6831a2bec3be976b6':
  Use Jack to check build
2016-03-02 09:04:20 +00:00
Yohann Roussel 6a9d0f9718 Merge "Use Jack to check build" 2016-03-02 08:46:24 +00:00
Dan Willemsen 08420cbc8a Ensure prebuilt executables are executable
Use 'chmod +x' to make sure that they're executable, even if the source
file is not.

Change-Id: Id155f6b4ff188f5c909fd6237fd64183af264f79
2016-03-01 22:11:41 -08:00