Commit graph

4760 commits

Author SHA1 Message Date
Jeff Gaston
01452934fb Merge "Pass results of Finder into Blueprint"
am: 99a5635733

Change-Id: I135000b44c854b173382fd0b1959c00dc026e054
2017-11-09 03:13:00 +00:00
Jeff Gaston
99a5635733 Merge "Pass results of Finder into Blueprint" 2017-11-09 03:07:36 +00:00
Vishwath Mohan
fbfc32ea1b CFI include/exclude path support (Soong)
am: 1fa3ac552d

Change-Id: Ie568728de525dad6917ea3d399c49baf1e76165a
2017-11-09 03:06:06 +00:00
Vishwath Mohan
1fa3ac552d CFI include/exclude path support (Soong)
This CL adds the ability to centrally enable or disable CFI for
components using either an environment or product config
variable. This is a better, nore manageable option that enabling CFI
across each component individually.

Bug: 67507323
Test: CFI_INCLUDE_PATHS= system/nfc m -j40
Test: CFI_EXCLUDE_PATHS = frameworks/av m -j40

Change-Id: I38b77946759121aec99ab25f31aaee2e5d993f73
2017-11-08 18:56:10 -08:00
Jeff Gaston
71d64a6c4c Merge changes I73abb992,Ifcd42073
am: 06643be323

Change-Id: I9f158982dcd055165348e2a5e66257441ecf0f00
2017-11-09 00:26:13 +00:00
Jeff Gaston
06643be323 Merge changes I73abb992,Ifcd42073
* changes:
  Have sbox remove its output directory before running
  Consolidate gensrcs implementation into one task each
2017-11-09 00:23:37 +00:00
Jeff Gaston
d3e141de80 Pass results of Finder into Blueprint
Bug: 64363847
Test: m -j

Change-Id: I79db8c524af6e77c35a0199ec1876e5eb94e8971
2017-11-08 23:48:44 +00:00
Jeff Gaston
9c15f09db5 Merge "Have genrule use $genDir as sbox's --output-root"
am: 94cc5662c4

Change-Id: I4fc01748949520ba99cf7cfa6f964884bc68760c
2017-11-08 23:30:06 +00:00
Jeff Gaston
94cc5662c4 Merge "Have genrule use $genDir as sbox's --output-root" 2017-11-08 23:18:25 +00:00
Jeff Gaston
8a88db5a35 Have sbox remove its output directory before running
Bug: 38205169
Test: m -j
Change-Id: I73abb9921596c96fa056449bdf8250c2928bceda
2017-11-08 13:44:03 -08:00
Dan Willemsen
90636a4386 Fix mac build
am: 02c4c1d3f0

Change-Id: I74f6e2e62ee6730c1f7e52a7766c2f2a32c6cf5e
2017-11-08 21:20:47 +00:00
Dan Willemsen
02c4c1d3f0 Fix mac build
Test: `m nothing` on mac
Change-Id: Ibc377134dbcc5d40263697ef1e79fc31b16e0d1d
2017-11-08 12:50:38 -08:00
Dan Willemsen
35c08994a8 Merge "Setup java paths in soong_ui"
am: b760f5d638

Change-Id: I4f1fb0a45fa051a864db13c442a2fe792e815260
2017-11-08 20:40:17 +00:00
Jeff Gaston
437d23c3ad Consolidate gensrcs implementation into one task each
in preparation for each task to delete its output dir
before running.

Bug: 38205169
Test: rm out -rf && m -j

Change-Id: Ifcd42073d4fb74f532adc0c095555b4a542feb99
2017-11-08 12:38:00 -08:00
Jeff Gaston
5acec2b0e0 Have genrule use $genDir as sbox's --output-root
rather than passing buildDir .
This will make it reasonable for sbox to delete its --output-root

Bug: 38205169
Test: m -j
Change-Id: Ic3a82a8df040117870c251c068a88545143257cf
2017-11-08 12:37:14 -08:00
Dan Willemsen
b760f5d638 Merge "Setup java paths in soong_ui" 2017-11-08 20:31:30 +00:00
Nan Zhang
33ced05309 Merge "Change bool, and string properties to *bool, and *string for cc"
am: c7b8e72c91

Change-Id: I3261381cea020d913611ce8408b98a7c1c9047f7
2017-11-08 18:49:11 +00:00
Treehugger Robot
c7b8e72c91 Merge "Change bool, and string properties to *bool, and *string for cc" 2017-11-08 18:41:33 +00:00
Nan Zhang
11182f7c75 Merge "Add support for test_suites for python_binary_host and python_test_host"
am: f20e48a9e5

Change-Id: I3bccc57e754e72ae1694816da0c2137e9e94e675
2017-11-08 18:27:49 +00:00
Treehugger Robot
f20e48a9e5 Merge "Add support for test_suites for python_binary_host and python_test_host" 2017-11-08 18:23:16 +00:00
Dan Willemsen
d9e8f0a95a Setup java paths in soong_ui
This way config.mk no longer needs to check which java is in PATH and
fix it. It'll be consistent for all build steps under soong_ui.

