Chih-Hung Hsieh
6014381896
Merge "Add tidy.mk to set up global default checks."
...
am: 214c7fa
2016-04-26 01:48:11 +00:00
Igor Murashkin
5dbe905ab9
Merge "old-cts: Add testng and libcoreoj test support" into nyc-dev
...
am: 1cb8adb
2016-04-25 23:46:44 +00:00
Igor Murashkin
1cb8adb1fa
Merge "old-cts: Add testng and libcoreoj test support" into nyc-dev
2016-04-25 23:39:16 +00:00
Mohamad Ayyash
1868a601b7
Rename incr ext4 base_fs path vars. Add to product_var_list.
...
BUG: 27698960
Change-Id: I4624f782846ee54525d0ac29b866a04c0d67aa40
Signed-off-by: Mohamad Ayyash <mkayyash@google.com >
2016-04-25 15:47:42 -07:00
Keun Soo Yim
46a259651f
resolve merge conflicts of 72b82dc to nyc-dev-plus-aosp
...
Change-Id: I6e62226774584154ad1a802594e386fe7942504b
2016-04-25 15:27:21 -07:00
Keun Soo Yim
3d4847525f
build rule change for VTS (vendor test suite)'s metadata files
...
Change-Id: I76b81529a97b672e08632703d2f6a2777ee8811e
2016-04-25 13:06:57 -07:00
Chih-Hung Hsieh
460171a3e4
Add tidy.mk to set up global default checks.
...
* Default checks include only google* minus google-readability*.
* Some google-* checks are disabled for external projects.
* Each project can add more or disable checks through LOCAL_TIDY_CHECKS.
Bug: http://b/27779618
Change-Id: I83eed73bd2bddaace565a6dde532fb2036b4fac4
2016-04-25 12:17:03 -07:00
Baligh Uddin
69cf5dfc4d
DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
...
Bug: 23967152
2016-04-24 12:40:03 -07:00
Dan Albert
e58300cc30
Merge "Switch mips64 back to NDK r10." am: 9ecf544
...
am: f77eb12
2016-04-22 21:32:48 +00:00
Nikola Veljkovic
f77eb12f02
Merge "Switch mips64 back to NDK r10."
...
am: 9ecf544
2016-04-22 21:30:07 +00:00
Nikola Veljkovic
f738562316
Switch mips64 back to NDK r10.
...
The NDK doesn't support mips32r6, and the update of prebuilts/ndk to
r11 doesn't have the hack that r10 did. Revert back to r10, until we
decide on a more appropriate solution.
Change-Id: I7891603d8ccbb20398aad893b62c1debf353ef41
2016-04-22 14:17:00 -07:00
Alex Deymo
5a84381b87
Merge "Update the path to clean_header.py on the documentation." am: 93fdee98a9
...
am: 83285f39ed
2016-04-22 18:21:49 +00:00
Alex Deymo
83285f39ed
Merge "Update the path to clean_header.py on the documentation."
...
am: 93fdee98a9
2016-04-22 18:19:29 +00:00
Treehugger Robot
93fdee98a9
Merge "Update the path to clean_header.py on the documentation."
2016-04-22 18:11:18 +00:00
Alex Deymo
be0e7c9894
Update the path to clean_header.py on the documentation.
...
Bug: None
Change-Id: I8064c67b6066613b51a581ec67476797690418ae
2016-04-22 10:18:15 -07:00
Yohann Roussel
b6232d90da
resolve merge conflicts of 995b62b to nyc-dev-plus-aosp
...
Change-Id: I4293e9f2777fb9b7e2023764703855ff3d778b40
2016-04-22 18:45:45 +02:00
Yohann Roussel
995b62b2d7
Merge changes I6e98fc65,Ia8665e7c
...
am: 5ce149b76a
2016-04-22 15:53:54 +00:00
Yohann Roussel
5ce149b76a
Merge changes I6e98fc65,Ia8665e7c
...
* changes:
Remove bootclasspath handling for Jack
Remove static libraries from Jack classpath
2016-04-22 15:51:50 +00:00
Yohann Roussel
ae2fc81706
Remove bootclasspath handling for Jack
...
Bootclasspath libraries are already added in LOCAL_JAVA_LIBRARIES by
java.mk and host_dalvik_java_library.mk meaning that bootclasspath
handling was just doing a duplicate work and adding duplicated entries
to the classpath.
Also fix order of bootclasspath libraries for host.
Bug: 28307907
Change-Id: I6e98fc651a127435c029de65285dbf2cb04844af
2016-04-22 09:29:32 +02:00
Chih-hung Hsieh
7a8e69eea2
Merge "Call clang-tidy based on WITH_TIDY* variables." am: 3f03b10654
...
am: c72f50d49f
2016-04-21 21:11:00 +00:00
Chih-Hung Hsieh
c72f50d49f
Merge "Call clang-tidy based on WITH_TIDY* variables."
...
am: 3f03b10654
2016-04-21 21:08:17 +00:00
Chih-hung Hsieh
3f03b10654
Merge "Call clang-tidy based on WITH_TIDY* variables."
2016-04-21 21:01:45 +00:00
Chih-Hung Hsieh
a9a55c7c7e
Call clang-tidy based on WITH_TIDY* variables.
...
* Call clang-tidy before every C/C++ compilation if
(1) clang-tidy is found at $(PATH_TO_CLANG_TIDY)
(2) $(my_clang) is true
(3) LOCAL_TIDY is 1 or true, or
LOCAL_TIDY is undefined and WITH_TIDY is 1 or true.
* clang-tidy is called with -checks=$(my_tidy_checks),
which has default '-*,google*,-google-readability*'
and can be overwritten by WITH_TIDY_CHECKS.
* LOCAL_TIDY_CHECKS is appended to $(my_tidy_checks)
* Extra flags are passed to clang-tidy through
WITH_TIDY_FLAGS or LOCAL_TIDY_FLAGS.
* To quickly find and fix clang-tidy warnings, set $(WITH_TIDY_ONLY)
to 1 or true to skip compilation of C/C++ files.
* Add a PHONY tidy_only target,
which includes all $(cpp_objects) and $(c_objects).
* The 'mm' and 'mmm' functions are changed to call make with
the 'tidy_only' target when WITH_TIDY_ONLY is true or 1.
In that case, only clang-tidy is called for C and C++ files.
Bug: http://b/27779618
Change-Id: I8adcfff217d68af49849b79aacee7d7654cafb1b
2016-04-21 12:31:13 -07:00
Yohann Roussel
2dc79b11cd
Remove static libraries from Jack classpath
...
Those libraries are already imported (or added to the classpath in the
case of the check command) meaning that they were all duplicated.
In addition to complicating the build this was also slowing down the
compilation.
Bug: 28307907
Change-Id: Ia8665e7c5ad8b567bd02de7839fa62e67a5668f7
2016-04-21 17:40:55 +02:00
Shinichiro Hamaji
506668bccf
Merge "Add input dependencies to .img targets" am: bd0bab233d
...
am: 8196646d27
2016-04-21 06:17:47 +00:00
Shinichiro Hamaji
8196646d27
Merge "Add input dependencies to .img targets"
...
am: bd0bab233d
2016-04-21 06:15:31 +00:00
Shinichiro Hamaji
bd0bab233d
Merge "Add input dependencies to .img targets"
2016-04-21 06:10:38 +00:00
Shinichiro Hamaji
b279eee2de
Merge "Add normalize_path.py to prerequisites" am: 71211d8a0a
...
am: 99129ec4e3
2016-04-21 05:56:08 +00:00
Shinichiro Hamaji
99129ec4e3
Merge "Add normalize_path.py to prerequisites"
...
am: 71211d8a0a
2016-04-21 05:54:00 +00:00
Shinichiro Hamaji
71211d8a0a
Merge "Add normalize_path.py to prerequisites"
2016-04-21 05:34:06 +00:00
Ying Wang
6c29ca3176
Merge "Allow to build native tests for translation arch only." am: c24740f
...
am: d4e3bb8
2016-04-20 22:34:27 +00:00
Zach Jang
d906ac5b27
Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77 am: d4b8d2b am: 63398dd am: d402579 am: 3f578d2
...
am: b565807
2016-04-20 22:19:25 +00:00
Zach Jang
b5658074c3
Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77 am: d4b8d2b am: 63398dd am: d402579
...
am: 3f578d2
2016-04-20 22:11:57 +00:00
Zach Jang
d402579bc0
Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77 am: d4b8d2b
...
am: 63398dd
2016-04-20 21:47:54 +00:00
Zach Jang
63398dd7ea
Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757 am: 05a8c77
...
am: d4b8d2b
2016-04-20 21:42:16 +00:00
Zach Jang
d4b8d2b59f
Update security patch string to 2016-06-01 am: 0a3b3d4 am: 0ca3757
...
am: 05a8c77
2016-04-20 21:35:11 +00:00
Ying Wang
d4e3bb8acd
Merge "Allow to build native tests for translation arch only."
...
am: c24740f
2016-04-20 21:03:35 +00:00
Ying Wang
c24740fdc8
Merge "Allow to build native tests for translation arch only."
2016-04-20 20:58:17 +00:00
Ying Wang
626302262c
Allow to build native tests for translation arch only.
...
- To build a native test for translation arch only, use:
LOCAL_MODULE_TARGET_ARCH := <translation arch>
- Also disable building .odex for translation arch for Java libraries.
Bug: 27526885
Change-Id: I063e8876781c4424da7abebf1b9b7cb842ce205f
(cherry-pick from commit d90eb21cd7
2016-04-20 13:57:22 -07:00
Zach Jang
05a8c77e42
Update security patch string to 2016-06-01 am: 0a3b3d4
...
am: 0ca3757
2016-04-20 19:50:19 +00:00
Zach Jang
0ca37573e5
Update security patch string to 2016-06-01
...
am: 0a3b3d4
2016-04-20 18:49:54 +00:00
Colin Cross
b7f7204f33
Merge "Make jack_check_timestamp depend on setup-jack-server"
...
am: e982d92
2016-04-20 12:15:03 +00:00
Colin Cross
5cde746042
Make jack_check_timestamp depend on setup-jack-server
...
Some builds were failing with:
[ 3% 2226/61362] /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
FAILED: /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
No Jack server running. Try 'jack-admin start-server'
While jack-admin was running concurrently:
[ 3% 2226/61362] /bin/bash -c "(prebuilts/sdk/tools/jack-admin stop-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin kill-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin uninstall-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin install-server prebuilts/sdk/tools/jack-launcher.jar prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar 2>&1 || (exit 0) ) && (mkdir -p \"/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/\" ) && (JACK_SERVER_VM_ARGUMENTS=\"-Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/jack-server-%u-%g.log\" prebuilts/sdk/tools/jack-admin start-server 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update server prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar 4.8.ALPHA 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-2.28.RELEASE.jar 2.28.RELEASE || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.26.ALPHA.jar 3.26.ALPHA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.27.BETA.jar 3.27.BETA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.30.BETA.jar 3.30.BETA || exit 47 )"
Stopping background server
Killing background server
No Jack server to kill
Removing jack server from "/Users/android-build/.jack-server"
Installing jack server in "/Users/android-build/.jack-server"
Launching Jack server java -XX:MaxJavaStackTraceDepth=-1 -Djava.io.tmpdir=/buildbot/tmp -Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/jack-server-%u-%g.log -cp /Users/android-build/.jack-server/launcher.jar com.android.jack.launcher.ServerLauncher
(cherry picked from commit febe2bcc21
2016-04-20 09:36:45 +02:00
Stephen Hines
65e5df5e7c
Merge "Enable asan/ubsan for mips" am: a58cefb
...
am: 181e93f
2016-04-20 04:54:04 +00:00
Duane Sand
181e93f19c
Merge "Enable asan/ubsan for mips"
...
am: a58cefb
2016-04-20 04:50:58 +00:00
Stephen Hines
a58cefb683
Merge "Enable asan/ubsan for mips"
2016-04-20 04:44:39 +00:00
Colin Cross
4cfeeb95ad
Merge "Make jack_check_timestamp depend on setup-jack-server" into nyc-dev
...
am: 816dd48
2016-04-20 02:55:00 +00:00
TreeHugger Robot
816dd48126
Merge "Make jack_check_timestamp depend on setup-jack-server" into nyc-dev
2016-04-20 01:54:54 +00:00
Colin Cross
febe2bcc21
Make jack_check_timestamp depend on setup-jack-server
...
Some builds were failing with:
[ 3% 2226/61362] /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
FAILED: /bin/bash out/target/common/obj/JAVA_LIBRARIES/core-all_intermediates/jack.check.timestamp.rsp
No Jack server running. Try 'jack-admin start-server'
While jack-admin was running concurrently:
[ 3% 2226/61362] /bin/bash -c "(prebuilts/sdk/tools/jack-admin stop-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin kill-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin uninstall-server 2>&1 || (exit 0) ) && (prebuilts/sdk/tools/jack-admin install-server prebuilts/sdk/tools/jack-launcher.jar prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar 2>&1 || (exit 0) ) && (mkdir -p \"/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/\" ) && (JACK_SERVER_VM_ARGUMENTS=\"-Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/jack-server-%u-%g.log\" prebuilts/sdk/tools/jack-admin start-server 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update server prebuilts/sdk/tools/jack-server-4.8.ALPHA.jar 4.8.ALPHA 2>&1 || exit 0 ) && (prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-2.28.RELEASE.jar 2.28.RELEASE || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.26.ALPHA.jar 3.26.ALPHA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.27.BETA.jar 3.27.BETA || exit 47; prebuilts/sdk/tools/jack-admin update jack prebuilts/sdk/tools/jacks/jack-3.30.BETA.jar 3.30.BETA || exit 47 )"
Stopping background server
Killing background server
No Jack server to kill
Removing jack server from "/Users/android-build/.jack-server"
Installing jack server in "/Users/android-build/.jack-server"
Launching Jack server java -XX:MaxJavaStackTraceDepth=-1 -Djava.io.tmpdir=/buildbot/tmp -Dfile.encoding=UTF-8 -XX:+TieredCompilation -Dcom.android.jack.server.log.file=/buildbot/dist_dirs/git_nyc-dev-mac-sdk_phone_armv7-sdk/2779793/logs/jack/jack-server-%u-%g.log -cp /Users/android-build/.jack-server/launcher.jar com.android.jack.launcher.ServerLauncher
Change-Id: Ib35f313daee93dc6a3548e652cbcd4cb4d304f93
2016-04-19 17:22:29 -07:00
Ying Wang
8f8099c96a
Don't reset LOCAL_*MODULE_STEM.
...
By resetting we lose LOCAL_*MODULE_STEM values for the second include
of the *_internal.mk.
We don't need to reset because we now store the default value to a
temporary variable my_*module_stem in configure_module_stem.mk.
Bug: 27775991
(cherry picked from commit c160c3f21a
2016-04-19 14:26:58 -07:00
