OSDN Git Service

android-x86/build.git
8 years agoRemove arm-specific -Wno-psabi
Dan Willemsen [Fri, 6 May 2016 22:50:19 +0000 (15:50 -0700)]
Remove arm-specific -Wno-psabi

This flag was added to stop a GCC 4.4 specific warning. Since we've
upgraded, this flag is no longer necessary. It's already stripped for
clang builds, and I found no instances in the logs after removing it.

Change-Id: If5316d2eb8066dc43d7af7aebc7e4920b4ada192

8 years agoMerge "Harden dependency on generated sources."
Treehugger Robot [Fri, 6 May 2016 20:16:40 +0000 (20:16 +0000)]
Merge "Harden dependency on generated sources."

8 years agoMerge "Avoid accidentally using the host's native 'as' command."
Elliott Hughes [Fri, 6 May 2016 20:11:45 +0000 (20:11 +0000)]
Merge "Avoid accidentally using the host's native 'as' command."

8 years agoHarden dependency on generated sources.
Ying Wang [Fri, 6 May 2016 03:02:08 +0000 (20:02 -0700)]
Harden dependency on generated sources.

Previously if a library has custom generated headers in
LOCAL_GENERATED_SOURCES and export its include path with
LOCAL_EXPORT_C_INCLUDE_DIRS, there is almost no way for the users of the
library to set up dependency of their object files on the generated
headers.
This change makes the generated sources dependency of the library's
export_includes, which is guaranteed generated before client code gets
compiled.

Also we added proto-generated cpp files to my_generated_sources so that
we can deal solely with $(my_generated_sources). Because many
Android.mks assume the generted .pb.hs are in $(generated_sources_dir)
instead of $(intermediates), we have to generate the source files in
$(generated_sources_dir) and make a copy in $(intermediates).

Bug: 28622149
Change-Id: I73b21443fa706f3735faf16356ed8c08fbfecca6

8 years agoMerge "Only pass NINJA_ARGS to the main ninja compile"
Treehugger Robot [Fri, 6 May 2016 01:11:39 +0000 (01:11 +0000)]
Merge "Only pass NINJA_ARGS to the main ninja compile"

8 years agoOnly pass NINJA_ARGS to the main ninja compile
Dan Willemsen [Thu, 5 May 2016 23:52:37 +0000 (16:52 -0700)]
Only pass NINJA_ARGS to the main ninja compile

This way commands like "-t query <target>" will work against the main
build, instead of failing to find the target during the initial soong
build and stopping.

Change-Id: I9b6bd6ac431b95e12db69ec7f272669b9d292761

8 years agoAvoid accidentally using the host's native 'as' command.
Alistair Strachan [Thu, 5 May 2016 23:29:08 +0000 (16:29 -0700)]
Avoid accidentally using the host's native 'as' command.

When invoking clang for the host to assemble .S files, the -B flag
would not be provided, which allowed the host prebuilt clang to
use an 'as' from the native environment. Most of the time this
"just works", but some newer 'as' versions cause problems with
the older prebuilt toolchain, for example by generating
unsupported relocation types.

To avoid this problem, simply use the -B flag to tell clang to
invoke the assembler from the correct prebuilt gcc prefix.

Change-Id: I18ea4f37ae637b652cfd7321c41929f8be075342
Signed-off-by: Alistair Strachan <alistair.strachan@imgtec.com>
8 years agoMerge "JAR signing logic for the apksigner-core library."
Treehugger Robot [Thu, 5 May 2016 22:42:43 +0000 (22:42 +0000)]
Merge "JAR signing logic for the apksigner-core library."

8 years agoMerge "SHA-256 with ECDSA supported only on API Level 21 and higher."
Alex Klyubin [Thu, 5 May 2016 19:43:53 +0000 (19:43 +0000)]
Merge "SHA-256 with ECDSA supported only on API Level 21 and higher."

8 years agoMerge "Update prebuilt build tools path"
Colin Cross [Thu, 5 May 2016 18:54:37 +0000 (18:54 +0000)]
Merge "Update prebuilt build tools path"

