Commit Graph

32665 Commits

Author SHA1 Message Date
Narayan Kamath
080f68acf5 Merge "zipalign: remove support for adding members from gzip sources."
am: 96a4bdd9a6

Change-Id: I9c7cd486fbebdc15724da435799d0f4b81f32982
2017-02-17 14:14:51 +00:00
Narayan Kamath
96a4bdd9a6 Merge "zipalign: remove support for adding members from gzip sources." 2017-02-17 14:07:34 +00:00
Colin Cross
4cfa9fcd48 Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION"
am: 738d2de20b

Change-Id: Ifd11e6aa6a38bedb75b5b9e8fda0649faa79b6d4
2017-02-17 03:41:07 +00:00
Treehugger Robot
738d2de20b Merge "Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION" 2017-02-17 03:34:03 +00:00
Colin Cross
d3183bdf40 Set IS_AT_LEAST_* variables based on TARGET_PLATFORM_VERSION
Create a default list of minor versions (v, vDR1, vDR2, vMR1, vMR2)
for O and P, and propagate TARGET_PLATFORM_VERSION to IS_AT_LEAST_*
variables.

Test: manual
Bug: 34610721
Change-Id: I575caa099d85ee6fbc79538e67dc8d621e81790f
2017-02-16 17:08:03 -08:00
Narayan Kamath
b46507ff9e zipalign: remove support for adding members from gzip sources.
This was vestigial code and never actually called anywhere.

Test: make
Bug: 35246701
Change-Id: I9297ac5fa030d369946857414155450635b65410
2017-02-16 10:53:09 +00:00
Vishwath Mohan
f1e39159c8 Merge "Blacklist code for CFI."
am: 5f50896a7f

Change-Id: Ic7d3f0a718025a4325d3bea9d62e0ad759853d4e
2017-02-15 23:33:54 +00:00
Treehugger Robot
5f50896a7f Merge "Blacklist code for CFI." 2017-02-15 22:52:46 +00:00
Vishwath Mohan
5b69c06f1f Blacklist code for CFI.
Adds the -fsanitize-blacklist option for CFI, using the built in
blacklist at external/compiler-rt/lib/cfi/cfi_blacklist.txt.

Also refactors the CFI cflags and ldflags into ../soong/cc/makevars.go
to ensure they're consistent across Soong and make projects.

Bug: 30227045
Test: ENABLE_CFI=true m -j40 builds and boots.
Test: The blacklist prevents runtime errors that otherwise occur.
Change-Id: I0c2801ed459a3b9adeb37daff3ca212564801259
2017-02-15 12:48:05 -08:00
Dan Willemsen
8d0fda5f9e Merge "Fix init rc installation in vendor when LOCAL_MODULE_PATH is set"
am: 74dcb9feb3

Change-Id: Ic24032389bf1cf8fea7afdcc25fb05fc50bd7582
2017-02-15 00:52:15 +00:00
Treehugger Robot
74dcb9feb3 Merge "Fix init rc installation in vendor when LOCAL_MODULE_PATH is set" 2017-02-15 00:45:19 +00:00
Dan Willemsen
0c2bd30961 Merge "Support Soong native coverage"
am: c9fa07c958

Change-Id: Idf5f551c4f05feb47cb2e7a845a03b9cc1e005f5
2017-02-15 00:36:43 +00:00
Dan Willemsen
c9fa07c958 Merge "Support Soong native coverage" 2017-02-15 00:32:16 +00:00
Dan Willemsen
af402e14b8 Merge "Improve installclean to catch more installed files"
am: 22b55e1c54

Change-Id: Ib1f48169e14ba0e75873f71b090666f351fb197b
2017-02-14 02:12:13 +00:00
Treehugger Robot
22b55e1c54 Merge "Improve installclean to catch more installed files" 2017-02-14 02:06:02 +00:00
Simran Basi
13ced77ea2 Merge "Share *_OUT_TESTCASES environment variables with TF"
am: 6eeba8f6ec

Change-Id: I2b1c59292a0908a23c48ee01d8af8ff780af2028
2017-02-14 01:43:09 +00:00
Treehugger Robot
6eeba8f6ec Merge "Share *_OUT_TESTCASES environment variables with TF" 2017-02-14 01:36:44 +00:00
Colin Cross
d364511ce7 Merge "Don't build tests in normal builds"
am: 4bf332a56b

Change-Id: I0e071f8c73482395565ff68e15d828eeb0060093
2017-02-13 22:43:06 +00:00
Colin Cross
4bf332a56b Merge "Don't build tests in normal builds" 2017-02-13 22:38:28 +00:00
Tao Bao
f158f2d12b Merge "releasetools: Fix a bug in ReviseStashSize()."
am: 0ee0fc5898