Also unify handling of ANDROID_JAVA_HOME / JAVA_HOME with
OVERRIDE_ANDROID_JAVA_HOME / EXPERIMENTAL_USE_OPENJDK9.

Test: m nothing
Test: build/soong/soong_ui.bash --make-mode nothing (w/o envsetup.sh)
Test: aosp_arm ninja files are the same before/after
Test: before/after ninja files match with OVERRIDE_ANDROID_JAVA_HOME
Test: before/after ninja files match with EXPERIMENTAL_USE_OPENJDK9
Change-Id: Icdb65093d9c346524074de239a4f895e4230a24d
2017-11-08 00:44:47 -08:00
Isaac Chen
8fb28462e3 Generic 32-bit armv8 built as generic armv7 fix
am: 2bce8edf34

Change-Id: Icd5256871a3cd7e747a9f8fb41e6a21dac29a955
2017-11-08 04:30:55 +00:00
Isaac Chen
2bce8edf34 Generic 32-bit armv8 built as generic armv7 fix
When the following lines are specified in the BoardConfig.mk

TARGET_2ND_ARCH_VARIANT := armv8-a
TARGET_2ND_CPU_VARIANT := generic

The resulted binaries won't be built using 32-bit armv8-a integer
division instructions. Instead, division routines are used because
the build system will set a compiler option "-march=armv7-a", and
hence overwiting the previous "-march=armv8-a", when
TARGET_2ND_CPU_VARIANT is set to generic (or unset).

Bug: 67446726
Test: lunch aosp_arm64; make -j; emulator # boot to home screen
      Also verify -march=armv7-a is not specified in the compiler
      command line and the resulted binary actually uses integer
      division instructions.

Change-Id: I430687aa5a658d2ec9f325a66d849b4c8898c7d5
2017-11-08 04:17:35 +00:00
Nan Zhang
0007d810e2 Change bool, and string properties to *bool, and *string for cc
there's no use case for prepending/appending to bool, and string
properties within module struct. Declearing "*bool" and "*string" almost
cover everything user need.

I did see one case that user specify relative_install_path as
path prefix in cc_defaults, and concatenate with the one in real module
to get the final relative install path in Android.bp <bionic/tests/libs>.

Test: m -j checkbuild
Bug: b/68853585
Change-Id: If3a7a2689c3fc307aae136af6bc9c57f27a1e1a0
2017-11-07 15:57:16 -08:00
Colin Cross
d3d9624db5 Merge "Let LoadHooks call CreateModule"
am: d293e65c82

Change-Id: Ia027783ecafb1a9d4728faf0848c33ca670f3fff
2017-11-07 22:53:53 +00:00
Colin Cross
d293e65c82 Merge "Let LoadHooks call CreateModule" 2017-11-07 22:49:47 +00:00
Dan Willemsen
6dac5e74db Merge "Change storage behavior of multiproduct_kati"
am: 4eeb44b83f

Change-Id: Ib69b82eb5ea3f76c72dfba0d794d57ffa23145c5
2017-11-07 22:37:49 +00:00
Dan Willemsen
4eeb44b83f Merge "Change storage behavior of multiproduct_kati" 2017-11-07 22:25:24 +00:00
Nan Zhang
c9c6cb77d8 Add support for test_suites for python_binary_host and python_test_host
Test: manually add this property, and then check Android-aosp_arm.mk
Bug: b/35394669
Change-Id: Iddaf677839714daf4f8913ff4bf9e944d38c18db
2017-11-07 13:13:59 -08:00
Colin Cross
519917db89 Let LoadHooks call CreateModule
Move AppendProperties and PrependProperties into TopDownMutatorContext
so that LoadHooks can be a subset of TopDownMutatorContext that also
includes CreateModule.

Test: m checkbuild
Bug: 35570956
Change-Id: Iffa6a6aec96f08821c2446e0e0f4622ab772b54c
2017-11-07 13:08:36 -08:00
Dan Willemsen
4a137a9a20 Merge changes Ieaff757f,I5bdbba8d
am: 4647be4afe

Change-Id: Ia7f71f43350fec3448daf2348aa15c730e5d05cf
2017-11-07 21:05:12 +00:00
Dan Willemsen
4647be4afe Merge changes Ieaff757f,I5bdbba8d
* changes:
  pom2mk: Fix unlisted dependency types
  pom2mk: Add a flag to specify a specific version of artifacts