8 years agoJAR signing logic for the apksigner-core library.
Alex Klyubin [Thu, 5 May 2016 17:50:24 +0000 (10:50 -0700)]
JAR signing logic for the apksigner-core library.

apksigner-code library will offer a high-level primitive (future
commit) for signing APKs. This is meant to be used by
build/tools/signapk and Android Studio's APK builder/signer.

This commit adds a lower-level JAR signing (aka v1 signing) code which
will be used by the future APK signing abstraction exposed by this
library.

All classes added by this commit are internal (i.e., implementation
details of this library). Clients of this library should not be using
these classes.

Bug: 26516150
Change-Id: I5cecd435e63aab206d63868be5e0d0e289e7c423

8 years agoMerge "Pass SANTIIZE_HOST and SANITIZE_TARGET to soong"
Colin Cross [Wed, 4 May 2016 23:34:53 +0000 (23:34 +0000)]
Merge "Pass SANTIIZE_HOST and SANITIZE_TARGET to soong"

8 years agoUpdate prebuilt build tools path
Colin Cross [Tue, 19 Apr 2016 22:32:22 +0000 (15:32 -0700)]
Update prebuilt build tools path

Build tools have been moved from prebuilts/sdk/tools to
prebuilts/build-tools.

Bug: 27857138
Change-Id: I60be42c197d420897dab77808c25818c9d2e81df

8 years agoMerge "Update RS to use latest Clang-2812033 prebuilts as well."
Pirama Arumuga Nainar [Wed, 4 May 2016 21:00:07 +0000 (21:00 +0000)]
Merge "Update RS to use latest Clang-2812033 prebuilts as well."

8 years agoSHA-256 with ECDSA supported only on API Level 21 and higher.
Alex Klyubin [Wed, 4 May 2016 01:12:45 +0000 (18:12 -0700)]
SHA-256 with ECDSA supported only on API Level 21 and higher.

Turns out APK signatures using SHA-256 with ECDSA are accepted only by
platforms with API Level 21 and higher, not 18 and higher.

Bug: 28296599

Change-Id: I3fab5be17bf3a9bdbf4d84d90d51448027c7e761

8 years agoMerge "Update path to reverse_path.py"
Colin Cross [Tue, 3 May 2016 21:13:22 +0000 (21:13 +0000)]
Merge "Update path to reverse_path.py"

8 years agoMerge "Separate logic for alg selection for OTA and APK signing."
Alex Klyubin [Tue, 3 May 2016 20:50:54 +0000 (20:50 +0000)]
Merge "Separate logic for alg selection for OTA and APK signing."

8 years agoUpdate path to reverse_path.py
Colin Cross [Mon, 2 May 2016 22:31:17 +0000 (15:31 -0700)]
Update path to reverse_path.py

Change-Id: I98902e94a99fae7f9e738a872a83acb98d32c781

8 years agoMerge "old-cts: Add testng and libcoreoj test support"
Igor Murashkin [Mon, 2 May 2016 20:40:09 +0000 (20:40 +0000)]
Merge "old-cts: Add testng and libcoreoj test support"

8 years agoMerge "Initialize an uninitialized field in ijar"
Shinichiro Hamaji [Mon, 2 May 2016 19:00:42 +0000 (19:00 +0000)]
Merge "Initialize an uninitialized field in ijar"

8 years agoInitialize an uninitialized field in ijar
Shinichiro Hamaji [Mon, 2 May 2016 18:19:23 +0000 (03:19 +0900)]
Initialize an uninitialized field in ijar

The upstream patch was merged:
https://github.com/bazelbuild/bazel/commit/a5004430338bc72817c7

Bug: 28347190
Change-Id: I9b8b9bc830bd16299b94e8c92c22dba8aa36affb

8 years agoMerge "Fix google-explicit-constructor warnings."
Chih-hung Hsieh [Mon, 2 May 2016 18:08:16 +0000 (18:08 +0000)]
Merge "Fix google-explicit-constructor warnings."

8 years agoMerge "Suppress google-* checks in vendor modules."
Chih-hung Hsieh [Sat, 30 Apr 2016 00:38:35 +0000 (00:38 +0000)]
Merge "Suppress google-* checks in vendor modules."

