Commit Graph

5631 Commits

Author SHA1 Message Date
Colin Cross
985deafd4b Merge "Revert "Revert "Make some common properties overridden when used in defaults modules"""
am: d1dec3bd72

Change-Id: If7d845bb0edc1ca5586f04d85e82944512bea9c2
2017-11-02 00:15:05 +00:00
Colin Cross
a23e18fef5 Merge "Propagate PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to soong and use it"
am: 9117c879f3

Change-Id: I56f075ea8e58b846bb6fc950920521bda0cc6e3e
2017-11-02 00:11:34 +00:00
Treehugger Robot
d1dec3bd72 Merge "Revert "Revert "Make some common properties overridden when used in defaults modules""" 2017-11-02 00:10:39 +00:00
Colin Cross
9117c879f3 Merge "Propagate PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to soong and use it" 2017-11-02 00:05:20 +00:00
Vishwath Mohan
4f34146713 Revert "Revert "Build system changes for CFI (Soong)"" am: b743e9c16a am: 39375fe131
am: 2f85998479

Change-Id: I66198384659259f34b79458d9d85b2861a310288
2017-11-01 23:17:00 +00:00
Vishwath Mohan
2f85998479 Revert "Revert "Build system changes for CFI (Soong)"" am: b743e9c16a
am: 39375fe131

Change-Id: I5ae7a3b61b5aee5a345a7638a6f7bb87afd847dc
2017-11-01 23:06:58 +00:00
Vishwath Mohan
39375fe131 Revert "Revert "Build system changes for CFI (Soong)""
am: b743e9c16a

Change-Id: If5ef30be031a486d6c7d9b8cc5f48b16c8a5f041
2017-11-01 22:56:11 +00:00
Colin Cross
7d716baedf Revert "Revert "Make some common properties overridden when used in defaults modules""
This reverts commit 5c3c768187.

This reapplies I70e45caa92f65dc6a3bc81ae33a5a8f34ad11890 along with
additional changes in other projects to match the new types.

Bug: 68337468
Test: m checkbuild
Change-Id: I2d2d876b291869f834a6468d3e2ad99148f94a15
2017-11-01 14:24:48 -07:00
Colin Cross
126a25cb3d Propagate PRODUCT_MINIMIZE_JAVA_DEBUG_INFO to soong and use it
Strip debug info in javac when PRODUCT_MINIMIZE_JAVA_DEBUG_INFO
is set.

Test: m with PRODUCT_MINIMIZE_JAVA_DEBUG_INFO=true
Change-Id: I167e742662801291c516bf1ff826486560d22147
2017-11-01 12:51:16 -07:00
Vishwath Mohan
b743e9c16a Revert "Revert "Build system changes for CFI (Soong)""
This reverts commit 33c252c2f1.

I have a fix to the crashes that this CL set was causing, and have
uploaded it as a patchset to this revert.

This also contains a partial fix that was initially submitted
separately as
https://android-review.googlesource.com/#/c/platform/build/soong/+/524295/

Bug: 30227045
Test: ./art/test/testrunner/run_build_test_target.py -j110 art-asan #no
build errors
Test: m -j50 ASAN_OPTIONS=detect_leaks=0 SANITIZE_HOST=address # no
build errors

Change-Id: I3e53549fa03413d35d9a952f04de1e7629e1f06d
2017-11-01 12:50:01 -07:00
Nicolas Geoffray
f4d0fd53be Revert "Make some common properties overridden when used in defaults modules" am: 5c3c768187 am: 1599b72cf1
am: 142434dd34

Change-Id: I1accd1075afea9695dcc22974602d1911faa0dd1
2017-11-01 11:29:10 +00:00
Nicolas Geoffray
142434dd34 Revert "Make some common properties overridden when used in defaults modules" am: 5c3c768187
am: 1599b72cf1

