Commit Graph

6536 Commits

Author SHA1 Message Date
Elliott Hughes
b211c8cf09 am 76eaa968: Merge "Remove HAVE_WIN32_IPC."
* commit '76eaa96875d5aac8d5141095e9e345a9ff84d814':
  Remove HAVE_WIN32_IPC.
2015-07-09 17:50:52 +00:00
Elliott Hughes
ba2f676410 Remove HAVE_WIN32_IPC.
Change-Id: I6c01ed5b059c230d7382dc6158103f31d4bf9dbb
2015-07-09 10:20:13 -07:00
Elliott Hughes
9ba0796e37 am 60dda9c4: Merge "Remove mkbootimg from the pathmap."
* commit '60dda9c44dfef577d8f95784c1554696882d83f7':
  Remove mkbootimg from the pathmap.
2015-07-08 23:22:45 +00:00
Elliott Hughes
7a4a929621 am fd5692b3: Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h."
* commit 'fd5692b32c88306cfc800bdffb10a277d9cb080a':
  Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h.
2015-07-08 23:22:44 +00:00
Elliott Hughes
60dda9c44d Merge "Remove mkbootimg from the pathmap." 2015-07-08 23:13:32 +00:00
Elliott Hughes
fd5692b32c Merge "Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h." 2015-07-08 23:11:18 +00:00
Elliott Hughes
3d949bbabc Remove mkbootimg from the pathmap.
It's only ever referred to directly. (Should probably move to
system/core/include, but that's orthogonal to this change.)

Change-Id: I353afff031a29206aaa5a0991fe0ccb39e4731e2
2015-07-08 16:05:17 -07:00
Elliott Hughes
a78f555770 am 8f548f35: Merge "Remove pathmap.mk entries for libc."
* commit '8f548f35d6c01c9dea76da885165e40aa10151f9':
  Remove pathmap.mk entries for libc.
2015-07-08 21:34:53 +00:00
Elliott Hughes
b248bf85ae Remove pathmap.mk entries for libc.
Change-Id: I9f4ce70696dd7df5922b3c80501fac9c7d4b7149
2015-07-08 14:10:23 -07:00
Elliott Hughes
5dbf4eab72 Stop polluting the namespace with HAVE_MALLOC_H in AndroidConfig.h.
Change-Id: If1cd88ee14bf9cbb4a0a1f608b0d015c9181c2c2
2015-07-08 13:12:38 -07:00
Ying Wang
8f908ade58 am 2e26f896: Merge "Simplify LOCAL_NO_CRT."
* commit '2e26f896a65563f750f2d459d13cc8edfa705d95':
  Simplify LOCAL_NO_CRT.
2015-07-02 23:06:54 +00:00
Ying Wang
491fca9809 Simplify LOCAL_NO_CRT.
Change-Id: If2486e4861071df6b225fe7f387530a38f554484
2015-07-02 15:58:34 -07:00
Elliott Hughes
b661c37f4d am cd26a2dd: Merge "Remove HAVE_STDINT_H namespace pollution."
* commit 'cd26a2dd7e2be499c9eb8b3e907cb3d31b1ed5be':
  Remove HAVE_STDINT_H namespace pollution.
2015-07-02 18:58:41 +00:00
Elliott Hughes
cd26a2dd7e Merge "Remove HAVE_STDINT_H namespace pollution." 2015-07-02 18:50:26 +00:00
Stephen Hines
fc4930034f am b2275868: Merge "Add LOCAL_NO_LIBGCC."
* commit 'b2275868e15caef2a04f0530749cc06415ef10f6':
  Add LOCAL_NO_LIBGCC.
2015-07-02 18:45:45 +00:00
Ying Wang
75011b2003 Add LOCAL_NO_LIBGCC.
This can be used to compile independent libraries without the need for
libgcc.a.

Change-Id: I924200995569d9a978ddbaa6ec321d80734f1374
2015-07-02 11:05:27 -07:00
Elliott Hughes
d47e01a3a1 Remove HAVE_STDINT_H namespace pollution.
Change-Id: I1e42d1616da0f3a90f8da189d2e919f781c4eb5a
2015-07-02 10:26:53 -07:00
Ying Wang
68787b3d1e am bbaeaa58: Merge "Configure synci generation explicitly"
* commit 'bbaeaa5879c5ab380c024bd20f35e927f4d19c87':
  Configure synci generation explicitly
2015-07-02 00:38:53 +00:00
Ying Wang
bbaeaa5879 Merge "Configure synci generation explicitly" 2015-07-01 18:58:52 +00:00
Evgenii Stepanov
be8dd6154b am 473dfdf7: Merge "Move sanitized vendor libraries to /data/vendor/lib(|64)."
* commit '473dfdf71b984fb04ae8f60b8941d89ef5c76710':
  Move sanitized vendor libraries to /data/vendor/lib(|64).
