Commit Graph

26941 Commits

Author SHA1 Message Date
Ying Wang
0c1d51db71 Merge "Warn if there is file with unknown suffix in Java module\'s sources."
am: 85b9117

* commit '85b911719084b7266de459408e8f038a2a429e0c':
  Warn if there is file with unknown suffix in Java module's sources.

Change-Id: I6c7d7a6b51f63f9b6f0da8b6e35d73d46820cae4
2016-04-27 16:59:13 +00:00
Ying Wang
85b9117190 Merge "Warn if there is file with unknown suffix in Java module's sources." 2016-04-27 16:49:10 +00:00
Ying Wang
f8d15d6f3f Warn if there is file with unknown suffix in Java module's sources.
This helps catch extra ) at the end of LOCAL_SRC_FILES.

Bug: 28389144
Change-Id: I0ab536b5bb47338ebf5bdf531835d58f527ccf67
2016-04-26 15:59:06 -07:00
Stefan Stanacar
a0bcefa9f0 Merge "ccache: Allow external setting of CCACHE_COMPILERCHECK variable"
am: a48eb99

* commit 'a48eb99f41c33eb205b3c4e860d82b5d523ba84b':
  ccache: Allow external setting of CCACHE_COMPILERCHECK variable

Change-Id: I02bee522220775c5c8e781f1ef2f45a86e2451ba
2016-04-26 22:27:30 +00:00
Mohammed Habibulla
a48eb99f41 Merge "ccache: Allow external setting of CCACHE_COMPILERCHECK variable" 2016-04-26 22:14:17 +00:00
Chih-Hung Hsieh
6014381896 Merge "Add tidy.mk to set up global default checks."
am: 214c7fa

* commit '214c7fadf16b458c0eaa0db1d875ca92b8c0a609':
  Add tidy.mk to set up global default checks.

Change-Id: I27a84cab03ff208875014e852f2699d4449d30fd
2016-04-26 01:48:11 +00:00
Chih-hung Hsieh
214c7fadf1 Merge "Add tidy.mk to set up global default checks." 2016-04-26 01:41:42 +00:00
Tao Bao
60519b5ebb Merge "target_files_diff: Fix the issue with file type change."
am: 23995fe

* commit '23995fe30f033c42e5274a4cdcbdc710ac3af635':
  target_files_diff: Fix the issue with file type change.

Change-Id: Icde8bad6c81ee9c179434010e1d17587fd5386a1
2016-04-25 19:17:42 +00: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
Treehugger Robot
23995fe30f Merge "target_files_diff: Fix the issue with file type change." 2016-04-25 19:08:54 +00:00
Tao Bao
00dbe29173 target_files_diff: Fix the issue with file type change.
When a file is switched from a regular file to a symlink, we should skip
the comparasion.

Bug: 28373409
Change-Id: I8fef00ab9f2d6f811fde1cadf595e8bd46af2dfd
(cherry picked from commit f31a6deeee)
2016-04-25 11:29:48 -07:00
Marie Janssen
6bba81654b Merge "make croot slightly more useful"
am: 9d868c0

* commit '9d868c0800eef398f8d02c13555aa85cf0f8357b':
  make croot slightly more useful

Change-Id: I04bb6e11ee9a0797ccdc180529c6ce7b0851ee1c
2016-04-25 14:59:11 +00:00
Marie Janssen
9d868c0800 Merge "make croot slightly more useful" 2016-04-25 14:54:44 +00:00
Marie Janssen
32ec50a1f1 make croot slightly more useful
Have croot take an argument of a directory to end up in,
so we can jump around the tree even faster.

Change-Id: Ieb6a8d47fee0412006a11192b29ed44604961312
2016-04-22 16:25:29 -07:00
Nikola Veljkovic
f77eb12f02 Merge "Switch mips64 back to NDK r10."
am: 9ecf544

* commit '9ecf54456c6fc0adc9bc635cfe59a8836eb95a10':
  Switch mips64 back to NDK r10.

Change-Id: I0aa5cfb46d446f9b12a9db6ac066ee100a4e9fb3
2016-04-22 21:30:07 +00:00
Dan Albert
9ecf54456c Merge "Switch mips64 back to NDK r10." 2016-04-22 21:19:58 +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
83285f39ed Merge "Update the path to clean_header.py on the documentation."
am: 93fdee98a9

* commit '93fdee98a9950e61d5a855023221bebc33694c55':
  Update the path to clean_header.py on the documentation.

Change-Id: If67c70e366180d40469c9b052e3d79e4c6c772dc
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
995b62b2d7 Merge changes I6e98fc65,Ia8665e7c
am: 5ce149b76a

* commit '5ce149b76a44853ec8649057bfcc67d73d3a5a86':
  Remove bootclasspath handling for Jack
  Remove static libraries from Jack classpath

Change-Id: I2839f7a87c2dc4792c67851d38684ebd28313777
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
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
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
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
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
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
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
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
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
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
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
Nikola Veljkovic
8f1ac7c9d6 Make sure platform libraries are built, regardless of webview.apk
Prebuilt WebView is missing for mips64 architecture. Allow device
to boot without it, by making sure platform support libraries are
part of the system image.

WebView APK can then be installed separately.

Change-Id: Iabbb5e6a4778b7542d24bb4f789a7be96232e50c
2016-04-19 14:25:50 +00:00
Shinichiro Hamaji
3deb87d5fd Add input dependencies to .img targets
They should have build/tools/releasetools/*.py as their
prerequisites.

Bug: 27954979
Change-Id: I51595fc91caaad38be3e47befb5df7ac2683bf14
2016-04-19 18:41:27 +09:00
Neil Fuller
ca9d53f883 Merge "Add core-lambda-stubs to default classpath for target libs compiling using javac"
am: 8c5698d

* commit '8c5698d220d4eb6bbba965c070d2fb792de6f3c1':
  Add core-lambda-stubs to default classpath for target libs compiling using javac

Change-Id: I8b6557aee0c120ea3c63bc0948c1109ca1b9a9e1
2016-04-19 08:18:31 +00:00
Neil Fuller
8c5698d220 Merge "Add core-lambda-stubs to default classpath for target libs compiling using javac" 2016-04-19 08:13:23 +00:00
Shinichiro Hamaji
d50001e74a Add normalize_path.py to prerequisites
Bug: 27954979
Change-Id: I1e22eb4f42a8cb348ce1101e207e239bc5aa7976
2016-04-19 16:22:27 +09:00
Yabin Cui
0ad593683e Merge "Revert "Use strip mode mini-debug-info by default.""
am: b34f69f

* commit 'b34f69f8499fe699edaca8715bed13b884cb9669':
  Revert "Use strip mode mini-debug-info by default."

Change-Id: Ie234fc5a11933a3364c34981f110f25f6f0842b8
2016-04-19 03:48:49 +00:00