Change-Id: Ic9054640ec2ede064f9aef87801bd45957fa862c
2017-11-01 11:26:13 +00:00
Nicolas Geoffray
1599b72cf1 Revert "Make some common properties overridden when used in defaults modules"
am: 5c3c768187

Change-Id: Ie8467465f1315b95aebd18643430d9b8d13b5b8b
2017-11-01 11:22:02 +00:00
Nicolas Geoffray
5c3c768187 Revert "Make some common properties overridden when used in defaults modules"
Bug: 68337468

Breaks HOST_PREFER_32BIT=true

This reverts commit 617016a6f2.

Change-Id: Ifb20f41cdf93dbfd73a3aac5b055e595e334350b
2017-11-01 09:32:53 +00:00
Colin Cross
4fce9a1080 Make some common properties overridden when used in defaults modules am: 617016a6f2 am: 72248331c9
am: f7489b6c0c

Change-Id: Ibeff28b3c2aee40d2b29fd0ce182e8d32eef1d0c
2017-11-01 07:13:26 +00:00
Colin Cross
f7489b6c0c Make some common properties overridden when used in defaults modules am: 617016a6f2
am: 72248331c9

Change-Id: I599f58c878474647ad4c72c0532db9ca7f35cf84
2017-11-01 07:10:57 +00:00
Colin Cross
72248331c9 Make some common properties overridden when used in defaults modules
am: 617016a6f2

Change-Id: I1bada408176f3d47d33c755acb3a6bd0b2cf56c6
2017-11-01 07:08:54 +00:00
Colin Cross
617016a6f2 Make some common properties overridden when used in defaults modules
Switch commonProperties to *string and *bool so that defining them
in a module correctly overrides instead of appends to values set
in defaults modules.

Bug: 68337468
Test: m checkbuild
Change-Id: I70e45caa92f65dc6a3bc81ae33a5a8f34ad11890
2017-11-01 05:28:36 +00:00
Colin Cross
6c40da49c7 Merge "Import AAPT-related product variables from make" am: 76530ec6f7 am: 6cde5be35e
am: 9a1066901f

Change-Id: I7f8ea873b5e7cf291fcd4892b583fab44db6fdb9
2017-11-01 00:59:19 +00:00
Orion Hodson
4e628dd1ba Revert "Build system changes for CFI (Soong)" am: 33c252c2f1 am: db9c663d66
am: c39c56f06b

Change-Id: If348f5e9091bd7ae80fca87d1761594f9c6bfbb5
2017-11-01 00:53:23 +00:00
Orion Hodson
754deece71 Revert "Hide mutated variant in non-make builds." am: da11d7422f am: 062d42f4e9
am: 86fee971ea

Change-Id: If9a453c59ec3e994b0f1ba0ea795d1e308eec904
2017-11-01 00:53:13 +00:00
Colin Cross
9a1066901f Merge "Import AAPT-related product variables from make" am: 76530ec6f7
am: 6cde5be35e

Change-Id: Ib3d1af908029a54fe66db87d62ffa6c5318167ad
2017-11-01 00:11:50 +00:00
Colin Cross
6cde5be35e Merge "Import AAPT-related product variables from make"
am: 76530ec6f7

Change-Id: Ibd105709f4ffe6202d7dc21b7c9f784e10348074
2017-10-31 23:43:56 +00:00
Treehugger Robot
76530ec6f7 Merge "Import AAPT-related product variables from make" 2017-10-31 23:39:24 +00:00
Orion Hodson
c39c56f06b Revert "Build system changes for CFI (Soong)" am: 33c252c2f1
am: db9c663d66

Change-Id: I0140c1842ff59121e5f2c73fb6ecc3eb990f406b
2017-10-31 23:25:39 +00:00
Orion Hodson
86fee971ea Revert "Hide mutated variant in non-make builds." am: da11d7422f
am: 062d42f4e9

