OSDN Git Service
Chih-Hung Hsieh [Mon, 2 May 2016 18:27:24 +0000 (18:27 +0000)]
Merge "Fix google-explicit-constructor warnings."
am:
169cb4b68c
* commit '
169cb4b68c6e69e1997cc5e2f9e555b010127bb5':
Fix google-explicit-constructor warnings.
Change-Id: Iafe8e50822c55d80227745f4823b5cbe97039944
Chih-hung Hsieh [Mon, 2 May 2016 18:08:16 +0000 (18:08 +0000)]
Merge "Fix google-explicit-constructor warnings."
Chih-Hung Hsieh [Sat, 30 Apr 2016 00:44:49 +0000 (00:44 +0000)]
Merge "Suppress google-* checks in vendor modules."
am:
f2592e192d
* commit '
f2592e192da6fcea5233b073149751c9ee687ab9':
Suppress google-* checks in vendor modules.
Change-Id: Id501346744dd238120c428cdf5ebb9815a438bd2
Chih-hung Hsieh [Sat, 30 Apr 2016 00:38:35 +0000 (00:38 +0000)]
Merge "Suppress google-* checks in vendor modules."
Chih-Hung Hsieh [Fri, 29 Apr 2016 22:16:59 +0000 (15:16 -0700)]
Suppress google-* checks in vendor modules.
Too many warnings in vendor code that we cannot fix yet.
Bug: http://b/
27779618
Change-Id: I8b65b1fd55c4e4d0dadf0617ab25962809237309
Chih-Hung Hsieh [Fri, 29 Apr 2016 21:10:10 +0000 (14:10 -0700)]
Fix google-explicit-constructor warnings.
Bug:
28341362
Change-Id: I72bdd1df09cea91743aa89dab4cb0b9db2657e2d
Alex Klyubin [Fri, 29 Apr 2016 20:32:47 +0000 (20:32 +0000)]
Merge "zipalign supports -p also when checking alignment."
am:
401f8b953f
* commit '
401f8b953fff2f510ef7c118cfef503981ab5be6':
zipalign supports -p also when checking alignment.
Change-Id: I54d1a931f108ab80fafaf3f13a34d924175eb3a9
Alex Klyubin [Fri, 29 Apr 2016 20:26:17 +0000 (20:26 +0000)]
Merge "zipalign supports -p also when checking alignment."
Alex Klyubin [Fri, 29 Apr 2016 19:32:17 +0000 (12:32 -0700)]
zipalign supports -p also when checking alignment.
This updates the usage banner of zipalign to state that the -p switch
is supported in check alignment mode.
Change-Id: I119026b0e09e5a2528646e88a9b58dbb79c0c17c
Stephen Hines [Wed, 27 Apr 2016 22:46:07 +0000 (22:46 +0000)]
Merge "Switch to clang-
2812033."
am:
fb737e9
* commit '
fb737e9002f43d68473b68518808aab99da9abcf':
Switch to clang-
2812033.
Change-Id: Iffedb14b2c2f2da4d690336f5fa2122dea2e1c83
Stephen Hines [Wed, 27 Apr 2016 22:33:05 +0000 (22:33 +0000)]
Merge "Switch to clang-
2812033."
Yabin Cui [Wed, 27 Apr 2016 19:22:15 +0000 (19:22 +0000)]
Merge "Use strip mode mini-debug-info by default except on mips."
am:
e13b4c6
* commit '
e13b4c61bd1d6b0d57d7840607d39cc59fa0d840':
Use strip mode mini-debug-info by default except on mips.
Change-Id: Ia3de2e088b87b71d21b52c358ae5c45564a73bda
Yabin Cui [Wed, 27 Apr 2016 19:19:06 +0000 (19:19 +0000)]
Merge "Use strip mode mini-debug-info by default except on mips."
Ying Wang [Wed, 27 Apr 2016 16:59:13 +0000 (16:59 +0000)]
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
Ying Wang [Wed, 27 Apr 2016 16:49:10 +0000 (16:49 +0000)]
Merge "Warn if there is file with unknown suffix in Java module's sources."
Yabin Cui [Tue, 26 Apr 2016 23:08:00 +0000 (16:08 -0700)]
Use strip mode mini-debug-info by default except on mips.
Bug:
27923447
Change-Id: I818dea44f126155b4b9b3cd929823d8eda1a1174
Ying Wang [Tue, 26 Apr 2016 22:49:56 +0000 (15:49 -0700)]
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
Stefan Stanacar [Tue, 26 Apr 2016 22:27:30 +0000 (22:27 +0000)]
Merge "ccache: Allow external setting of CCACHE_COMPILERCHECK variable"
am:
a48eb99
* commit '
a48eb99f41c33eb205b3c4e860d82b5d523ba84b':
ccache: Allow external setting of CCACHE_COMPILERCHECK variable
Change-Id: I02bee522220775c5c8e781f1ef2f45a86e2451ba
Mohammed Habibulla [Tue, 26 Apr 2016 22:14:17 +0000 (22:14 +0000)]
Merge "ccache: Allow external setting of CCACHE_COMPILERCHECK variable"
Stephen Hines [Tue, 26 Apr 2016 21:34:24 +0000 (14:34 -0700)]
Switch to clang-
2812033.
Bug: http://b/
25291096
Change-Id: I630b7e8a682e3c3b82ad9837b664c1155497618f
Chih-Hung Hsieh [Tue, 26 Apr 2016 01:48:11 +0000 (01:48 +0000)]
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
Chih-hung Hsieh [Tue, 26 Apr 2016 01:41:42 +0000 (01:41 +0000)]
Merge "Add tidy.mk to set up global default checks."
Tao Bao [Mon, 25 Apr 2016 19:17:42 +0000 (19:17 +0000)]
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
Chih-Hung Hsieh [Thu, 21 Apr 2016 22:37:24 +0000 (15:37 -0700)]
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
Treehugger Robot [Mon, 25 Apr 2016 19:08:53 +0000 (19:08 +0000)]
Merge "target_files_diff: Fix the issue with file type change."
Tao Bao [Mon, 25 Apr 2016 17:03:38 +0000 (10:03 -0700)]
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
f31a6deeeeb896cc516c2f2f91ceff1fd0702938)
Marie Janssen [Mon, 25 Apr 2016 14:59:11 +0000 (14:59 +0000)]
Merge "make croot slightly more useful"
am:
9d868c0
* commit '
9d868c0800eef398f8d02c13555aa85cf0f8357b':
make croot slightly more useful
Change-Id: I04bb6e11ee9a0797ccdc180529c6ce7b0851ee1c
Marie Janssen [Mon, 25 Apr 2016 14:54:44 +0000 (14:54 +0000)]
Merge "make croot slightly more useful"
Marie Janssen [Thu, 21 Apr 2016 23:53:39 +0000 (16:53 -0700)]
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
Nikola Veljkovic [Fri, 22 Apr 2016 21:30:07 +0000 (21:30 +0000)]
Merge "Switch mips64 back to NDK r10."
am:
9ecf544
* commit '
9ecf54456c6fc0adc9bc635cfe59a8836eb95a10':
Switch mips64 back to NDK r10.
Change-Id: I0aa5cfb46d446f9b12a9db6ac066ee100a4e9fb3
Dan Albert [Fri, 22 Apr 2016 21:19:58 +0000 (21:19 +0000)]
Merge "Switch mips64 back to NDK r10."
Nikola Veljkovic [Wed, 6 Apr 2016 17:20:02 +0000 (19:20 +0200)]
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
Alex Deymo [Fri, 22 Apr 2016 18:19:29 +0000 (18:19 +0000)]
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
Treehugger Robot [Fri, 22 Apr 2016 18:11:18 +0000 (18:11 +0000)]
Merge "Update the path to clean_header.py on the documentation."
Alex Deymo [Fri, 22 Apr 2016 17:18:15 +0000 (10:18 -0700)]
Update the path to clean_header.py on the documentation.
Bug: None
Change-Id: I8064c67b6066613b51a581ec67476797690418ae
Yohann Roussel [Fri, 22 Apr 2016 15:53:54 +0000 (15:53 +0000)]
Merge changes I6e98fc65,Ia8665e7c
am:
5ce149b76a
* commit '
5ce149b76a44853ec8649057bfcc67d73d3a5a86':
Remove bootclasspath handling for Jack
Remove static libraries from Jack classpath
Change-Id: I2839f7a87c2dc4792c67851d38684ebd28313777
Yohann Roussel [Fri, 22 Apr 2016 15:51:50 +0000 (15:51 +0000)]
Merge changes I6e98fc65,Ia8665e7c
* changes:
Remove bootclasspath handling for Jack
Remove static libraries from Jack classpath
Yohann Roussel [Thu, 21 Apr 2016 14:49:10 +0000 (16:49 +0200)]
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
Chih-Hung Hsieh [Thu, 21 Apr 2016 21:08:17 +0000 (21:08 +0000)]
Merge "Call clang-tidy based on WITH_TIDY* variables."
am:
3f03b10654
* commit '
3f03b106540b9684cbeb8b889adb9f057cc252d3':
Call clang-tidy based on WITH_TIDY* variables.
Change-Id: I0f7d3b19d816b76ceaf0cd427ca6a4b148efc1af
Chih-hung Hsieh [Thu, 21 Apr 2016 21:01:45 +0000 (21:01 +0000)]
Merge "Call clang-tidy based on WITH_TIDY* variables."
Chih-Hung Hsieh [Thu, 31 Mar 2016 23:30:23 +0000 (16:30 -0700)]
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
Yohann Roussel [Thu, 21 Apr 2016 14:30:18 +0000 (16:30 +0200)]
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
Shinichiro Hamaji [Thu, 21 Apr 2016 06:15:31 +0000 (06:15 +0000)]
Merge "Add input dependencies to .img targets"
am:
bd0bab233d
* commit '
bd0bab233dc096084aed23bf9ca1b95c6d946648':
Add input dependencies to .img targets
Change-Id: Ia4089566e6bb729b6e19256c5f896e5c8097d0fe
Shinichiro Hamaji [Thu, 21 Apr 2016 06:10:38 +0000 (06:10 +0000)]
Merge "Add input dependencies to .img targets"
Shinichiro Hamaji [Thu, 21 Apr 2016 05:54:00 +0000 (05:54 +0000)]
Merge "Add normalize_path.py to prerequisites"
am:
71211d8a0a
* commit '
71211d8a0a32985b9a4fb21caaad300560ed1211':
Add normalize_path.py to prerequisites
Change-Id: I166372c788d567bf78804f091eb9fa5515be8401
Shinichiro Hamaji [Thu, 21 Apr 2016 05:34:06 +0000 (05:34 +0000)]
Merge "Add normalize_path.py to prerequisites"
Ying Wang [Wed, 20 Apr 2016 21:03:35 +0000 (21:03 +0000)]
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
Ying Wang [Wed, 20 Apr 2016 20:58:16 +0000 (20:58 +0000)]
Merge "Allow to build native tests for translation arch only."
Ying Wang [Wed, 20 Apr 2016 18:53:39 +0000 (11:53 -0700)]
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
d90eb21cd79fef3cc9566524d823cdf210799fcd)
Colin Cross [Wed, 20 Apr 2016 12:15:03 +0000 (12:15 +0000)]
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
Yohann Roussel [Wed, 20 Apr 2016 12:08:35 +0000 (12:08 +0000)]
Merge "Make jack_check_timestamp depend on setup-jack-server"
Colin Cross [Wed, 20 Apr 2016 00:22:29 +0000 (17:22 -0700)]
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
febe2bcc217b3dc546ea7bbf0361261a7b482b17)
Change-Id: I406afc87b4f7dda49406c4e1674430d223914e8d
Duane Sand [Wed, 20 Apr 2016 04:50:58 +0000 (04:50 +0000)]
Merge "Enable asan/ubsan for mips"
am:
a58cefb
* commit '
a58cefb6834fefe411c0b14782d2e5ad8c148389':
Enable asan/ubsan for mips
Change-Id: I2af83d34fa183a2eecbe4f16e4ff5579d8d8ca3c
Stephen Hines [Wed, 20 Apr 2016 04:44:39 +0000 (04:44 +0000)]
Merge "Enable asan/ubsan for mips"
Ying Wang [Tue, 19 Apr 2016 20:58:58 +0000 (20:58 +0000)]
Merge "Don\'t reset LOCAL_*MODULE_STEM."
am:
e77e5e7
* commit '
e77e5e7b5ba8991323cd1c421e9076cbe46b2bb3':
Don't reset LOCAL_*MODULE_STEM.
Change-Id: I642dd9ec7a9ba3ae9a4a5f0b3c889fbf22c48353
Ying Wang [Tue, 19 Apr 2016 20:50:38 +0000 (20:50 +0000)]
Merge "Don't reset LOCAL_*MODULE_STEM."
Ying Wang [Tue, 19 Apr 2016 19:13:54 +0000 (12:13 -0700)]
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
Nikola Veljkovic [Tue, 19 Apr 2016 17:15:19 +0000 (17:15 +0000)]
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
Dimitry Ivanov [Tue, 19 Apr 2016 17:07:20 +0000 (17:07 +0000)]
Merge "Make sure platform libraries are built, regardless of webview.apk"
Nikola Veljkovic [Fri, 8 Apr 2016 14:55:20 +0000 (16:55 +0200)]
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
Shinichiro Hamaji [Tue, 19 Apr 2016 09:41:27 +0000 (18:41 +0900)]
Add input dependencies to .img targets
They should have build/tools/releasetools/*.py as their
prerequisites.
Bug:
27954979
Change-Id: I51595fc91caaad38be3e47befb5df7ac2683bf14
Neil Fuller [Tue, 19 Apr 2016 08:18:31 +0000 (08:18 +0000)]
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
Neil Fuller [Tue, 19 Apr 2016 08:13:22 +0000 (08:13 +0000)]
Merge "Add core-lambda-stubs to default classpath for target libs compiling using javac"
Shinichiro Hamaji [Tue, 19 Apr 2016 07:17:55 +0000 (16:17 +0900)]
Add normalize_path.py to prerequisites
Bug:
27954979
Change-Id: I1e22eb4f42a8cb348ce1101e207e239bc5aa7976
Yabin Cui [Tue, 19 Apr 2016 03:48:49 +0000 (03:48 +0000)]
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
Yabin Cui [Tue, 19 Apr 2016 03:42:04 +0000 (03:42 +0000)]
Merge "Revert "Use strip mode mini-debug-info by default.""
Yabin Cui [Tue, 19 Apr 2016 03:38:34 +0000 (03:38 +0000)]
Revert "Use strip mode mini-debug-info by default."
This reverts commit
0e131e7e2c93c9ce7627b90eb59cda286d85ffd8.
breaks in aosp_mips-eng
Change-Id: I468b0a47c878ffde9afc78442e8d4f0dabf7eb6e
Yabin Cui [Tue, 19 Apr 2016 02:57:41 +0000 (02:57 +0000)]
Merge "Use strip mode mini-debug-info by default."
am:
c7eab6d
* commit '
c7eab6db2743abd98c6a5123c4f8764463547bd6':
Use strip mode mini-debug-info by default.
Change-Id: Ibc7d3304a52b9dcf5573506b6ad5df35ec4ef167
Yabin Cui [Tue, 19 Apr 2016 02:52:21 +0000 (02:52 +0000)]
Merge "Use strip mode mini-debug-info by default."
Nick Kralevich [Mon, 18 Apr 2016 23:22:39 +0000 (23:22 +0000)]
Merge "Move sysfs_writable to emulator specific policy"
am:
821e3fd
* commit '
821e3fd8184dca5c9f42ef7c923ddb772fe3d5c6':
Move sysfs_writable to emulator specific policy
Change-Id: I54e4d7dd9c5aecb1e76d8c502a1e8d66dcbaf905
Treehugger Robot [Mon, 18 Apr 2016 23:14:50 +0000 (23:14 +0000)]
Merge "Move sysfs_writable to emulator specific policy"
Nick Kralevich [Mon, 18 Apr 2016 22:22:40 +0000 (22:22 +0000)]
Merge "Address emulator specific SELinux denials"
am:
35b0d00
* commit '
35b0d00125d4ad9e69b8fc6c1264afd20a1d5028':
Address emulator specific SELinux denials
Change-Id: I8efb0064f532e34a9fee35665a0185e14ed242e0
Nick Kralevich [Mon, 18 Apr 2016 22:18:09 +0000 (15:18 -0700)]
Move sysfs_writable to emulator specific policy
This type is never used in core policy, only by emulators.
Move the definition of this type to where it's used.
Bug:
28221393
Change-Id: I38dbc12dbe9813f323d4bcd5f07679db57b2fd4a
Nick Kralevich [Mon, 18 Apr 2016 22:17:16 +0000 (22:17 +0000)]
Merge "Address emulator specific SELinux denials"
Nick Kralevich [Mon, 18 Apr 2016 20:28:04 +0000 (13:28 -0700)]
Address emulator specific SELinux denials
(cherrypicked from commit
841f6d870db50862bb6be2e963149f46768f8aca)
Fix the following denials:
avc: denied { search } for pid=222 comm="system_server"
name="qemu_trace" dev="sysfs" ino=45 scontext=u:r:system_server:s0
tcontext=u:object_r:sysfs_writable:s0 tclass=dir permissive=1
avc: denied { open } for pid=222 comm="system_server"
name="u:object_r:opengles_prop:s0" dev="tmpfs" ino=1429
scontext=u:r:system_server:s0 tcontext=u:object_r:opengles_prop:s0
tclass=file permissive=1
avc: denied { read } for pid=222 comm="system_server"
name="u:object_r:radio_noril_prop:s0" dev="tmpfs" ino=1430
scontext=u:r:system_server:s0 tcontext=u:object_r:radio_noril_prop:s0
tclass=file permissive=1
avc: denied { open } for pid=222 comm="system_server"
name="u:object_r:radio_noril_prop:s0" dev="tmpfs" ino=1430
scontext=u:r:system_server:s0 tcontext=u:object_r:radio_noril_prop:s0
tclass=file permissive=1
avc: denied { getattr } for pid=222 comm="system_server"
path="/dev/__properties__/u:object_r:radio_noril_prop:s0" dev="tmpfs"
ino=1430 scontext=u:r:system_server:s0
tcontext=u:object_r:radio_noril_prop:s0 tclass=file permissive=1
avc: denied { search } for pid=424 comm="putmethod.latin"
name="qemu_trace" dev="sysfs" ino=45
scontext=u:r:untrusted_app:s0:c512,c768
tcontext=u:object_r:sysfs_writable:s0 tclass=dir permissive=1
Bug:
28221393
Change-Id: I6fce1127d9d9e8bc0119bace3f142d51382401c0
William Roberts [Mon, 18 Apr 2016 20:50:33 +0000 (20:50 +0000)]
Merge "fs_config: include both oem ranges"
am:
27e0d48
* commit '
27e0d48f0be2242655d005d0d37c705d4a8ccf33':
fs_config: include both oem ranges
Change-Id: I3a5c12539e58810e09e2f41277f95c191e1daeaf
Treehugger Robot [Mon, 18 Apr 2016 20:35:27 +0000 (20:35 +0000)]
Merge "fs_config: include both oem ranges"
Dan Austin [Mon, 18 Apr 2016 18:35:09 +0000 (18:35 +0000)]
Merge "Adding gcc-specific disable of Wattributes in preparation for libcxx rebase."
am:
7984620
* commit '
798462046192ede9e723672016da5f7aa17fc988':
Adding gcc-specific disable of Wattributes in preparation for libcxx rebase.
Change-Id: Ie67479e1157d97f5b42f42b086bdaf31d738e398
Dan Austin [Mon, 18 Apr 2016 18:23:10 +0000 (18:23 +0000)]
Merge "Adding gcc-specific disable of Wattributes in preparation for libcxx rebase."
Neil Fuller [Fri, 19 Feb 2016 10:37:22 +0000 (10:37 +0000)]
Add core-lambda-stubs to default classpath for target libs compiling using javac
In order to compile lambda code javac requires various invokedynamic-
related classes to be present. This change adds stubs needed for
javac to compile lambdas.
Bug:
27475234
Bug:
26753820
Bug:
26604040
(cherry picked from commit
b08544ed7d24b7b065debc061290ec55eaeced20)
Change-Id: Ie82600da21a9dbe2348e96aef1c5e966a7a1ef5a
Yabin Cui [Sat, 16 Apr 2016 00:42:17 +0000 (17:42 -0700)]
Use strip mode mini-debug-info by default.
Bug:
27923447
Change-Id: If52eed69ea5c2e91bffacdb8520bf53deafced3e
Yabin Cui [Sat, 16 Apr 2016 00:33:39 +0000 (00:33 +0000)]
Merge "Add strip mode mini-debug-info."
am:
9a02623
* commit '
9a02623eb66519a2b4607daa883607e893f7727f':
Add strip mode mini-debug-info.
Change-Id: Ia856b0af684e62b2d17a4a92015afcb02992f523
Yabin Cui [Sat, 16 Apr 2016 00:23:50 +0000 (00:23 +0000)]
Merge "Add strip mode mini-debug-info."
Yabin Cui [Tue, 29 Mar 2016 19:22:20 +0000 (12:22 -0700)]
Add strip mode mini-debug-info.
Mini-debug-info strip mode strips most debug information, but
maintains minimal debugging information similar to
https://sourceware.org/gdb/onlinedocs/gdb/MiniDebugInfo.html.
Bug:
27923447
Change-Id: I0405f0b3c33cb3cadeafbd22ce94d645c4dbe7b9
Tao Bao [Fri, 15 Apr 2016 04:07:16 +0000 (04:07 +0000)]
Merge "Skip verifying the partition with no changed blocks."
am:
44a22a3
* commit '
44a22a34f72936f7006ce50510c2d54d19b5d798':
Skip verifying the partition with no changed blocks.
Change-Id: Id3ef138022f19be23a26cd42868b2395c313acb8
Treehugger Robot [Fri, 15 Apr 2016 04:03:42 +0000 (04:03 +0000)]
Merge "Skip verifying the partition with no changed blocks."
Tao Bao [Thu, 14 Apr 2016 22:58:05 +0000 (15:58 -0700)]
Skip verifying the partition with no changed blocks.
For incremental BBOTAs, commit [1] changed to verify only the touched
blocks to reduce the update time. This CL fixes the bug when there's no
changed block between the two builds.
[1]: commit
d522bdc9edbf64d15a59c6924853b2e2c8c39e90
Bug:
27813356
Bug:
28195498
Change-Id: Ia752d3cf034c544517458ed15df509d4596e21fa
(cherry picked from commit
f9efe284a4f8f1e40ea634c5e86f3d5e9935d8c8)
Tao Bao [Thu, 14 Apr 2016 23:22:55 +0000 (23:22 +0000)]
Merge "Makefile: Pack squashfs and f2fs tools into otatools.zip."
am:
8191f12
* commit '
8191f1231dfe45923e8a060635bf7ccbe025a665':
Makefile: Pack squashfs and f2fs tools into otatools.zip.
Change-Id: Ia035b329e08ac6baeb1a48de0bc59ae23771b7c8
Treehugger Robot [Thu, 14 Apr 2016 23:14:07 +0000 (23:14 +0000)]
Merge "Makefile: Pack squashfs and f2fs tools into otatools.zip."
Tao Bao [Thu, 14 Apr 2016 19:11:36 +0000 (12:11 -0700)]
Makefile: Pack squashfs and f2fs tools into otatools.zip.
The following tools are essential to create squashfs and f2fs images
during signing (if applicable).
squashfs: mksquashfs and mksquashfsimage.sh
f2fs: make_f2fs and mkf2fsuserimg.sh
Bug:
28179154
Change-Id: Ia48bc6d9a40d2667bc6f2c973bd0c55eed7a06fc
(cherry picked from commit
cffaf73f8471bfa2c2f19e6e51c35e30c1924aa7)
Yohann Roussel [Thu, 14 Apr 2016 21:33:33 +0000 (21:33 +0000)]
Merge "Allow to force min sdk given to Jack"
am:
6f4f2a7
* commit '
6f4f2a77939e8de843a9eb70e92e32c8054d74d5':
Allow to force min sdk given to Jack
Change-Id: I029e852c82cd2fd20739b466917542211397757c
Yohann Roussel [Thu, 14 Apr 2016 21:14:38 +0000 (21:14 +0000)]
Merge "Allow to force min sdk given to Jack"
Yohann Roussel [Thu, 14 Apr 2016 19:51:46 +0000 (21:51 +0200)]
Allow to force min sdk given to Jack
Allows setting the min sdk version for target Jack commands,
overriding the default value obtained from LOCAL_SDK_CURRENT.
Bug:
28188420
Change-Id: I1b84ad8a7b6ae30639f8ade455c1e542af5692e4
Ying Wang [Thu, 14 Apr 2016 18:58:23 +0000 (18:58 +0000)]
Merge "Reject Google\'s build of JDK."
am:
98f7a5c
* commit '
98f7a5c7446ceae437642934f3e49c870deb8066':
Reject Google's build of JDK.
Change-Id: Ie818a54ea90d960e4b570b96c006e51e32d8b76f
Ying Wang [Thu, 14 Apr 2016 18:49:07 +0000 (18:49 +0000)]
Merge "Reject Google's build of JDK."
Ying Wang [Wed, 13 Apr 2016 21:33:00 +0000 (14:33 -0700)]
Reject Google's build of JDK.
Bug:
28097637
Change-Id: I8afbd48230bdd1f198a873f72df1c178bed38d0e
David Zeuthen [Thu, 14 Apr 2016 16:16:35 +0000 (16:16 +0000)]
Merge "Add support for Brillo partitioning."
am:
2528968
* commit '
2528968871cb43a775b059a9300a7cd907c3cfce':
Add support for Brillo partitioning.
Change-Id: I64897c61190f0674ec006d3ddf3af4342d9b8970
David Zeuthen [Thu, 14 Apr 2016 16:04:30 +0000 (16:04 +0000)]
Merge "Add support for Brillo partitioning."
Tao Bao [Thu, 14 Apr 2016 01:00:23 +0000 (01:00 +0000)]
Merge "releasetools: Only verify the blocks to be touched."
am:
08d2a64
* commit '
08d2a6450516901a1de69b5b372cefffd4d506b3':
releasetools: Only verify the blocks to be touched.
Change-Id: I0dabfa0ca027c448d34451bdbd5026be318c68d5
Treehugger Robot [Thu, 14 Apr 2016 00:53:39 +0000 (00:53 +0000)]
Merge "releasetools: Only verify the blocks to be touched."