Sami Tolvanen
450f15111c
Merge "build: pass version and patch level to mkbootimg"
...
am: b32d845090
2016-03-08 16:08:14 +00:00
Sami Tolvanen
b32d845090
Merge "build: pass version and patch level to mkbootimg"
2016-03-08 16:02:24 +00:00
Dan Willemsen
90074f7f1f
Merge "Reexport include dirs for whole static libs"
...
am: e2379484ab
2016-03-08 00:16:45 +00:00
Dan Willemsen
e2379484ab
Merge "Reexport include dirs for whole static libs"
2016-03-08 00:14:02 +00:00
Martin Blumenstingl
7b578cbf10
Merge "Removed duplicate definition of E2FSCK"
...
am: d7a4e56a87
2016-03-08 00:05:12 +00:00
Colin Cross
d7a4e56a87
Merge "Removed duplicate definition of E2FSCK"
2016-03-07 23:54:40 +00:00
Elliott Hughes
9c34174b76
Merge "Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark."
...
am: ef0c20621d
2016-03-07 21:22:53 +00:00
Elliott Hughes
ef0c20621d
Merge "Move BUILD_NATIVE_BENCHMARK over to libgoogle-benchmark."
2016-03-07 21:17:45 +00:00
Ying Wang
ad68d904a1
Merge "Fix dumping variables of absolute paths."
...
am: dd70b91060
2016-03-07 20:04:13 +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: 880c9ffe7a86e6b7ed51
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
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
Dan Albert
1bbd4dac85
Merge "Get gtest includes from the exported headers."
...
am: f8b170dc52
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
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
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
Ying Wang
be81620114
Merge "Speed up lunch/tapas/etc. shell utility functions."
...
am: d3c08f8b76
2016-03-04 19:06:53 +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
2016-03-04 18:54:25 +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
Neil Fuller
55d4ec523e
Merge "Add JarJar support to BUILD_HOST_JAVA_LIBRARY"
...
am: b97ce3bb61
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
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
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
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
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
2016-03-02 19:21:12 +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
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
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
Dan Willemsen
60899eddd7
Tell soong about MALLOC_SVELTE
...
Change-Id: I50ce6c0767db8963a7a633bdb349db1c96427cd8
2016-03-01 21:00:26 -08:00
Dan Willemsen
cdaf748e3a
Merge changes I12810c1b,I62287a80,Ied96fdc3
...
am: a65b01fc09
2016-03-01 23:19:33 +00:00
Dan Willemsen
a65b01fc09
Merge changes I12810c1b,I62287a80,Ied96fdc3
...
* changes:
Remove LOCAL_ACP_UNAVAILABLE
Remove unused dependencies on $(ACP)
Replace some uses of acp with cp
2016-03-01 23:18:27 +00:00
Ari Hausman-Cohen
1d59db0794
Merge "Adding a brillo_tests task."
...
am: 3bbaa8a8ff
2016-03-01 22:45:24 +00:00
Ari Hausman-Cohen
3bbaa8a8ff
Merge "Adding a brillo_tests task."
2016-03-01 22:38:07 +00:00
Dan Willemsen
479311bc7c
Remove LOCAL_ACP_UNAVAILABLE
...
Now that copy-file-to-target doesn't use acp, nothing in the acp build
path uses acp, so we don't need to special case it to prevent loops.
Change-Id: I12810c1b064d0c03135a80077a76bc4c9cc18b24
2016-03-01 13:16:53 -08:00
