Commit Graph

10777 Commits

Author SHA1 Message Date
Ying Wang
7dfdb843b2 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

(cherry picked from commit 08800fd905)

Change-Id: I862a0ec3c1aae97c552054dacec133e857042edf
2016-03-04 14:02:03 -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
8b90565476 Merge "Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S" am: 6d813d8c92
am: 851983bbf2

* commit '851983bbf2dc9cf2ea5877d6e95a9d962bd63fdd':
  Do not apply GLOBAL_CFLAGS_NO_OVERRIDE to host *.S
2016-03-04 21:02:05 +00: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
Ying Wang
07a0015887 Merge "Speed up lunch/tapas/etc. shell utility functions." am: d3c08f8b76
am: be81620114

* commit 'be81620114432ae4de5bffd494af0dfaab3899fe':
  Speed up lunch/tapas/etc. shell utility functions.
2016-03-04 19:08:52 +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
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
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
Ying Wang
fef4f411d9 Align up java-lib-files and java-lib-deps.
am: 063d0455e0

* commit '063d0455e0f3a14f2577a26715f82e0bf3e79ee9':
  Align up java-lib-files and java-lib-deps.
2016-03-04 17:30:59 +00: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
Ying Wang
063d0455e0 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
2016-03-03 13:48:43 -08:00
Mohamad Ayyash
f876555893 Hook incremental ext4 image generation into build
Allows passing the *.base_fs or *.map files for system and vendor in
INTERNAL_SYSTEM_BASE_FS_PATH and INTERNAL_VENDOR_BASE_FS_PATH variables
respectively.

Internal Design Doc: go/incremental-ext4
BUG: 26839493
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>

Change-Id: Ie57ef6dbfa6084268b6535fe0a673a3b4aaa6e2f
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2016-03-03 12:07:21 -08:00
Yabin Cui
d0ea677d87 Merge "Enable LOCAL_POST_LINK_CMD for non-static executables." am: 1f310530fc
am: a72e7dbd9c

* commit 'a72e7dbd9c44a0531ab0347c6f87c3f207c57907':
  Enable LOCAL_POST_LINK_CMD for non-static executables.
2016-03-03 19:42:54 +00: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
Ying Wang
6774f8b232 Merge "Add --auto-add-overlay if a module has LOCAL_STATIC_ANDROID_LIBRARIES" into nyc-dev
am: aad03eceed

* commit 'aad03eceed3ee20b619a824e1c5f61a07cfacb72':
  Add --auto-add-overlay if a module has LOCAL_STATIC_ANDROID_LIBRARIES
2016-03-03 18:11:51 +00:00
Ying Wang
aad03eceed Merge "Add --auto-add-overlay if a module has LOCAL_STATIC_ANDROID_LIBRARIES" into nyc-dev 2016-03-03 18:09:31 +00:00
Ying Wang
1935d6ba53 Merge "[DO NOT MERGE] Update BUILD_ID for nyc branches." into nyc-dev
am: b7b38d4d5d

* commit 'b7b38d4d5d5734be6dabd47278cc45304ffbb788':
  [DO NOT MERGE] Update BUILD_ID for nyc branches.
2016-03-03 17:41:58 +00:00
Ying Wang
b7b38d4d5d Merge "[DO NOT MERGE] Update BUILD_ID for nyc branches." into nyc-dev 2016-03-03 17:34:59 +00:00
Neil Fuller
d36f2ac01b resolve merge conflicts of 79586ad032 to nyc-dev-plus-aosp
Change-Id: I7e9f58ec4f0c6ade9a88df9281c8c40d19fd332b
2016-03-03 09:33:59 +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
Neil Fuller
79586ad032 Merge "Add JarJar support to BUILD_HOST_JAVA_LIBRARY" into nyc-dev 2016-03-03 09:11:09 +00:00
Yohann Roussel
1501a9a8b5 Merge "Use Jack to check build" into nyc-dev 2016-03-03 08:47:41 +00:00
Dan Willemsen
4fd64d06cb Add LOCAL_CTS_GTEST_LIST_EXECUTABLE
Change-Id: I9bca66d0e0ef25264b6576d907fa57997e62e8c1
2016-03-02 21:24:04 -08:00
Ying Wang
75e962a87e Add --auto-add-overlay if a module has LOCAL_STATIC_ANDROID_LIBRARIES
Bug: 25958912
Change-Id: Iafba9eefde0823095775474bcb7cc5b6c21fd248
2016-03-02 18:55:46 -08:00
Ying Wang
f5fedfa8e4 [DO NOT MERGE] Update BUILD_ID for nyc branches.
Bug: 27327323
Change-Id: I60985c66a41cbece69f0a19c19bde7695b2ca48e
2016-03-02 18:18:07 -08:00
Ying Wang
9802ee73c5 Merge "Calls aapt2 when a static Java library has LOCAL_STATIC_ANDROID_LIBRARIES" into nyc-dev
am: 2a7af11a2c

* commit '2a7af11a2ca43768814c846cc05eec061d12e960':
  Calls aapt2 when a static Java library has LOCAL_STATIC_ANDROID_LIBRARIES
2016-03-03 01:11:11 +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
Ying Wang
2a7af11a2c Merge "Calls aapt2 when a static Java library has LOCAL_STATIC_ANDROID_LIBRARIES" into nyc-dev 2016-03-03 00:55:24 +00: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
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
dfd5488944 Merge "Ensure prebuilt executables are executable" am: c92dc59c86
am: e39455faa2

* commit 'e39455faa2d20de8bcfd370e7470405bf707687b':
  Ensure prebuilt executables are executable
2016-03-02 18:38:33 +00: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
Ying Wang
489af869c7 Merge "Clean generated source dir if .proto/.rs is gonee." into nyc-dev
am: bfffd93a02

* commit 'bfffd93a02fed91e98373524677c98482adba893':
  Clean generated source dir if .proto/.rs is gonee.
2016-03-02 18:24:05 +00:00
Ying Wang
bfffd93a02 Merge "Clean generated source dir if .proto/.rs is gonee." into nyc-dev 2016-03-02 18:19:26 +00:00
Ying Wang
4db56bb9ed Merge "Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS" into nyc-dev
am: 0302dc1301

* commit '0302dc130167b0fbc262d76bfb73f6aa35e13494':
  Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS
2016-03-02 18:14:47 +00:00
Dan Willemsen
c92dc59c86 Merge "Ensure prebuilt executables are executable" 2016-03-02 18:12:07 +00:00
Ying Wang
0302dc1301 Merge "Support arch specific variants of LOCAL_STRIP_MODULE/LOCAL_PACK_MODULE_RELOCATIONS" into nyc-dev 2016-03-02 18:03:30 +00:00
Stuart Scott
b1ddbc19a5 Add cts_v2 phony target for temporary build fix.
am: cc52da8dae

* commit 'cc52da8dae3b913d8b405fa53de047589f072bde':
  Add cts_v2 phony target for temporary build fix.
2016-03-02 17:34:01 +00:00
Stuart Scott
cc52da8dae Add cts_v2 phony target for temporary build fix.
Change-Id: I770dc800dbcdff2c31e370410b32e2ee079f308b
2016-03-02 08:42:41 -08:00
Neil Fuller
30b21ad579 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
Change-Id: I7062c698389d98b0dde5690280a9140c3b12cbf7
2016-03-02 11:19:41 +00:00