2015-06-30 21:48:40 +00:00
Evgenii Stepanov
473dfdf71b Merge "Move sanitized vendor libraries to /data/vendor/lib(|64)." 2015-06-30 21:30:29 +00:00
Evgenii Stepanov
bf140974b2 Move sanitized vendor libraries to /data/vendor/lib(|64).
Sanitized RPATH now mentions /system/vendor/lib to preserve overlay
in the case when a sanitized version of a vendor library can not be
built.

Bug: 22199458
Change-Id: I3222d2e1d6c08fdd1e0404fcb7db347aa4a92bb7
2015-06-30 14:04:45 -07:00
Tao Bao
541200792b am f40a34fd: Merge "Retry adjusting the size computation for reserved blocks."
* commit 'f40a34fd23e737b14067308700b3eef27e42d3b1':
  Retry adjusting the size computation for reserved blocks.
2015-06-30 19:31:09 +00:00
Tao Bao
4e66343b2b Retry adjusting the size computation for reserved blocks.
Due to the change in https://lwn.net/Articles/546473/, kernel reserves a
few extra blocks (lesser of 2% and 4096 blocks) on ext4 FS which leads to
OTA update failures. Adjust the size computation if the device has
BOARD_HAS_EXT4_RESERVED_BLOCKS := true.

It amends the last attemp in [1]. Now it computes the used blocks from the
make_ext4fs output, instead of altering its argument.

[1]: commit efbb5d2e69.

Bug: 21522719
Bug: 22023465
Bug: 22174684
Change-Id: Iaae6507f6de68a5892f2e3035d330039287b4492
(cherry picked from commit c7a6f1e4f8)
2015-06-30 12:17:28 -07:00
Evgenii Stepanov
ab6bbbbc46 am c8f97acc: Merge "SANITIZE_TARGET: allow undef symbols in non-sanitized shared libraries."
* commit 'c8f97acc633efe819d4343d7e9bfcb582a69baea':
  SANITIZE_TARGET: allow undef symbols in non-sanitized shared libraries.
2015-06-26 21:11:09 +00:00
Evgenii Stepanov
5adfcb166e SANITIZE_TARGET: allow undef symbols in non-sanitized shared libraries.
These symbols are defined in the ASan runtime library, which is always
present at runtime.

Bug:21785137

Change-Id: Ib8418c66323fd4cdfdc05548048f32380cb84ee5
2015-06-25 17:34:44 -07:00
Ying Wang
48f68478bd am 8f180b90: Merge "Create userdata.img with real data when SANITIZE_TARGET=address."
* commit '8f180b904f6e03fdec75b3f5cc22b8226e4985ad':
  Create userdata.img with real data when SANITIZE_TARGET=address.
2015-06-25 21:41:00 +00:00
Ying Wang
8f180b904f Merge "Create userdata.img with real data when SANITIZE_TARGET=address." 2015-06-25 21:29:52 +00:00
Ying Wang
2a04839aec Create userdata.img with real data when SANITIZE_TARGET=address.
Bug: 21785137
Change-Id: Ie0c36988759fe07419ad29bab5a71cdd0d992d2a
2015-06-25 14:29:04 -07:00
Mohamad Ayyash
af094912eb am 19cfe7db: Merge "Add img2simg in host and ota packages"
* commit '19cfe7db4ce414ce36c973fe90e94afa898194d6':
  Add img2simg in host and ota packages
2015-06-25 18:56:45 +00:00
Mohamad Ayyash
19cfe7db4c Merge "Add img2simg in host and ota packages" 2015-06-25 18:44:03 +00:00
Mohamad Ayyash
9764892031 Add img2simg in host and ota packages
Change-Id: Ide660cf3cf69c74bbd15d0ac6642b60d58f076fa
Signed-off-by: Mohamad Ayyash <mkayyash@google.com>
2015-06-24 16:08:15 -07:00
Ying Wang
cb544c2507 am 83aca79b: Merge "Don\'t include static executables when SANITIZE_TARGET=address"
* commit '83aca79b8df3296e24122f3ed9016f1463edb451':
  Don't include static executables when SANITIZE_TARGET=address
2015-06-23 20:11:24 +00:00
Elliott Hughes
1ea32049c9 am b7f56b97: Merge "Revert "Hide unwinder symbols in each binary.""
* commit 'b7f56b979bbfe00b67f6f6d573d43bcf607649eb':
  Revert "Hide unwinder symbols in each binary."
2015-06-23 19:38:36 +00:00
Elliott Hughes
b7f56b979b Merge "Revert "Hide unwinder symbols in each binary."" 2015-06-23 19:29:27 +00:00
Bart Sears
61f675bb53 Revert "Hide unwinder symbols in each binary."
This reverts commit dc30a16ba2.