8 years agoUpdate RS to use latest Clang-2812033 prebuilts as well.
Stephen Hines [Fri, 29 Apr 2016 23:50:48 +0000 (16:50 -0700)]
Update RS to use latest Clang-2812033 prebuilts as well.

Change-Id: I62e294e2b8c882c235a6ac7518fa352acd46e055

8 years agoSuppress 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

8 years agoFix google-explicit-constructor warnings.
Chih-Hung Hsieh [Fri, 29 Apr 2016 21:10:10 +0000 (14:10 -0700)]
Fix google-explicit-constructor warnings.

Bug: 28341362
Change-Id: I72bdd1df09cea91743aa89dab4cb0b9db2657e2d

8 years agoMerge "zipalign supports -p also when checking alignment."
Alex Klyubin [Fri, 29 Apr 2016 20:26:17 +0000 (20:26 +0000)]
Merge "zipalign supports -p also when checking alignment."

8 years agozipalign 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

8 years agoMerge "Switch to clang-2812033."
Stephen Hines [Wed, 27 Apr 2016 22:33:05 +0000 (22:33 +0000)]
Merge "Switch to clang-2812033."

8 years agoMerge "Use strip mode mini-debug-info by default except on mips."
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."

8 years agoMerge "Warn if there is file with unknown suffix in Java module's sources."
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."

8 years agoUse strip mode mini-debug-info by default except on mips.
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

8 years agoold-cts: Add testng and libcoreoj test support
Igor Murashkin [Wed, 27 Apr 2016 00:00:22 +0000 (17:00 -0700)]
old-cts: Add testng and libcoreoj test support

Bug: 27521545
Change-Id: I2a954401ce47604987a437a2741bcab252d32707

8 years agoWarn if there is file with unknown suffix in Java module's sources.
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

8 years agoMerge "ccache: Allow external setting of CCACHE_COMPILERCHECK variable"
Mohammed Habibulla [Tue, 26 Apr 2016 22:14:17 +0000 (22:14 +0000)]
Merge "ccache: Allow external setting of CCACHE_COMPILERCHECK variable"

8 years agoSwitch to clang-2812033.
Stephen Hines [Tue, 26 Apr 2016 21:34:24 +0000 (14:34 -0700)]
Switch to clang-2812033.

Bug: http://b/25291096
Change-Id: I630b7e8a682e3c3b82ad9837b664c1155497618f

8 years agoMerge "Add tidy.mk to set up global default checks."
Chih-hung Hsieh [Tue, 26 Apr 2016 01:41:42 +0000 (01:41 +0000)]
Merge "Add tidy.mk to set up global default checks."

8 years agoAdd tidy.mk to set up global default checks.
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

8 years agoMerge "target_files_diff: Fix the issue with file type change."
Treehugger Robot [Mon, 25 Apr 2016 19:08:53 +0000 (19:08 +0000)]
Merge "target_files_diff: Fix the issue with file type change."

8 years agotarget_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)

8 years agoSeparate logic for alg selection for OTA and APK signing.
Alex Klyubin [Mon, 25 Apr 2016 18:07:03 +0000 (11:07 -0700)]
Separate logic for alg selection for OTA and APK signing.

The rules for which digest algorithms are accepted by the Android
platform for APK signatures and OTA update package signatures are
different. For example, the set of digest algorithms accepted for APK
signatures depends on the signing key algorithm and the platform's
API Level. Whereas the set of digest algorithms accepted for OTA
update package signatures by Recovery depends on the list produced
by the build system, which in turn produces the list based on the
key algorithm and digest used in the signing certificate.

To reflect this reality, this refactoring CL explicitly separates
signapk's logic for choosing the digest algorithm to use for v1
signing from its logic for choosing the digest algorithm to use for
OTA update package signing.

Bug: 28296599
Change-Id: Ic7aa77e89622d727e985f8749071284746be7f45

8 years agoMerge "make croot slightly more useful"
Marie Janssen [Mon, 25 Apr 2016 14:54:44 +0000 (14:54 +0000)]
Merge "make croot slightly more useful"

8 years agomake 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

8 years agoMerge "Switch mips64 back to NDK r10."
Dan Albert [Fri, 22 Apr 2016 21:19:58 +0000 (21:19 +0000)]
Merge "Switch mips64 back to NDK r10."