Change-Id: Iec61c24a44c8348499b4f20ef09a025102b9688a
2017-10-31 23:25:28 +00:00
Orion Hodson
db9c663d66 Revert "Build system changes for CFI (Soong)"
am: 33c252c2f1

Change-Id: I01dfb1e365772ea0879a8187a9fc15680ea69f07
2017-10-31 22:09:09 +00:00
Orion Hodson
062d42f4e9 Revert "Hide mutated variant in non-make builds."
am: da11d7422f

Change-Id: Ia3e8568ab7f9a501a28077fb224694778bd93450
2017-10-31 22:09:06 +00:00
Orion Hodson
33c252c2f1 Revert "Build system changes for CFI (Soong)"
This reverts commit d4b484b070.

Rationale: second in group of commits that left aosp_x86_64 not
building. (See https://android-build.googleplex.com/builds/
submitted/4426589/aosp_x86_64-eng/latest/logs/build_error.log)

Bug: 30227045
Test: builds
Change-Id: I38ab5284c614d6ee68e7359219bd75c7d50131be
2017-10-31 21:01:00 +00:00
Orion Hodson
da11d7422f Revert "Hide mutated variant in non-make builds."
This reverts commit 6147c6972a.

Rationale: first in group of commits that left aosp_x86_64 not
building. (See https://android-build.googleplex.com/builds/
submitted/4426589/aosp_x86_64-eng/latest/logs/build_error.log)

Bug: 30227045
Test: builds
Change-Id: I632869d13d09b43e2040da187d7ced4f05c332de
2017-10-31 20:47:44 +00:00
Yohann Roussel
2e19cd8959 Always use installed version of d8-compat-dx
Also adapt to the renaming of d8 to d8-compat-dx.

Test: USE_D8=true m -j16 PRODUCT-aosp_arm64-eng showcommands core-oj
Change-Id: Ic7aaa6a5da34a6a5706c20f53922a83cb1de1100
2017-10-31 13:29:07 -07:00
Jeff Gaston
ce87eb35b2 Merge "Make $(depfile) work with sbox" am: a6253ea0bd am: 4bd860aea1
am: d8ac559dc9

Change-Id: Ic0625c27daa60b091d9649327d65f6e8510075d9
2017-10-31 20:16:31 +00:00
Jeff Gaston
d8ac559dc9 Merge "Make $(depfile) work with sbox" am: a6253ea0bd
am: 4bd860aea1

Change-Id: Ia0e3559c3ba644a48da5c1bc9ca720e10a5bc85b
2017-10-31 20:14:30 +00:00
Jeff Gaston
4bd860aea1 Merge "Make $(depfile) work with sbox"
am: a6253ea0bd

Change-Id: I55716df9c308f81ac86b6251e3ca4b83f1d69a18
2017-10-31 20:12:00 +00:00
Treehugger Robot
a6253ea0bd Merge "Make $(depfile) work with sbox" 2017-10-31 20:03:37 +00:00
Vishwath Mohan
665f603423 Hide mutated variant in non-make builds. am: 6147c6972a am: 34cb708379
am: 2f84c65d3b

Change-Id: I7012d41646618418628e3f34c318bdff86f268fb
2017-10-31 12:10:28 +00:00
Vishwath Mohan
2f84c65d3b Hide mutated variant in non-make builds. am: 6147c6972a
am: 34cb708379

Change-Id: I1235736fdadc1a0b8eb648b7a21f7501a3580c98
2017-10-31 12:05:28 +00:00
Vishwath Mohan
34cb708379 Hide mutated variant in non-make builds.
am: 6147c6972a

Change-Id: I2e3745e56f7a3f2df58cb68bb1fc1674fec82415
2017-10-31 11:59:55 +00:00
Vishwath Mohan
6147c6972a Hide mutated variant in non-make builds.
This CL hides (using Module.Properties.PreventInstall) either the
sanitized or stock variant for non-make embedded builds (based on
whether a sanitizer is enabled or not) so we don't have duplicate
rules for installing the same target.

