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
Mohamad Ayyash
ef08174a93
am 042e8519
: Merge "build_image.py: Make sparse squashfs images"
...
* commit '042e851999a73fd14cd612b9c934ab2b2f308b75':
build_image.py: Make sparse squashfs images
2015-06-24 22:13:08 +00:00
Mohamad Ayyash
042e851999
Merge "build_image.py: Make sparse squashfs images"
2015-06-24 22:01:00 +00:00
Mohamad Ayyash
2cd51cc711
build_image.py: Make sparse squashfs images
...
Change-Id: Iea0399868a9406f9929d8176d61d5698a2043697
Signed-off-by: Mohamad Ayyash <mkayyash@google.com >
2015-06-24 11:08:00 -07:00
Tao Bao
ca8fb0f21f
am c9fcdae2
: Merge "Fix the error in sparse_img.py"
...
* commit 'c9fcdae29dafc998f11ad49fec07d508879b8785':
Fix the error in sparse_img.py
2015-06-24 00:59:35 +00:00
Tao Bao
c9fcdae29d
Merge "Fix the error in sparse_img.py"
2015-06-24 00:50:41 +00:00
Tao Bao
109555753f
Fix the error in sparse_img.py
...
Bug: 22046423
Change-Id: I0796e14df2b523570f0c485d146273f5e5aa5494
(cherry picked from commit 2b4ff174ff
)
2015-06-23 17:44:48 -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
Ying Wang
83aca79b8d
Merge "Don't include static executables when SANITIZE_TARGET=address"
2015-06-23 19:59:56 +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
Ying Wang
82f6383fa6
Merge "Add variable ANDROID_NO_TEST_CHECK to not build all test modules"
2015-06-23 16:57:30 +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
Bo Hu
dc175a0fa8
am 3d81b7d6
: Merge "Add android.hardware.ethernet.xml for ranchu targets"
...
* commit '3d81b7d627b5076e8e850fca6233bd071f4f7c42':
Add android.hardware.ethernet.xml for ranchu targets
2015-06-23 06:49:02 +00:00
Bo Hu
3d81b7d627
Merge "Add android.hardware.ethernet.xml for ranchu targets"
2015-06-23 06:37:54 +00: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
bad5ebb619
Merge "Clean intermediate files if SANITIZE_TARGET has changed."
2015-06-19 21:05:41 +00:00
Evgenii Stepanov
eac1f6edbd
Merge "With SANITIZE_TARGET, move shared libraries to /data."
2015-06-19 21:05:31 +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
4fbb83dd3b
Merge "Add support for LOCAL_SANITIZE := integer
."
2015-06-19 17:51:11 +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
Dan Albert
abf4bc916a
Add support for LOCAL_SANITIZE := integer
.
...
This also does a bit of cleanup in config_sanitizers.mk. The result is
that `LOCAL_SANITIZE := <any arbitrary ubsan group>` should function
fine for both host and target.
This is a superset of LOCAL_DETECT_INTEGER_OVERFLOWS, so remove that.
This also checks integer division by zero. It's supposed to cover
shifting undefined behaviors as well, but apparently it does not
(though `LOCAL_SANITIZE := shift` works fine).
Change-Id: I4ac99eafa6920a3f8cb82af37ce56ff0fdb95223
2015-06-19 10:28:06 -07:00
Dan Albert
20f4a364a8
Merge "Cleanup unused clear_vars.mk entry."
2015-06-19 17:27:41 +00:00
Dan Albert
1578c487c9
Cleanup unused clear_vars.mk entry.
...
Change-Id: Ibd7b87d1364a60289609a267a287c4afa1d5e5cb
2015-06-19 10:24:07 -07:00
Miroslav Tisma
39b59502c7
Add android.hardware.ethernet.xml for ranchu targets
...
This commit adds android.hardware.ethernet.xml file for ethernet
permission to PRODUCT_COPY_FILES which will be copied to
/system/etc/permission folder on the target. Reason for adding
this permission file is for enabling the ethernet and having
functional networking until RIL backend support in ranchu is
implemented.
This requires dhcpcd_eth0 service definition in init.ranchu.rc.
Architectures that use goldfish emulator do not need ethernet
support, because networking is provided by RIL.
Change-Id: I7972f80cf78c0fdecf3fde45bf018230bbcefd38
2015-06-19 11:35:38 +02:00
Evgenii Stepanov
3632cc3241
Enable SANITIZE_TARGET.
...
The same as SANITIZE_HOST, but for the target.
Also, skip all LOCAL_FORCE_STATIC_EXECUTABLE targets, as ASan does not
support static linking.
Bug: 21785137
Change-Id: Ief53ff8de1fee18f230d6c7dd31845db5bbd415c
2015-06-18 18:24:40 -07:00
Ying Wang
1010cc8123
am c5672344
: Merge "Really include drawables for all densities."
...
* commit 'c567234484c9aa5b8ea2061e710109da9cc36c83':
Really include drawables for all densities.
2015-06-17 21:26:55 +00:00
Ying Wang
c567234484
Merge "Really include drawables for all densities."
2015-06-17 21:18:48 +00:00
Ying Wang
f054bd34b6
Really include drawables for all densities.
...
Previously with "PRODUCT_AAPT_CONFIG := normal" resource with modifier
"small" isn't included.
Bug: 21643610
Change-Id: I53940d716fb9705462b1abb882e04103e211f8af
2015-06-17 21:18:09 +00:00
Dan Albert
c01c0a1c8d
am 06f0a137
: Merge "Remove LOCAL_ADDRESS_SANITIZER."
...
* commit '06f0a137dce58bf75576b0a2d0a5e7410dae919d':
Remove LOCAL_ADDRESS_SANITIZER.
2015-06-17 17:32:41 +00:00
Dan Albert
e514639feb
am 2a884eef
: Merge "Stop disallowing sanitizers."
...
* commit '2a884eeff61c3e0302660660ccb174a52236910a':
Stop disallowing sanitizers.
2015-06-17 17:32:39 +00:00
Dan Albert
06f0a137dc
Merge "Remove LOCAL_ADDRESS_SANITIZER."
2015-06-17 17:21:27 +00:00
Dan Albert
2a884eeff6
Merge "Stop disallowing sanitizers."
2015-06-17 17:19:25 +00:00
Elliott Hughes
e6faff17ff
am 40990c83
: Merge "Revert "[MIPS] Do not use compact branches until GDB supports them""
...
* commit '40990c83f0d719d37cd48e52b55fb59b748531b0':
Revert "[MIPS] Do not use compact branches until GDB supports them"
2015-06-17 17:12:35 +00:00
Elliott Hughes
40990c83f0
Merge "Revert "[MIPS] Do not use compact branches until GDB supports them""
2015-06-17 17:02:53 +00:00