Commit Graph

29072 Commits

Author SHA1 Message Date
TreeHugger Robot
1c04ad1b02 Merge "Add fake libart" into nyc-dev 2016-04-25 21:53:31 +00: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
Treehugger Robot
720d8198b4 Merge "target_files_diff: Fix the issue with file type change." am: 23995fe
am: 60519b5

* commit '60519b5ebbe03f4f5146a93adbc887017c43c457':
  target_files_diff: Fix the issue with file type change.

Change-Id: I941b4bc961c853d880f8153f36a08c574f195e01
2016-04-25 19:23:07 +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
Dirk Dougherty
0781792ea7 Update samples_navtree cs template to include generated _yaml from samples TOC.
am: 1a2dbb6

* commit '1a2dbb64a897f684667da6c3c2faeb88f4564123':
  Update samples_navtree cs template to include generated _yaml from samples TOC.

Change-Id: I5d95e8744a5451c0442b7b67ecb8c84bbf4b107f
2016-04-25 18:46:10 +00:00
Tao Bao
6e1b35d625 target_files_diff: Fix the issue with file type change.
am: f31a6de

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

Change-Id: I4f13b01aa009d7f33692eb20d6ff2c6de241b728
2016-04-25 18:35:20 +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
Dirk Dougherty
1a2dbb64a8 Update samples_navtree cs template to include generated _yaml from samples TOC.
Change-Id: Ied2bd5b3e58d9eb2c10e8bc10678aa5d02ef1794
2016-04-25 11:26:11 -07:00
smain@google.com
15dde75ca2 remove version number from download button at bottom of page. am: 4194fc5
am: cdb2751

* commit 'cdb27514f91f9790a8916eb1e4e16f8d6a2f3d76':
  remove version number from download button at bottom of page.

Change-Id: If1a0c80bd8d80955d4bb71f47efbd8961c0ce5c3
2016-04-25 18:08:53 +00:00
smain@google.com
cdb27514f9 remove version number from download button at bottom of page.
am: 4194fc5

* commit '4194fc52a57178ac5db68b025635accf05e3bce0':
  remove version number from download button at bottom of page.

Change-Id: I80310ef73bfbba642fa35802d356360cd33a01e8
2016-04-25 18:03:27 +00:00
smain@google.com
fbbd3faebd remove version number from download button at bottom of page.
am: ba761ab

* commit 'ba761ab3333d86eeaa6bf2f4972ed7bd70ac2f7d':
  remove version number from download button at bottom of page.

Change-Id: Iedbdca047db7779415ae55a29291cec8b1b9fa26
2016-04-25 18:03:27 +00:00
smain@google.com
4194fc52a5 remove version number from download button at bottom of page.
Change-Id: I4e2b510a0ff88b987b5b9a65b6a7e89d043e946a
(cherry picked from commit ba761ab333)
2016-04-25 17:58:05 +00:00
smain@google.com
ba761ab333 remove version number from download button at bottom of page.
Change-Id: I4e2b510a0ff88b987b5b9a65b6a7e89d043e946a
2016-04-25 10:56:30 -07:00
Tao Bao
f31a6deeee 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
2016-04-25 10:07:20 -07:00
Baligh Uddin
f3b80aed0a ADO NOT MERGE ANYWHERE - Add SquashFS tools to diamond-mr1
Bug: 23967152
2016-04-25 08:25:22 -07:00
Marie Janssen
275ce1600f Merge "make croot slightly more useful" am: 9d868c0
am: 6bba816

* commit '6bba81654bc5561377b47181ac1d1b0b944a309a':
  make croot slightly more useful

Change-Id: I09d8a71f227ad7960884840dae18ebba3197062f
2016-04-25 15:04:24 +00: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
Baligh Uddin
b664e9074f DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
am: 69cf5df  -s ours

* commit '69cf5dfc4deee1a0d48e205c3420f5a60020bb41':
  DO NOT MERGE ANYWHERE - Add squashFS tools to otatools

Change-Id: I324adea1d5eee7b1c7ebddb119f63861c6559944
2016-04-24 19:46:27 +00:00
Baligh Uddin
69cf5dfc4d DO NOT MERGE ANYWHERE - Add squashFS tools to otatools
Bug: 23967152
2016-04-24 12:40:03 -07: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
Dan Albert
e58300cc30 Merge "Switch mips64 back to NDK r10." am: 9ecf544
am: f77eb12

* commit 'f77eb12f02d233cc34e7c0d2c14c0ad737c1d8bb':
  Switch mips64 back to NDK r10.

Change-Id: Ia93c84ce3272dfb6cc83e65e1be9e3148bfa161d
2016-04-22 21:32:48 +00: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
5a84381b87 Merge "Update the path to clean_header.py on the documentation." am: 93fdee98a9
am: 83285f39ed

* commit '83285f39ed037b5eff390c6bbd367512f301251d':
  Update the path to clean_header.py on the documentation.

Change-Id: Ic0f57a44ddf9a3173b67a346357a3ba5581acaeb
2016-04-22 18:21:49 +00: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
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

* 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
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
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

* 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