Commit Graph

5631 Commits

Author SHA1 Message Date
Nan Zhang be36215591 Merge "Change bool, and string properties to *bool, and *string for cc" am: c7b8e72c91 am: 33ced05309
am: e608086c05

Change-Id: I90f35c184fe0fd6dd46b3a11db664c2128512d39
2017-11-08 19:01:37 +00:00
Nan Zhang e608086c05 Merge "Change bool, and string properties to *bool, and *string for cc" am: c7b8e72c91
am: 33ced05309

Change-Id: I8ae9465e51ce53f6674456a9ca484e02a94d8479
2017-11-08 18:54:47 +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 047524e822 Merge "Add support for test_suites for python_binary_host and python_test_host" am: f20e48a9e5 am: 11182f7c75
am: fb6351b99d

Change-Id: Ie6e59fbff7433fefc1a90f1de11be8f9c4385171
2017-11-08 18:33:17 +00:00
Nan Zhang fb6351b99d Merge "Add support for test_suites for python_binary_host and python_test_host" am: f20e48a9e5
am: 11182f7c75

Change-Id: I14fd4c05e3b69aba8c454b17d75eca8683defdef
2017-11-08 18:29:46 +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 e36b180f54 Generic 32-bit armv8 built as generic armv7 fix am: 2bce8edf34 am: 8fb28462e3
am: 8f5d5282e0

Change-Id: I2bf4294ae75c3f00a41bf6f0cc762bd4671ee88d
2017-11-08 04:34:28 +00:00
Isaac Chen 8f5d5282e0 Generic 32-bit armv8 built as generic armv7 fix am: 2bce8edf34
am: 8fb28462e3

Change-Id: I5d201fe98a393d1f3cc50761b0b01c27b08a569a
2017-11-08 04:32:26 +00: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 a72ab45f24 Merge "Let LoadHooks call CreateModule" am: d293e65c82 am: d3d9624db5
am: fe7fc8b7ce

Change-Id: I82ab51f9ad316e0cb4f5b53a260e28258e96e7b3
2017-11-07 23:07:57 +00:00
Colin Cross fe7fc8b7ce Merge "Let LoadHooks call CreateModule" am: d293e65c82
am: d3d9624db5

Change-Id: Ib2a85b703e5d70c00265af99f27cbff19c644a49
2017-11-07 22:59:57 +00: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 e10f73c775 Merge "Change storage behavior of multiproduct_kati" am: 4eeb44b83f am: 6dac5e74db
am: b4524dec16

Change-Id: I30c53efa86a5380d37d51dc42457001b3d7bd86b
2017-11-07 22:49:26 +00:00
Dan Willemsen b4524dec16 Merge "Change storage behavior of multiproduct_kati" am: 4eeb44b83f
am: 6dac5e74db

Change-Id: I2d1bdb16aeb37fdf3bd7a31e91f38c01a646e5e2
2017-11-07 22:42: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
Colin Cross 5a79c83893 Add presingletons
Plumb blueprint's presingletons through register.go.

Test: m checkbuild
Change-Id: I5bc0f311740c9220f7afdf2999e6f080f5b0c5ab
2017-11-07 13:36:44 -08:00
Colin Cross 99c6dfaecc Add OncePer.Get()
Allow functions to get the result associated with a OncePer key without
also specifiying a function.  Panics if the key has not already been
set.  Also replace the open-coded concurrent map implementation with
the new sync.Map.

Test: m checkbuild
Change-Id: I814fdb1ffffaee8398dc877af146e29638c8a6a8
2017-11-07 13:36:44 -08:00
Dan Willemsen 048889cac4 Merge changes Ieaff757f,I5bdbba8d am: 4647be4afe am: 4a137a9a20
am: a6338ffadb

Change-Id: I394e2b4bd79788db940ec3a339185f12978de8ce
2017-11-07 21:16:11 +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
Dan Willemsen a6338ffadb Merge changes Ieaff757f,I5bdbba8d am: 4647be4afe
am: 4a137a9a20

Change-Id: Ib1d18cd89d638485f3e26639534ad44663dae9c5
2017-11-07 21:10:01 +00: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 97406cd0f8 Merge "Support Javac sharding in Soong." am: 7feb847418 am: b5def238f9
am: 55d33d5473

Change-Id: I2dc07430bd2dcf2e9779a54dcb6950cb3d193f6b
2017-11-07 00:07:53 +00:00
Nan Zhang 55d33d5473 Merge "Support Javac sharding in Soong." am: 7feb847418
am: b5def238f9

Change-Id: Ibcd1776dad54cf4ddfde559a81f52b4e0c1bcc84
2017-11-07 00:03:23 +00: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 ee40f04b3c Merge changes Ie8ecb6c9,Ia9befd7c am: a632e9f4d2 am: 0ced97e7f1
am: 354b878e31

Change-Id: I8e548d8508bf5d0816f772f00103344df0ed1eb7
2017-11-06 23:25:50 +00:00
Colin Cross 354b878e31 Merge changes Ie8ecb6c9,Ia9befd7c am: a632e9f4d2
am: 0ced97e7f1

Change-Id: Ie512bf688ddc79699ebab9591b2baa310993d12a
2017-11-06 23:18:48 +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 cc9206b313 Merge "Remove CFI-related WARs that seem no longer necessary" am: 9c7dcfd72c am: dae7f2b07b
am: 46695ac392

Change-Id: I718895793df2a93bbe86a3d8f6e1f4e8dfa6f49c
2017-11-06 20:39:40 +00:00
Pirama Arumuga Nainar 46695ac392 Merge "Remove CFI-related WARs that seem no longer necessary" am: 9c7dcfd72c
am: dae7f2b07b

Change-Id: I5c42064638ddbe712da76d3ff9b0116faebe68c4
2017-11-06 20:37:09 +00: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 9419f9ff22 Merge "Use flag.Parse in sbox" am: 048bf57c33 am: af7041de2c
am: 2ddd80f4a3

Change-Id: I1637712b97fbb96bc5a3e1da961da6fef8a5cfed
2017-11-06 20:19:37 +00:00
Jeff Gaston 2ddd80f4a3 Merge "Use flag.Parse in sbox" am: 048bf57c33
am: af7041de2c

Change-Id: Ib4bff0387fca7d47e4ea8e96f874f725b52302ba
2017-11-06 20:17:06 +00:00
Jeff Gaston af7041de2c Merge "Use flag.Parse in sbox"
am: 048bf57c33

Change-Id: I9deaec1fe643b8d218cc220cd04c424711fdb5b2
2017-11-06 20:15:07 +00:00