2017-11-07 20:59:02 +00:00
Dan Willemsen
e348076296 Change storage behavior of multiproduct_kati
Instead of deleting artifacts/logs from successful build (unless -keep
is set), and keeping unsuccessful artifacts, keep all logs and remove
all artifacts (unless -keep is set, then we'll compress the artifacts).

If -dist is passed in, we'll put an archive of the logs into the
DIST_DIR. Even compressed, the rest of the artifacts are still a bit too
large to dist (~5.6GB on AOSP).

Test: build/soong/build_test.bash
Test: build/soong/build_test.bash -keep
Test: build/soong/build_test.bash -dist
Change-Id: I87f55978c18c8ff2e517b8271554ba383003742f
2017-11-07 11:30:19 -08:00
Dan Willemsen
5f9d8a6698 pom2mk: Fix unlisted dependency types
Android Support Library 26+ does not specify dependency types, so parse
all pom files first, then propagate missing dependency types if we've
got the information.

Bug: 64723465
Test: cd prebuilts/maven_repo/android; pom2mk -use-version 26.0.0-beta2 com/android/support
Change-Id: Ieaff757ff198c9a7b4b006623340b382728c1fd4
2017-11-06 20:55:02 -08:00
Nan Zhang
b5def238f9 Merge "Support Javac sharding in Soong."
am: 7feb847418

Change-Id: Ifdc69cdbd82469b7e5415239097b4f02c1f8cd0c
2017-11-07 00:01:25 +00:00
Treehugger Robot
7feb847418 Merge "Support Javac sharding in Soong." 2017-11-06 23:54:29 +00:00
Colin Cross
0ced97e7f1 Merge changes Ie8ecb6c9,Ia9befd7c
am: a632e9f4d2

Change-Id: Ib3676e58f504899ac754ed41e1d7207d7ca19487
2017-11-06 23:16:53 +00:00
Treehugger Robot
a632e9f4d2 Merge changes Ie8ecb6c9,Ia9befd7c
* changes:
  Use relative paths in copygcclib.sh deps files
  Move -fno-canonical-system-headers to global cflags
2017-11-06 23:04:09 +00:00
Nan Zhang
61eaedbddf Support Javac sharding in Soong.
Test: m clean && m -j java and java_test.go

Change-Id: I110a0ff029448d3319aed2788d25d90a6c1a7fa0
2017-11-06 14:23:59 -08:00
Colin Cross
d7903535ea Use relative paths in copygcclib.sh deps files
Strip $PWD/ off the beginning of the path printed by gcc.

Bug: 68719465
Test: m checkbuild
Test: prebuilts/build-tools/linux-x86/bin/ninja -f out/combined-${TARGET_PRODUCT}.ninja -t deps | grep -E '^[[:space:]]*/' | sort | uniq
2017-11-06 12:56:34 -08:00
Colin Cross
39d450b374 Move -fno-canonical-system-headers to global cflags
-fno-canonical-system-headers is required for gcc to use relative
paths to system headers in deps files, and is stripped out for
clang.  Move it to the global flags so it affects windows gcc builds.

Bug: 68719465
Test: m checkbuild
Test: prebuilts/build-tools/linux-x86/bin/ninja -f out/combined-${TARGET_PRODUCT}.ninja -t deps | grep -E '^[[:space:]]*/' | sort | uniq
Change-Id: Ia9befd7cf8cfd714241e636fb786c319aecc79fe
2017-11-06 12:56:34 -08:00
Pirama Arumuga Nainar
dae7f2b07b Merge "Remove CFI-related WARs that seem no longer necessary"
am: 9c7dcfd72c

Change-Id: I0857e964d456b4e8157acfbc8f49101e409ef2f6
2017-11-06 20:34:38 +00:00
Treehugger Robot
9c7dcfd72c Merge "Remove CFI-related WARs that seem no longer necessary" 2017-11-06 20:28:23 +00:00
Jeff Gaston
af7041de2c Merge "Use flag.Parse in sbox"
am: 048bf57c33

Change-Id: I9deaec1fe643b8d218cc220cd04c424711fdb5b2
2017-11-06 20:15:07 +00:00
Jeff Gaston
048bf57c33 Merge "Use flag.Parse in sbox" 2017-11-06 20:08:24 +00:00
Colin Cross
3568303af8 Merge changes from topic "crt_cflags"
am: 5c9cf6eb84

Change-Id: I1369c0df3bf10cfe1681bffbab8f2003f1a53505
2017-11-06 19:02:47 +00:00
Colin Cross
5c9cf6eb84 Merge changes from topic "crt_cflags"
* changes:
  Remove no_default_compiler_flags property
  Move -fomit-frame-pointer to armCflags
  Consolidate ldflags that are used on all devices
  Remove -Wl,--gc-sections from target flags
  Consolidate cflags that are set on all devices
  Consolidate global cflags
2017-11-06 18:59:00 +00:00
Alan Leung
e5e233c32c Merge "Always use installed version of d8-compat-dx"
am: a39899edb9

Change-Id: I78a9725262ae5c46dea73e30a3760b150bf22189
2017-11-06 18:58:14 +00:00
Alan Leung
a39899edb9 Merge "Always use installed version of d8-compat-dx" 2017-11-06 18:54:53 +00:00
Nan Zhang
009851da32 Merge "Add default jar wrapper when wrapper property is not specified"
am: 5d37417347

Change-Id: I8449f7424286422b89e5ebf1cb7addbcfcc8d818
2017-11-06 18:07:30 +00:00