b795dfe23a
Include classes.jar with class files in aar. am: 8419b7f
...
am: edb0724
2016-04-12 23:03:47 +00:00
edb07245a6
Include classes.jar with class files in aar.
...
am: 8419b7f
2016-04-12 22:49:48 +00:00
6a1dab8817
Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS" am: 5f3b368 am: 02b786c
...
am: 008b9c5
2016-04-12 22:21:33 +00:00
008b9c5624
Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS" am: 5f3b368
...
am: 02b786c
2016-04-12 22:14:48 +00:00
02b786ce2d
Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS"
...
am: 5f3b368
2016-04-12 22:12:07 +00:00
07f1238bf5
resolve merge conflicts of bc3720c to nyc-dev-plus-aosp
...
am: 97069b0
2016-04-12 22:11:49 +00:00
5f3b3689af
Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS"
2016-04-12 21:24:51 +00:00
97069b07c3
resolve merge conflicts of bc3720c to nyc-dev-plus-aosp
...
Change-Id: I2372a61a39131ede33cda95afc3c3ddd19e542f0
2016-04-12 13:06:20 -07:00
8419b7f35e
Include classes.jar with class files in aar.
...
As we switched to Jack the LOCAL_BUILT_MODULE (javalib.jar) now
include .jayce files.
Change-Id: If802e02bb20a9e105ca9563e6fe483f7acce00e6
2016-04-12 12:57:36 -07:00
188a1dd18f
Benchmark have their own folder
...
Benchmark tests use a separate folder from native tests.
Bug: 27465556
Change-Id: Ife0f43062e36ffc856f41683ddc4d91a7787333e
2016-04-12 18:57:36 +01:00
ff1c3f2b05
Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS
...
Listing a library in any of:
LOCAL_EXPORT_SHARED_LIBRARY_HEADERS
LOCAL_EXPORT_STATIC_LIBRARY_HEADERS
will cause the headers exported by that library to be exported from
the current library target as well.
This means that when library A's public headers include headers from
library B, library C which consumes A no longer has to explicitly list
A and B in its LOCAL_SHARED_LIBRARIES for the purpose of picking up B's
headers.
Bug: 27804373
Test: Introduced dependency on libbase to libbinder at the header level.
Libraries that consume libbinder do not need to explicitly depend
on libbase.
Change-Id: If69079f058a4a182c5ef5a3c5ba15035570da22d
2016-04-12 09:27:29 -07:00
40e0890070
Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS" am: 8a547f1 am: c0f254a
...
am: 0a0fd08
2016-04-12 03:12:09 +00:00
0a0fd088c1
Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS" am: 8a547f1
...
am: c0f254a
2016-04-12 03:06:52 +00:00
c0f254a5b9
Merge "Build: Add ART_BOOT_IMAGE_EXTRA_ARGS"
...
am: 8a547f1
2016-04-12 03:01:39 +00:00
907fb03273
Build: Add ART_BOOT_IMAGE_EXTRA_ARGS
...
Allow to modify the boot image compilation. Can be used to easily
dump initialization failures.
Bug: 27265238
Change-Id: I9d54c562a2e623b23b7c1dea9cdbe303786c95dd
2016-04-11 15:10:09 -07:00
758f872836
Merge "Ensure prebuilt executables are executable" into nyc-dev
2016-04-11 19:59:10 +00:00
23f326a67d
Ensure prebuilt executables are executable
...
Use 'chmod +x' to make sure that they're executable, even if the source
file is not.
Bug: 28097475
Change-Id: Id155f6b4ff188f5c909fd6237fd64183af264f79
(cherry picked from commit 08420cbc8a
2016-04-11 11:21:47 -07:00
0535454589
Merge "Update code coverage filtering" am: cb49804 am: e0f8435
...
am: e90a711
2016-04-11 14:50:56 +00:00
e90a711014
Merge "Update code coverage filtering" am: cb49804
...
am: e0f8435
2016-04-11 14:46:20 +00:00
18da8dd97a
Update code coverage filtering
...
Replaces old LOCAL_EMMA_COVERAGE_FILTER by new variables:
- LOCAL_JACK_COVERAGE_INCLUDE_FILTER for included classes
- LOCAL_JACK_COVERAGE_EXCLUDE_FILTER for excluded classes
Both variables can contain a comma-separated list of class names,
where * and ? are accepted wildcard (like foo.?ar.*).
When code coverage is enabled, we will use these variables to
pass code coverage filters on the Jack command-line.
Bug: 28014424
(cherry picked from commit 74ec3f49d1
2016-04-11 16:43:12 +02:00
e0f8435306
Merge "Update code coverage filtering"
...
am: cb49804
2016-04-11 14:41:01 +00:00
cb49804e06
Merge "Update code coverage filtering"
2016-04-11 14:31:35 +00:00
414d988afa
PLATFORM_PREVIEW_SDK_VERSION = 3 for DP3 am: 839ec10
...
am: 1ff4229
2016-04-09 00:34:18 +00:00
1ff4229c1f
PLATFORM_PREVIEW_SDK_VERSION = 3 for DP3
...
am: 839ec10
2016-04-09 00:31:57 +00:00
839ec10bbc
PLATFORM_PREVIEW_SDK_VERSION = 3 for DP3
...
Bug: 27150977
Change-Id: I8f13cec505a73678fb605ee3bce00519d16c2f7e
2016-04-08 14:05:00 -07:00
74ec3f49d1
Update code coverage filtering
...
Replaces old LOCAL_EMMA_COVERAGE_FILTER by new variables:
- LOCAL_JACK_COVERAGE_INCLUDE_FILTER for included classes
- LOCAL_JACK_COVERAGE_EXCLUDE_FILTER for excluded classes
Both variables can contain a comma-separated list of class names,
where * and ? are accepted wildcard (like foo.?ar.*).
When code coverage is enabled, we will use these variables to
pass code coverage filters on the Jack command-line.
Bug: 28014424
Change-Id: Ic29c99b6feb7ea2251c29d659e7ea1f1c46d1ed1
2016-04-08 10:26:49 +02:00
12b39e9043
Merge "Add jack\'s argument files to prerequisites" am: 06dbe19 am: ac61fed
...
am: f842555
2016-04-08 08:17:15 +00:00
f84255570d
Merge "Add jack\'s argument files to prerequisites" am: 06dbe19
...
am: ac61fed
2016-04-08 08:13:04 +00:00
ac61fedf9e
Merge "Add jack\'s argument files to prerequisites"
...
am: 06dbe19
2016-04-08 04:55:11 +00:00
70c0a1edf5
Merge changes I8f95f3f8,Ic2e384ad into nyc-dev am: 4b60ee5
...
am: c76b3ab
2016-04-07 18:45:16 +00:00
c76b3ab7ad
Merge changes I8f95f3f8,Ic2e384ad into nyc-dev
...
am: 4b60ee5
2016-04-07 18:41:48 +00:00
4b60ee5b7b
Merge changes I8f95f3f8,Ic2e384ad into nyc-dev
...
* changes:
Add generation of a module-info.json file
Remove unused module-info.txt generation.
2016-04-07 18:34:43 +00:00
4eaeef8df7
Add jack's argument files to prerequisites
...
Dex files should be updated when jack-default.args or
proguard*.flags are modified.
Bug: 27954979
Change-Id: I72a7084302f4ef92a89a8068f03f790dd7acd582
2016-04-07 18:56:42 +09:00
baa7882c0f
Merge "Add Bison binary and its data to prerequisite" am: 4d69fbf am: 06af80f
...
am: bae8b3f
2016-04-07 03:59:04 +00:00
182f27a527
Merge "Fix dependencies of protoc with nanopb-c plugin" am: 5e2d7f3 am: ae91743
...
am: 3a192c0
2016-04-07 03:59:04 +00:00
bae8b3f2d9
Merge "Add Bison binary and its data to prerequisite" am: 4d69fbf
...
am: 06af80f
2016-04-07 03:56:24 +00:00
3a192c0246
Merge "Fix dependencies of protoc with nanopb-c plugin" am: 5e2d7f3
...
am: ae91743
2016-04-07 03:56:23 +00:00
06af80f6c4
Merge "Add Bison binary and its data to prerequisite"
...
am: 4d69fbf
2016-04-07 03:53:42 +00:00
ae917433aa
Merge "Fix dependencies of protoc with nanopb-c plugin"
...
am: 5e2d7f3
2016-04-07 03:53:41 +00:00
4d69fbf5be
Merge "Add Bison binary and its data to prerequisite"
2016-04-07 03:48:31 +00:00
5e2d7f3204
Merge "Fix dependencies of protoc with nanopb-c plugin"
2016-04-07 03:48:02 +00:00
48bd6f53f4
Add generation of a module-info.json file
...
This outputs all of the modules that the build system knows about
for this invocation.
Change-Id: I8f95f3f8443c18f7898ce90e287432cbd2b6db6d
2016-04-06 19:11:51 -07:00
969b6f8ada
Remove unused module-info.txt generation.
...
Change-Id: Ic2e384ad3e2bae8e76a98818c18a99bf5d427b0e
2016-04-06 14:49:55 -07:00
a3184dc2ae
Fix dependencies of protoc with nanopb-c plugin
...
Bug: 27954979
Change-Id: Ic06b5288b092d8ea5225516069845bfc2ffa9cd1
2016-04-06 13:54:03 +09:00
b708bc5533
Add Bison binary and its data to prerequisite
...
Bug: 27954979
Change-Id: Id68425ef85c07b9bd06d9640f4bf96270af1b893
2016-04-06 13:46:02 +09:00
e1ef29e921
Merge "Remove mips special case." am: a6a6285 am: 7d4c8fe
...
am: 885c4d9
2016-04-05 19:07:27 +00:00
885c4d927d
Merge "Remove mips special case." am: a6a6285
...
am: 7d4c8fe
2016-04-05 19:00:42 +00:00
7d4c8fefec
Merge "Remove mips special case."
...
am: a6a6285
2016-04-05 18:57:31 +00:00
a6a6285686
Merge "Remove mips special case."
2016-04-05 18:51:16 +00:00
acec92938f
Merge "Fix code coverage for apps" am: 2e8a1fc am: 274a5a5
...
am: 25f94a7
2016-04-05 09:30:15 +00:00
Ying Wang