Change-Id: Ib6af148bcaa3041b3040e525442a39b493852794
2015-06-23 19:23:13 +00:00
Dan Albert
a3fcd0e3d8 am 5e3fcc1e: Merge "Hide unwinder symbols in each binary."
* commit '5e3fcc1e6c5bbf7e85bd9744f178c529dd6c1d49':
  Hide unwinder symbols in each binary.
2015-06-23 18:12:43 +00:00
Dan Albert
5e3fcc1e6c Merge "Hide unwinder symbols in each binary." 2015-06-23 18:00:37 +00:00
Ying Wang
e6e544e596 Don't include static executables when SANITIZE_TARGET=address
Also we can't build the ota package without these static executables.

Bug: 21785137
Change-Id: I11b35abebced4b0608378a072ece2ab2dbadeffb
2015-06-23 10:46:03 -07:00
Ying Wang
3f249ac58f am 82f6383f: Merge "Add variable ANDROID_NO_TEST_CHECK to not build all test modules"
* commit '82f6383fa6bcfc060bbe631b8dab570e3691bb88':
  Add variable ANDROID_NO_TEST_CHECK to not build all test modules
2015-06-23 17:04:31 +00:00
Claes Elgemark
cd5bee3546 Add variable ANDROID_NO_TEST_CHECK to not build all test modules
Introduce a way to speed up local builds. Don't build all test
modules if ANDROID_NO_TEST_CHECK is set to true.

On master branch this reduces what is built by more than
300 apps and 50 java libraries. Time for doing this on a
12 core machine running with -j13 is about 10 minutes.

Change-Id: I90feb108695ee60d0dbbf497644f767cc3748215
2015-06-23 15:49:54 +02:00
Dan Albert
dc30a16ba2 Hide unwinder symbols in each binary.
These symbols need to always be resolved for each binary. Making these
symbols hidden means that we will get a build breakage if this doesn't
happen, and should also prevent the situation where one unwinder's
symbols are visible to the other.

Bug: 18471342
Bug: 19958712
Change-Id: Ieff1f10dab254b60ed120410f45998cf75bb5b9b
2015-06-22 15:54:57 -07:00
Evgenii Stepanov
cb093b1cea resolved conflicts for merge of bad5ebb6 to stage-aosp-master
Change-Id: I6837884a3258f34baaf5a7d9ca6bbd6a3f3e62e5
2015-06-19 14:22:25 -07:00
Evgenii Stepanov
5f41fc3d4d am eac1f6ed: Merge "With SANITIZE_TARGET, move shared libraries to /data."
* commit 'eac1f6edbde64e81abd06f0ca32c705751b34ca9':
  With SANITIZE_TARGET, move shared libraries to /data.
2015-06-19 21:14:19 +00:00
Evgenii Stepanov
cffed61d2f am d479a7a1: Merge "Enable SANITIZE_TARGET."
* commit 'd479a7a119b02624fe922b04125e053b2d968628':
  Enable SANITIZE_TARGET.
2015-06-19 18:26:43 +00:00
Evgenii Stepanov
a36223e7e0 Clean intermediate files if SANITIZE_TARGET has changed.
Do not clean installed files, only intermediate files. This way, two
consequitive builds first without, then with SANITIZE_TARGET will
produce a frankenbuild with both sets of shared libraries.

Bug: 21785137
Change-Id: I231868b15331be942c783458cf36233c2e7740d3
2015-06-19 11:15:50 -07:00
Evgenii Stepanov
4d3d4141ae With SANITIZE_TARGET, move shared libraries to /data.
A fully (or even mostly) asan-instrumented device will have 2 copies of each
shared library, which might not fit on system partition. Moving instrumented
libraries to /data.

Bug: 21785137
Change-Id: I64184261da2eb24a1382c67e4931c34a5a38b3c0
2015-06-19 11:15:50 -07:00
Evgenii Stepanov
d479a7a119 Merge "Enable SANITIZE_TARGET." 2015-06-19 18:15:08 +00:00
Dan Albert
cf66a79130 am 4fbb83dd: Merge "Add support for LOCAL_SANITIZE := integer."
* commit '4fbb83dd3b69729fe08e4a18dd13ca536ae7376f':
  Add support for `LOCAL_SANITIZE := integer`.
2015-06-19 18:03:12 +00:00
Dan Albert
9b187b35f3 am 20f4a364: Merge "Cleanup unused clear_vars.mk entry."
* commit '20f4a364a83d9a3906d3cf8b866d00437f8ff2d4':
  Cleanup unused clear_vars.mk entry.
2015-06-19 17:35:15 +00:00