8 years agoSwitch 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

8 years agoMerge "Update the path to clean_header.py on the documentation."
Treehugger Robot [Fri, 22 Apr 2016 18:11:18 +0000 (18:11 +0000)]
Merge "Update the path to clean_header.py on the documentation."

8 years agoUpdate 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

8 years agoMerge changes I6e98fc65,Ia8665e7c
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

8 years agoRemove bootclasspath handling for Jack
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

8 years agoMerge "Call clang-tidy based on WITH_TIDY* variables."
Chih-hung Hsieh [Thu, 21 Apr 2016 21:01:45 +0000 (21:01 +0000)]
Merge "Call clang-tidy based on WITH_TIDY* variables."

8 years agoCall 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

8 years agoRemove static libraries from Jack classpath
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

8 years agoMerge "Add input dependencies to .img targets"
Shinichiro Hamaji [Thu, 21 Apr 2016 06:10:38 +0000 (06:10 +0000)]
Merge "Add input dependencies to .img targets"

8 years agoMerge "Add normalize_path.py to prerequisites"
Shinichiro Hamaji [Thu, 21 Apr 2016 05:34:06 +0000 (05:34 +0000)]
Merge "Add normalize_path.py to prerequisites"

8 years agoMerge "Allow to build native tests for translation arch only."
Ying Wang [Wed, 20 Apr 2016 20:58:16 +0000 (20:58 +0000)]
Merge "Allow to build native tests for translation arch only."

8 years agoAllow 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)

8 years agoMerge "Make jack_check_timestamp depend on setup-jack-server"
Yohann Roussel [Wed, 20 Apr 2016 12:08:35 +0000 (12:08 +0000)]
Merge "Make jack_check_timestamp depend on setup-jack-server"

8 years agoMake 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

8 years agoMerge "Enable asan/ubsan for mips"
Stephen Hines [Wed, 20 Apr 2016 04:44:39 +0000 (04:44 +0000)]
Merge "Enable asan/ubsan for mips"

8 years agoMerge "Don't reset LOCAL_*MODULE_STEM."
Ying Wang [Tue, 19 Apr 2016 20:50:38 +0000 (20:50 +0000)]
Merge "Don't reset LOCAL_*MODULE_STEM."

8 years agoDon'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

8 years agoMerge "Make sure platform libraries are built, regardless of webview.apk"
Dimitry Ivanov [Tue, 19 Apr 2016 17:07:20 +0000 (17:07 +0000)]
Merge "Make sure platform libraries are built, regardless of webview.apk"

8 years agoMake 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

8 years agoAdd input dependencies to .img targets
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

8 years agoMerge "Add core-lambda-stubs to default classpath for target libs compiling using...
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"

8 years agoAdd normalize_path.py to prerequisites
Shinichiro Hamaji [Tue, 19 Apr 2016 07:17:55 +0000 (16:17 +0900)]
Add normalize_path.py to prerequisites

Bug: 27954979
Change-Id: I1e22eb4f42a8cb348ce1101e207e239bc5aa7976

8 years agoMerge "Revert "Use strip mode mini-debug-info by default.""
Yabin Cui [Tue, 19 Apr 2016 03:42:04 +0000 (03:42 +0000)]
Merge "Revert "Use strip mode mini-debug-info by default.""

8 years agoRevert "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

8 years agoMerge "Use strip mode mini-debug-info by default."
Yabin Cui [Tue, 19 Apr 2016 02:52:21 +0000 (02:52 +0000)]
Merge "Use strip mode mini-debug-info by default."

8 years agoMerge "Move sysfs_writable to emulator specific policy"
Treehugger Robot [Mon, 18 Apr 2016 23:14:50 +0000 (23:14 +0000)]
Merge "Move sysfs_writable to emulator specific policy"

8 years agoMove sysfs_writable to emulator specific policy
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

8 years agoMerge "Address emulator specific SELinux denials"
Nick Kralevich [Mon, 18 Apr 2016 22:17:16 +0000 (22:17 +0000)]
Merge "Address emulator specific SELinux denials"

8 years agoAddress 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

