Chih-hung Hsieh
7a8e69eea2
Merge "Call clang-tidy based on WITH_TIDY* variables." am: 3f03b10654
...
am: c72f50d49f
* commit 'c72f50d49fb95794039f270d4083b9cfed4cd482':
Call clang-tidy based on WITH_TIDY* variables.
Change-Id: I4eb0afd79b56ad2ddea42b33791df27da6ab8820
2016-04-21 21:11:00 +00:00
Chih-Hung Hsieh
c72f50d49f
Merge "Call clang-tidy based on WITH_TIDY* variables."
...
am: 3f03b10654
* commit '3f03b106540b9684cbeb8b889adb9f057cc252d3':
Call clang-tidy based on WITH_TIDY* variables.
Change-Id: I0f7d3b19d816b76ceaf0cd427ca6a4b148efc1af
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
Shinichiro Hamaji
506668bccf
Merge "Add input dependencies to .img targets" am: bd0bab233d
...
am: 8196646d27
* commit '8196646d2782ce7847ab081843a7ad5c2b553055':
Add input dependencies to .img targets
Change-Id: I3053b20a56804b268dbd78e793d3d5da71ecd487
2016-04-21 06:17:47 +00:00
Shinichiro Hamaji
8196646d27
Merge "Add input dependencies to .img targets"
...
am: bd0bab233d
* commit 'bd0bab233dc096084aed23bf9ca1b95c6d946648':
Add input dependencies to .img targets
Change-Id: Ia4089566e6bb729b6e19256c5f896e5c8097d0fe
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
* commit '99129ec4e3f44865cfa9957c3e9533dc77d8f494':
Add normalize_path.py to prerequisites
Change-Id: I9c7e0d84e0b6ee36017180261af9a31c782058bf
2016-04-21 05:56:08 +00:00
Shinichiro Hamaji
99129ec4e3
Merge "Add normalize_path.py to prerequisites"
...
am: 71211d8a0a
* commit '71211d8a0a32985b9a4fb21caaad300560ed1211':
Add normalize_path.py to prerequisites
Change-Id: I166372c788d567bf78804f091eb9fa5515be8401
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
* commit 'd4e3bb8acd0fffaad032d55cae9b807289c120dd':
Allow to build native tests for translation arch only.
Change-Id: Ibdccf3b6f10e923ce26c5611bc15f196a77ae497
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
* commit 'b5658074c334cf8a1ae16f8f9eae22d1a81e605c':
Update security patch string to 2016-06-01
Change-Id: I0408ad5673aed33aecbcde651fdab51697b61eba
2016-04-20 22:19:25 +00:00
Christopher Tate
85520a6b2f
Merge "Wallpaper backup/restore is now in its own package" into nyc-dev
...
am: 8e9431e
* commit '8e9431e54f23c089b3e664a82c622783ef13796c':
Wallpaper backup/restore is now in its own package
Change-Id: I3501a452d26316da8787a4695fe2ea46ba85518c
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
* commit '3f578d27312e5c075daf7e66787a1b4fe64a8a4e':
Update security patch string to 2016-06-01
Change-Id: Ia5b128d3719872fd991417620e9bee82dbc5da24
2016-04-20 22:11:57 +00:00
Chris Tate
8e9431e54f
Merge "Wallpaper backup/restore is now in its own package" into nyc-dev
2016-04-20 22:10:40 +00:00
Zach Jang
3f578d2731
Update security patch string to 2016-06-01 am: 0a3b3d4
am: 0ca3757
am: 05a8c77
am: d4b8d2b
am: 63398dd
...
am: d402579
* commit 'd402579bc0beb02007172259c0c686b930cc77d4':
Update security patch string to 2016-06-01
Change-Id: I4b9b46ae2fec761ec84cec722d652658bf5489e0
2016-04-20 21:55:11 +00:00
Zach Jang
d402579bc0
Update security patch string to 2016-06-01 am: 0a3b3d4
am: 0ca3757
am: 05a8c77
am: d4b8d2b
...
am: 63398dd
* commit '63398dd7ea01ea331e2ea362c3235b79fefd5cfe':
Update security patch string to 2016-06-01
Change-Id: Icea8df8e59f72146ecf737473cbba19d0b6aba5d
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
* commit 'd4b8d2b59f804544e09cb3e600ff290792470999':
Update security patch string to 2016-06-01
Change-Id: I837a9f96b9d35f315b2bf92e600084ecb879b264
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
* commit '05a8c77e4231828db15aee343f79ebd2dd6607dd':
Update security patch string to 2016-06-01
Change-Id: I427cd7ac7b33d5f5891ccd96a4fbaeb0a0f7c5e7
2016-04-20 21:35:11 +00:00
bohu
d7f734024f
Merge "Fix emulator specific SELinux denials related to qemu.gles" into nyc-dev
...
am: 94f576d
* commit '94f576d18cb61e672bcc849a324eab244dd4f3f8':
Fix emulator specific SELinux denials related to qemu.gles
Change-Id: Iba1c077238ec1c41434c87e8ac96467a081383fc
2016-04-20 21:04:31 +00:00
Trevor Johns
aedf6592a2
Merge "Revert "Revert "Merge "Resolve merge conflicts of a5f0068
to nyc-dev" into nyc-dev""" into nyc-dev
...
am: 0f0b536
* commit '0f0b53623e8a64cebc74d2bc9ef48dacac192ec0':
Revert "Revert "Merge "Resolve merge conflicts of a5f0068
to nyc-dev" into nyc-dev""
Change-Id: I2f05586d98e54b47ac38434561dd2027f4abcb34
2016-04-20 21:04:30 +00:00
Ying Wang
d4e3bb8acd
Merge "Allow to build native tests for translation arch only."
...
am: c24740f
* commit 'c24740fdc874b5163fd02eb36811ff750d2acff8':
Allow to build native tests for translation arch only.
Change-Id: I36f222f6b69737f280fac983f62a201a30f255b9
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
* commit '0ca37573e53bc3a481daa3a807dfc6960227fb0f':
Update security patch string to 2016-06-01
Change-Id: I91bf9e0ce857dbb6cde8132e97499011b2325ba2
2016-04-20 19:50:19 +00:00
Zach Jang
0ca37573e5
Update security patch string to 2016-06-01
...
am: 0a3b3d4
* commit '0a3b3d40c10e76e75d11a0c3cddc3ea637871886':
Update security patch string to 2016-06-01
Change-Id: I276f6d99393230230e514c6613d7a7d858a78a9a
2016-04-20 18:49:54 +00:00
Bo Hu
94f576d18c
Merge "Fix emulator specific SELinux denials related to qemu.gles" into nyc-dev
2016-04-20 18:46:38 +00:00
Trevor Johns
0f0b53623e
Merge "Revert "Revert "Merge "Resolve merge conflicts of a5f0068
to nyc-dev" into nyc-dev""" into nyc-dev
2016-04-20 18:35:57 +00:00
Yohann Roussel
a73bf03f1f
Merge "Make jack_check_timestamp depend on setup-jack-server" am: e982d92
...
am: b7f7204
* commit 'b7f7204f330cb0b740f316c15c55175ae0a58021':
Make jack_check_timestamp depend on setup-jack-server
Change-Id: Ia48f573ad56c9375bd39c7a1c050fdae84631edd
2016-04-20 12:18:13 +00:00
Colin Cross
b7f7204f33
Merge "Make jack_check_timestamp depend on setup-jack-server"
...
am: e982d92
* commit 'e982d92bb740e19a62566eb303c9abaccf475442':
Make jack_check_timestamp depend on setup-jack-server
Change-Id: I0a2a37e2e286dff028ea60c5bfead0247c9cbc73
2016-04-20 12:15:03 +00:00
Yohann Roussel
e982d92bb7
Merge "Make jack_check_timestamp depend on setup-jack-server"
2016-04-20 12:08:35 +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
)
Change-Id: I406afc87b4f7dda49406c4e1674430d223914e8d
2016-04-20 09:36:45 +02:00
Stephen Hines
65e5df5e7c
Merge "Enable asan/ubsan for mips" am: a58cefb
...
am: 181e93f
* commit '181e93f19cd88af5762e7156373c8a4deb66cd98':
Enable asan/ubsan for mips
Change-Id: Ibd611d54adf928016f8527ffb1005ec14f573d0d
2016-04-20 04:54:04 +00:00
Duane Sand
181e93f19c
Merge "Enable asan/ubsan for mips"
...
am: a58cefb
* commit 'a58cefb6834fefe411c0b14782d2e5ad8c148389':
Enable asan/ubsan for mips
Change-Id: I2af83d34fa183a2eecbe4f16e4ff5579d8d8ca3c
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
* commit '816dd481268cf08c521314798facc4a02578dd55':
Make jack_check_timestamp depend on setup-jack-server
Change-Id: Ib0f452287a86d96b92ff52411baa58d1f11ebe0b
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
bohu
bf863dbffc
Fix emulator specific SELinux denials related to qemu.gles
...
init: avc: denied { set } for property=qemu.gles pid=108 uid=1003 gid=1003 scontext=u:r:bootanim:s0 tcontext=u:object_r:qemu_prop:s0 tclass=property_service permissive=1
init: avc: denied { set } for property=qemu.gles pid=75 uid=0 gid=0 scontext=u:r:zygote:s0 tcontext=u:object_r:qemu_prop:s0 tclass=property_service permissive=1
bug: 28221393
Change-Id: Icb0ee7fbf9a7b985f66fac087a48d9b5789e2b67
2016-04-19 15:04:58 -07:00
Ying Wang
a75e03956c
Don\'t reset LOCAL_*MODULE_STEM.
...
am: 8f8099c
* commit '8f8099c96aa08d564a82225ced18076d0abd1780':
Don't reset LOCAL_*MODULE_STEM.
Change-Id: I29736cf9d674102402cf8f83e4a017a8bb7ebdf6
2016-04-19 21:38:52 +00: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
)
Change-Id: I5d9b7f7214d98a1bf953fadb9951a8af1e993057
2016-04-19 14:26:58 -07:00
Ying Wang
40c185f545
Merge "Don\'t reset LOCAL_*MODULE_STEM." am: e77e5e7
...
am: 07ad876
* commit '07ad8765abefd43b2290e1fc61dc17a69e423f42':
Don't reset LOCAL_*MODULE_STEM.
Change-Id: I55821cf233aa78f3e451c0b1fa255864b63b9749
2016-04-19 21:02:22 +00:00
Ying Wang
07ad8765ab
Merge "Don\'t reset LOCAL_*MODULE_STEM."
...
am: e77e5e7
* commit 'e77e5e7b5ba8991323cd1c421e9076cbe46b2bb3':
Don't reset LOCAL_*MODULE_STEM.
Change-Id: I642dd9ec7a9ba3ae9a4a5f0b3c889fbf22c48353
2016-04-19 20:58:58 +00:00
Ying Wang
e77e5e7b5b
Merge "Don't reset LOCAL_*MODULE_STEM."
2016-04-19 20:50:38 +00:00
Christopher Tate
65e3b75ddc
Wallpaper backup/restore is now in its own package
...
Bug 25453848
Bug 25727875
Change-Id: I774afad99d23f4f7ffb1675909a5a17732af3fb8
2016-04-19 13:08:21 -07:00
Ying Wang
c160c3f21a
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
Change-Id: I36d1ff3d177818677fb38bdb3d340dd2ff34c404
2016-04-19 12:20:47 -07:00
Zach Jang
0a3b3d40c1
Update security patch string to 2016-06-01
...
b/28269112
Change-Id: Icf65bbf784951d1f9b56ce88f59b50661af1a32c
2016-04-19 10:56:31 -07:00
Dimitry Ivanov
6c7d7c1f8b
Merge "Make sure platform libraries are built, regardless of webview.apk" am: da7fef6
...
am: b077e80
* commit 'b077e80d041f74af240111f457ebd4dd168da6dd':
Make sure platform libraries are built, regardless of webview.apk
Change-Id: Ie463aeed9f8f9ef1b12d89d571c8a23d5432b05d
2016-04-19 17:18:49 +00:00
Nikola Veljkovic
b077e80d04
Merge "Make sure platform libraries are built, regardless of webview.apk"
...
am: da7fef6
* commit 'da7fef62aa60da65a9f183cf82c14b6aa7694aff':
Make sure platform libraries are built, regardless of webview.apk
Change-Id: I9cd12ab64852adc6761fd975b8606f08b78bfe1d
2016-04-19 17:15:19 +00:00
Dimitry Ivanov
da7fef62aa
Merge "Make sure platform libraries are built, regardless of webview.apk"
2016-04-19 17:07:20 +00:00