Change-Id: I84877cba4ad2045e6b3597d420405987bfff7ae1
2017-02-13 22:34:04 +00:00
Tao Bao
0ee0fc5898 Merge "releasetools: Fix a bug in ReviseStashSize()." 2017-02-13 22:29:40 +00:00
Dan Willemsen
b2a5c7b369 Fix init rc installation in vendor when LOCAL_MODULE_PATH is set
The init.rc path selection uses the same partition_tag detection to
select an installation partition. So make sure that we always set
partition_tag even if we've been given an explicit module path.

Bug: 35314904
Test: set proprietary: true to Soong module with an init rc, verify
      that was the only change to build-aosp_arm64.ninja
Change-Id: Ic6ffd7a5177959db96a34a24896b242ee5b09e41
2017-02-13 14:19:47 -08:00
Simran Basi
dd050ed1b3 Share *_OUT_TESTCASES environment variables with TF
Instead of having test tools search the OUT_DIR for the
testcases folders (of which there can be multiple different
targets), let's have these variables become part of the runtime
environment after a developer has run lunch.

Bug: 35322559
Test: . build/envsetup.sh ; lunch ; printenv | grep TESTCASES
Change-Id: Ic4addc2b9727ff717b2e595b9be224650e2f1b1d
2017-02-13 13:50:14 -08:00
Dan Willemsen
f61e80b739 Improve installclean to catch more installed files
Remove more installation directories. This gets called in between each
incremental build on our build servers.

Bug: 35267243
Test: (m -j; m -j installclean; m -j) ensure no large recompiles
Change-Id: Ied6bea5cad05c1f5e98b1bd1a30fb28ff09df23b
2017-02-13 13:05:02 -08:00
Alex Deymo
bf6b5e8452 Merge "fat16copy: Allow to copy files to an existing directory."
am: 34fd8a168a

Change-Id: Iff82aa2a6d47da741e855038283193c6a928bcb7
2017-02-13 20:58:27 +00:00
Vishwath Mohan
af37b7ffb6 Merge "Disble CFI for ARM32 processes."
am: aaf4923734

Change-Id: Idf2d21931515e00ef4f75e2d1d30ecedb1940370
2017-02-13 20:55:59 +00:00
Treehugger Robot
34fd8a168a Merge "fat16copy: Allow to copy files to an existing directory." 2017-02-13 20:52:31 +00:00
Vishwath Mohan
aaf4923734 Merge "Disble CFI for ARM32 processes." 2017-02-13 20:49:20 +00:00
Tao Bao
3c5a16d49c releasetools: Fix a bug in ReviseStashSize().
We check the needed stash size in ReviseStashSize(), and may not
generate a stash command if it would exceed the max allowed size. This
CL fixes a bug when skipping a stash operation: we shouldn't update the
'stashes' map if a stash command won't be generated.

Bug: 35313668
Test: Successfully generate the package that was failing due to the bug.
Change-Id: If0a3a5fadda9b4a4edad66a2a5826b5f978400ae
2017-02-13 12:31:42 -08:00
Alex Deymo
2ee71f6946 Merge "Include the LOCAL_REQUIRED_MODULES when packaging."
am: 06f3258694

Change-Id: I2b8a1e6b0898de266e5da5d0a2ee210540e97f81
2017-02-13 16:06:39 +00:00
Alex Deymo
06f3258694 Merge "Include the LOCAL_REQUIRED_MODULES when packaging." 2017-02-13 16:01:35 +00:00
Alex Deymo
9a535b5188 fat16copy: Allow to copy files to an existing directory.
This patch re-uses existing directories when copying directories,
allowing to copy files to a directory previously created.

Bug: 34811400
Test: fat16copy.py fat.bin a/b/foo; fat16copy.py fat.bin c/d/foo

(cherry-picked from 0af24a27a8d0dc7e1782f36a5a9963021ff8b3f6)

Change-Id: I283184da18f3c4951d6c84aafa4185074791acd2
2017-02-13 16:00:07 +00:00
Simran Basi
f4e04c8f87 Merge "Update CleanSpec.mk for the common testcase directories."
am: b99df8d27d

Change-Id: I63521c4888823137f024fb5395409791dc69ab7c
2017-02-11 00:21:15 +00:00
Simran Basi
b99df8d27d Merge "Update CleanSpec.mk for the common testcase directories." 2017-02-11 00:18:19 +00:00
Mathieu Chartier
ce08de32d3 Merge "Add support for preopted app images"
am: 8d0b35cf85