Bug: 30227045
Test: OUT_DIR=out build/soong/scripts/build-ndk-prebuilts.sh # no
longer generates a duplicate build error.

Change-Id: I0b2dbb0afd5d426b32da67f951e2a4f9fbb3f3b9
2017-10-30 20:33:41 -07:00
Vishwath Mohan
89037dddd2 Merge "Build system changes for CFI (Soong)" am: 9ee01976fe am: 33af0d78bf
am: 7a8a392974

Change-Id: I6b560262ac999f461ace5fc62bd8ab0d5c890723
2017-10-31 02:04:42 +00:00
Vishwath Mohan
7a8a392974 Merge "Build system changes for CFI (Soong)" am: 9ee01976fe
am: 33af0d78bf

Change-Id: Iedb56b6a995bc41ed4002ac1fb139ee92ab8c6e7
2017-10-31 01:56:07 +00:00
Vishwath Mohan
33af0d78bf Merge "Build system changes for CFI (Soong)"
am: 9ee01976fe

Change-Id: I9f716e29e5b93577e36f58f852690967d5efe702
2017-10-31 01:51:02 +00:00
Vishwath Mohan
9ee01976fe Merge "Build system changes for CFI (Soong)" 2017-10-31 01:42:16 +00:00
Jeff Gaston
02a684b8b2 Make $(depfile) work with sbox
Most notably, the sandbox depfile path should be passed into the tool.

Bug: 68336760
Test: m -j checkbuild

Change-Id: I22f944a3f57d613fda26de0ea777a915cafcd020
2017-10-30 17:49:29 -07:00
Colin Cross
face4e4563 Import AAPT-related product variables from make
Test: m checkbuild
Change-Id: I22113c17d240ff26652cea7df801a183343faebd
2017-10-30 17:36:41 -07:00
Stephen Hines
62110067b7 Switch to clang-4393122. am: 0ed7d24f7a am: bc7ab77eb9
am: a3b8634ce3

Change-Id: I537685aa802ea64842b3416f25f7520b3f5a06d8
2017-10-30 20:06:47 +00:00
Stephen Hines
a3b8634ce3 Switch to clang-4393122. am: 0ed7d24f7a
am: bc7ab77eb9

Change-Id: Ieccb2af4e4f9f0d46fd6d69bb9bfa429834c4c0c
2017-10-30 19:57:15 +00:00
Stephen Hines
bc7ab77eb9 Switch to clang-4393122.
am: 0ed7d24f7a

Change-Id: I9792f96d02044430629ea08e23b5d1cc3e5938f8
2017-10-30 19:46:15 +00:00
Stephen Hines
0ed7d24f7a Switch to clang-4393122.
Bug: http://b/62580008
Bug: http://b/68236239
Bug: http://b/68236396
Test: https://goto.google.com/clang-4393122-testing
Change-Id: Ib6bcf93e356172aad2a762b730a6f93916a5d845
2017-10-30 16:00:44 +00:00
Vishwath Mohan
d4b484b070 Build system changes for CFI (Soong)
This CL makes multiples changes in preparation for platform-wide CFI.

(a) Adds a second -version-script=... to the command line
when building components that use a version script. This ensures that
__cfi_check is also exported, and allows CFI to be enabled for these
components.

(b) Adds both topdown and bottom up mutators for CFI to help propagate
dependencies correctly for components that may need CFI disabled.

(c) Fixes an issue with the mutators to correctly apply settings to
both generated variants

(d) Fixes issues when components have more than a single visibility
flag.

Bug: 30227045
Test: SANITIZE_TARGET=cfi m -j40 # dependencies are correctly built
                                 # with/without CFI

Change-Id: I44793cc03bcbcdaa957cc49c7240b87d7c9db327
2017-10-30 01:42:31 -07:00