8 years agoMerge "fs_config: include both oem ranges"
Treehugger Robot [Mon, 18 Apr 2016 20:35:27 +0000 (20:35 +0000)]
Merge "fs_config: include both oem ranges"

8 years agoMerge "Adding gcc-specific disable of Wattributes in preparation for libcxx rebase."
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."

8 years agoAdd core-lambda-stubs to default classpath for target libs compiling using javac
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

8 years agoUse strip mode mini-debug-info by default.
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

8 years agoMerge "Add strip mode mini-debug-info."
Yabin Cui [Sat, 16 Apr 2016 00:23:50 +0000 (00:23 +0000)]
Merge "Add strip mode mini-debug-info."

8 years agoAdd 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

8 years agoMerge "Skip verifying the partition with no changed blocks."
Treehugger Robot [Fri, 15 Apr 2016 04:03:42 +0000 (04:03 +0000)]
Merge "Skip verifying the partition with no changed blocks."

8 years agoSkip 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)

8 years agoMerge "Makefile: Pack squashfs and f2fs tools into otatools.zip."
Treehugger Robot [Thu, 14 Apr 2016 23:14:07 +0000 (23:14 +0000)]
Merge "Makefile: Pack squashfs and f2fs tools into otatools.zip."

8 years agoMakefile: 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)

8 years agoMerge "Allow to force min sdk given to Jack"
Yohann Roussel [Thu, 14 Apr 2016 21:14:38 +0000 (21:14 +0000)]
Merge "Allow to force min sdk given to Jack"

8 years agoAllow 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

8 years agoMerge "Reject Google's build of JDK."
Ying Wang [Thu, 14 Apr 2016 18:49:07 +0000 (18:49 +0000)]
Merge "Reject Google's build of JDK."

8 years agoReject 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

8 years agoMerge "Add support for Brillo partitioning."
David Zeuthen [Thu, 14 Apr 2016 16:04:30 +0000 (16:04 +0000)]
Merge "Add support for Brillo partitioning."

8 years agoMerge "releasetools: Only verify the blocks to be touched."
Treehugger Robot [Thu, 14 Apr 2016 00:53:39 +0000 (00:53 +0000)]
Merge "releasetools: Only verify the blocks to be touched."

8 years agoreleasetools: Only verify the blocks to be touched.
Tao Bao [Tue, 12 Apr 2016 22:53:16 +0000 (15:53 -0700)]
releasetools: Only verify the blocks to be touched.

For incremental BBOTAs, we used to verify the integrity of all the
blocks in the source partition. In order to reduce the time cost under
recovery, this CL changes to only verify the blocks that will be touched
in the given OTA package (BBOTA >= 3 only). This is a trade-off between
performance and reliability.

Bug: 27813356
Change-Id: I3975ae6f461f0f7e58d24f1df7df46a449d2988b
(cherry picked from commit d522bdc9edbf64d15a59c6924853b2e2c8c39e90)

8 years agoMerge "Monotonic flag sets incorrectly in rangelib"
Tianjie Xu [Wed, 13 Apr 2016 21:48:53 +0000 (21:48 +0000)]
Merge "Monotonic flag sets incorrectly in rangelib"

8 years agoMonotonic flag sets incorrectly in rangelib
Tianjie Xu [Fri, 8 Apr 2016 03:17:48 +0000 (20:17 -0700)]
Monotonic flag sets incorrectly in rangelib

After applying update_target_files_incr_ext4.sh, some files may end up
occupying unsorted block fragments. In one example, an apk file has the
block range [258768-259211,196604]. The monotonic flag in rangelib sets
incorrectly for this example and leads to a bad input file for imgdiff.
After fixing the flag, bsdiff is called instead of imgdiff and the
incremental OTA package generates successfully.

Bug:28053885
Change-Id: Ib841bf449ff6a29314fc4a1b8fba941a6dc532ac

8 years agoMerge "Remove post-install verification"
Tianjie Xu [Wed, 13 Apr 2016 19:19:03 +0000 (19:19 +0000)]
Merge "Remove post-install verification"

8 years agoAdd support for Brillo partitioning.
David Zeuthen [Fri, 8 Apr 2016 19:08:03 +0000 (15:08 -0400)]
Add support for Brillo partitioning.