Change-Id: I99e23bfbaef545717c3ad1988b9df89dc2fa80b9
2017-02-11 00:07:15 +00:00
Mathieu Chartier
8d0b35cf85 Merge "Add support for preopted app images" 2017-02-11 00:05:03 +00:00
Simran Basi
7fe57cfdcd Update CleanSpec.mk for the common testcase directories.
Fix an issue with incremental builds and the new common
testcase directories.

Bug: None
Test: Removed https://android-review.googlesource.com/#/c/234478/
      then ran `m cts-platform-version-check` then reapplied the
      change to verify the failure. Then applied this new change
      to verify the problem was resolved.

Change-Id: I77529021e852af35571fb99537d87100010b47af
2017-02-10 15:56:29 -08:00
Mathieu Chartier
192b91c97f Add support for preopted app images
Enable iff WITH_DEXPREOPT_APP_IMAGE is true.

Test: Clean + build with the flag on and off. Tested Sailfish
booting.

Bug: 34927277

(cherry picked from commit e8ab2a71d7)

Change-Id: I63f98a85c69d99746b11bb6e85c23cf5e48910cf
2017-02-10 13:39:08 -08:00
Simran Basi
ddb4256322 Merge "Output *TS testcases to their own subdir in the common testcase folders."
am: 4d49966ce3

Change-Id: I5a3538732e5526083bbea85d3867a4bcfcdc220d
2017-02-10 21:22:08 +00:00
Treehugger Robot
4d49966ce3 Merge "Output *TS testcases to their own subdir in the common testcase folders." 2017-02-10 21:11:59 +00:00
Dan Willemsen
0f90908026 Support Soong native coverage
Soong (or any other prebuilt) can provide a .gcnodir file using
LOCAL_PREBUILT_COVERAGE_ARCHIVE. Just like today, if one isn't provided
for static libraries, an empty one will be created for Make modules to
use.

Also fixes a problem I noticed including whole static libs having
coverage into static libs. It was trying to write to /WHOLE since
PRIVATE_INTERMEDIATES_DIR was not set.

Bug: 32749731
Test: See build/soong change for soong-side tests
Test: Enabled coverage of a soong static lib, then include it in a make
static lib with LOCAL_WHOLE_STATIC_LIBRARIES and ensure that the any
shared libraries using the make static lib get the embedded coverage
information.
Change-Id: I32762f099c9757074fec922ee4822f819c9ceaf5
2017-02-10 09:27:35 -08:00
Jack He
3e387c210d Merge "Remove mk file parser variables that are no longer required by system/bt"
am: af055f207a

Change-Id: Ic68923a34066fa78708ee5ed7665ca080ae5ccd3
2017-02-10 00:58:19 +00:00
Treehugger Robot
af055f207a Merge "Remove mk file parser variables that are no longer required by system/bt" 2017-02-10 00:53:25 +00:00
Dan Willemsen
03b7efd871 Merge "Sort clear_vars.mk again"
am: 05106468f8

Change-Id: Ie6a0dcae999c5f3a9b0ce25617e314594dabb1d0
2017-02-10 00:19:22 +00:00
Treehugger Robot
05106468f8 Merge "Sort clear_vars.mk again" 2017-02-10 00:14:46 +00:00
Dan Willemsen
88ac806adf Sort clear_vars.mk again
Test: none
Change-Id: Id776e81977695c4b488f44b155f2c098d5f8b61a
2017-02-09 14:28:22 -08:00
Jack He
fae1cd13f0 Remove mk file parser variables that are no longer required by system/bt
* Removed BLUETOOTH_HCI_USE_MCT
* Removed BOARD_BLUETOOTH_BDROID_HCILP_INCLUDED

Bug: 35203653, 34951912
Test: Code compilation, no user visible effects
Change-Id: Ic575d3a0fac541da3e70543d0f144ea4792bc058
2017-02-09 14:28:00 -08:00
Dan Willemsen
b7075868bd Merge "Fix "Nothing to be done" messages when launching soong_ui"
am: 576c76160b

Change-Id: Ic237295592564f32f6b916eaab3bdd5f85cf2017
2017-02-09 05:47:21 +00:00
Treehugger Robot
576c76160b Merge "Fix "Nothing to be done" messages when launching soong_ui" 2017-02-09 05:42:39 +00:00
Dan Willemsen
c5bb5a8238 Fix "Nothing to be done" messages when launching soong_ui
When specifying multiple arguments to make, we were getting messages
about nothing to be done:

m -j USE_SOONG_UI=true checkbuild tests cts blueprint_tools
...
make: Nothing to be done for `tests'.
make: Nothing to be done for `cts'.
make: Nothing to be done for `blueprint_tools'.

Test: m -j USE_SOONG_UI=true blueprint_tools libc adb
Change-Id: Id448bf0e09736fcd92ba058aec7ce556f6f778a3
2017-02-08 19:50:16 -08:00