To generate partition tables in the Android build system, simply add
the path to a .bpt file to the BOARD_BPT_INPUT_FILES variable.

 BOARD_BPT_INPUT_FILES += "hardware/bsp/vendor/soc/board/board-specific.bpt"

The variable BOARD_BPT_DISK_SIZE can be used to specify or override
the disk size, for example:

 BOARD_BPT_DISK_SIZE := "10 GiB"

Additional arguments to 'bpttool make_table' can be specified in the
variable BOARD_BPT_MAKE_TABLE_ARGS.

If BOARD_BPT_INPUT_FILES is set, the build system generates two files

 partition-table.img
 partition-table.bpt

in ${ANDROID_PRODUCT_OUT} using 'bpttool make_table'. The former is
the binary partition tables generated using bptool's --output_gpt
option and the latter is a JSON file generated using the --output_json
option. These files will also be put in the IMAGES/ directory of
target-files.zip when running 'm dist'.

BUG=27831397
TEST=Manually tested.

Change-Id: Iedd15354afb2dd483dcb9bc001360b2a37fd6dc0

8 years agoMerge "Always use ensure_start to ensure goma's daemon runs"
Shinichiro Hamaji [Wed, 13 Apr 2016 05:07:00 +0000 (05:07 +0000)]
Merge "Always use ensure_start to ensure goma's daemon runs"

8 years agoRemove post-install verification
Tianjie Xu [Fri, 25 Mar 2016 22:01:33 +0000 (15:01 -0700)]
Remove post-install verification

post-install verification calls range_sha1() and checks if the given
partition has expected contents. It takes roughly 20 seconds on
angler with 2.8G system image. Remove it to speed up OTA update. Also
abort the update if block_image_update() fails, as we were relying on
post-install verification to capture block_image_update() failures.

cherry-picked from commit b2deb220335e1059a3c95d8063705f5706604bdb
Bug: 27729678
Change-Id: I8123cd8929295ec26df247acf6bb51df813771d9

8 years agoMerge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS"
Treehugger Robot [Tue, 12 Apr 2016 21:24:51 +0000 (21:24 +0000)]
Merge "Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS"

8 years agoMerge "releasetools: Use fixed timestamp in otacerts.zip."
Tao Bao [Tue, 12 Apr 2016 16:32:32 +0000 (16:32 +0000)]
Merge "releasetools: Use fixed timestamp in otacerts.zip."

8 years agoAdd support for LOCAL_EXPORT_*_LIBRARY_HEADERS
Christopher Wiley [Mon, 11 Apr 2016 19:40:36 +0000 (12:40 -0700)]
Add support for LOCAL_EXPORT_*_LIBRARY_HEADERS

Listing a library in any of:

  LOCAL_EXPORT_SHARED_LIBRARY_HEADERS
  LOCAL_EXPORT_STATIC_LIBRARY_HEADERS

will cause the headers exported by that library to be exported from
the current library target as well.

This means that when library A's public headers include headers from
library B, library C which consumes A no longer has to explicitly list
A and B in its LOCAL_SHARED_LIBRARIES for the purpose of picking up B's
headers.

Bug: 27804373
Test: Introduced dependency on libbase to libbinder at the header level.
      Libraries that consume libbinder do not need to explicitly depend
      on libbase.

Change-Id: If69079f058a4a182c5ef5a3c5ba15035570da22d

8 years agoreleasetools: Use fixed timestamp in otacerts.zip.
Tao Bao [Tue, 12 Apr 2016 06:05:52 +0000 (23:05 -0700)]
releasetools: Use fixed timestamp in otacerts.zip.

We were using zipfile.write() to write system/etc/security/otacerts.zip
when signing for release. It led to unexpected timestamp change in the
generated otacerts.zip and non-idempotent signed images when signing the
same target_files.zip.

Replace with common.ZipWrite() to always use a fixed timestamp.

Bug: 28122968
Change-Id: Ia6cf4b7d380cbf72ed7050ebb60c932dc8826d87
(cherry picked from commit 7ee3a9678e7191c48f0ba4e04792fe97925c1aa1)