Commit Graph

13539 Commits

Author SHA1 Message Date
Peter Collingbourne
e690f5894e Merge "Teach soong not to duplicate the HWASAN runtime into each APEX." am: 90b6561d5d
am: 369f315575

Change-Id: I152a188cf3f2607c1deeaf2993312ee3821eeb81
2019-05-20 21:50:16 -07:00
Peter Collingbourne
369f315575 Merge "Teach soong not to duplicate the HWASAN runtime into each APEX."
am: 90b6561d5d

Change-Id: Ie730048acaa65c12927d152a80e5680a70809a7a
2019-05-20 21:10:11 -07:00
Peter Collingbourne
90b6561d5d Merge "Teach soong not to duplicate the HWASAN runtime into each APEX." 2019-05-21 02:29:46 +00:00
Colin Cross
88acd4bb0e [automerger skipped] Merge "Limit calls to strip.sh on darwin" into qt-dev
am: 9a83367822 -s ours
am skip reason: change_id I3d4fbbd8d44d2e9059a79df113ab95336ec2c658 with SHA1 ee3ea31a24 is in history

Change-Id: I40662c8506f2b4184c5372e74461e46a39c4e22a
2019-05-20 17:17:58 -07:00
TreeHugger Robot
9a83367822 Merge "Limit calls to strip.sh on darwin" into qt-dev 2019-05-20 23:23:23 +00:00
Colin Cross
954bb27cd9 Limit calls to strip.sh on darwin
strip.sh can use a file descriptor per .o file when run on .a files,
which can hit the system file descriptor limit on darwin.  This
causes failures when manay variants of libgcc_stripped are built
simultaneously.  Put all strip rules on darwin into a pool that
limits them to 10 concurrent processes, which will limit the file
descriptor usage to ~7500.

Fixes: 132822437
Test: no mention of darwinStripPool in out/soong/build.ninja on linux
Test: m libgcc_stripped on darwin
Change-Id: I3d4fbbd8d44d2e9059a79df113ab95336ec2c658
Merged-In: I3d4fbbd8d44d2e9059a79df113ab95336ec2c658
(cherry picked from commit ee3ea31a24)
2019-05-20 15:13:47 -07:00
Colin Cross
dd761b255d Merge "Limit calls to strip.sh on darwin" am: 288a1e2957
am: 131a9a8dcb

Change-Id: I910226b14dfd2c40c0d0306697128ad98a6bbb34
2019-05-17 20:27:18 -07:00
Colin Cross
131a9a8dcb Merge "Limit calls to strip.sh on darwin"
am: 288a1e2957

Change-Id: I7fd0ac6b2a0a2ee2d02f38b1a0de5b1cb6490a7d
2019-05-17 19:45:02 -07:00
Treehugger Robot
288a1e2957 Merge "Limit calls to strip.sh on darwin" 2019-05-18 01:57:37 +00:00
Colin Cross
1f547cfaac Merge changes I3dc3fded,Ic1276329,I6be04dec am: 045f0f1f30
am: 4c18d670df

Change-Id: I0c32a4d28740aa23c4a8ee90a879b19374f915ed
2019-05-17 18:40:13 -07:00
Colin Cross
4c18d670df Merge changes I3dc3fded,Ic1276329,I6be04dec
am: 045f0f1f30

Change-Id: Ic302203a5718bca666a3a4588c975ef33403ca4b
2019-05-17 18:14:42 -07:00
Treehugger Robot
045f0f1f30 Merge changes I3dc3fded,Ic1276329,I6be04dec
* changes:
  Add bpf_test.go to build and fix tests
  Don't create a second host arch for tests on darwin
  Move CreateTestContext to cc/testing.go
2019-05-18 00:31:56 +00:00
Colin Cross
57f3e6c30f Merge "Support using cc_prebuilt_library_shared with cc_library" am: 77c22bf008
am: e3106ff23d

Change-Id: I569390897de21972c0b35924326e8073829dfee5
2019-05-17 17:06:11 -07:00
Colin Cross
e3106ff23d Merge "Support using cc_prebuilt_library_shared with cc_library"
am: 77c22bf008

Change-Id: Ie3de08cfcbe08ce767677b3613d0422b6bb0fa3c
2019-05-17 16:32:47 -07:00
Colin Cross
ee3ea31a24 Limit calls to strip.sh on darwin
strip.sh can use a file descriptor per .o file when run on .a files,
which can hit the system file descriptor limit on darwin.  This
causes failures when manay variants of libgcc_stripped are built
simultaneously.  Put all strip rules on darwin into a pool that
limits them to 10 concurrent processes, which will limit the file
descriptor usage to ~7500.

Fixes: 132822437
Test: no mention of darwinStripPool in out/soong/build.ninja on linux
Test: m libgcc_stripped on darwin
Change-Id: I3d4fbbd8d44d2e9059a79df113ab95336ec2c658
2019-05-17 22:51:00 +00:00
Treehugger Robot
77c22bf008 Merge "Support using cc_prebuilt_library_shared with cc_library" 2019-05-17 22:44:53 +00:00
Patrice Arruda
270e70b9a2 Merge "Soong: Add mk2bp conversion for prebuilt_font." am: d3104e8c28
am: 6a12b5bcbb

Change-Id: Icf24d05c7d095c8f1836f789ddff335d2867bedf
2019-05-17 13:17:44 -07:00
Patrice Arruda
6a12b5bcbb Merge "Soong: Add mk2bp conversion for prebuilt_font."
am: d3104e8c28

Change-Id: Ife835fa9d617abcae82815d82393dd123265bfff
2019-05-17 11:47:21 -07:00
Treehugger Robot
d3104e8c28 Merge "Soong: Add mk2bp conversion for prebuilt_font." 2019-05-17 17:45:08 +00:00
Peter Collingbourne
3478bb2a7f Teach soong not to duplicate the HWASAN runtime into each APEX.
When HWASAN is enabled, the runtime is conceptually part of Bionic (and
mutually depends on it), so it needs to be treated in the same way as the
Bionic libs.

Now there are only two copies of the runtime: the one in
/system/lib64/bootstrap (which won't be used by ordinary processes) and the
one in the runtime APEX.

This reduces the size of the HWASAN system image and fixes an issue where
multiple copies of the HWASAN runtime were being loaded into 64-bit binaries in
APEXes because the linker namespace for the binary is different from the one
for its dependent libraries outside of APEXes. HWASAN only supports loading
one copy of the runtime per process, so this was causing such binaries to
crash on startup.

Change-Id: I228896e193a035e6dfba9f6e28d0b2e12fc163ea
2019-05-17 10:00:39 -07:00
Colin Cross
815daf95b2 Add bpf_test.go to build and fix tests
bpf_test.go was not listed in testSrcs, which meant it was not run
during the build, but ran and failed with go test android/soong/...

Don't redeclare the cc module types and mutators, use exported
functions from cc/testing.go instead, which contain a new
dependency needed by cc modules.

This reapplies I4542640e8ff08e71565ed50617dbe67d86b29b69 after
fixes for mac tests.

Test: m
Test: go test android/soong/...
Change-Id: I3dc3fdedbd7063df4a2e0cadf2a4e0711b1823ad
2019-05-17 08:43:36 -07:00
Colin Cross
0d99f7cd84 Don't create a second host arch for tests on darwin
Only x86_64 darwin is supported, not x86.  Don't create an x86
host arch when running tests on darwin.

Test: all soong tests
Change-Id: Ic12763298345e32a1340f8fbef338d2ab4d62b2e
2019-05-17 08:43:36 -07:00
Colin Cross
9a94287fc9 Move CreateTestContext to cc/testing.go
Allow CreateTestContext to be called by tests in other packages
that need cc modules.

Test: all soong tests
Change-Id: I6be04dec50632baa8cb51e55ba14d0ddc0df60b8
2019-05-17 08:43:36 -07:00
Colin Cross
33b2fb7333 Support using cc_prebuilt_library_shared with cc_library
Allow a cc_prebuilt_library_shared to share the same name as a
cc_library by always creating static and shared variants of
prebuilts so that the variants of the source module are always
a superset of the variants of the target module.

Bug: 131709055
Test: TestPrebuilts
Change-Id: I4afd6d37e6a986d08ad25aee69eca6d994febc6b
2019-05-17 08:40:42 -07:00
Sundong Ahn
5e59b8120e [automerger skipped] Add No_dist property
am: a4a385f1d5 -s ours
am skip reason: change_id I51c6a6b87ab9dc90b6825c0d4d414e958dd7b265 with SHA1 80a87b3309 is in history

Change-Id: Iec1d6459697943e5f61fd9bb8b474c5f0c8548cd
2019-05-16 22:33:54 -07:00
Jaewoong Jung
ad592e79cd Merge "Turn off dex actions for sourceless modules." am: 4c83b8950a
am: 7f23cee285

Change-Id: I97f645cb4adfbaa9fab4da1a9dfdff66c997a100
2019-05-16 13:30:37 -07:00
Jaewoong Jung
7f23cee285 Merge "Turn off dex actions for sourceless modules."
am: 4c83b8950a

Change-Id: If738eae40f0179ac940d18ecd2236b29e1341721
2019-05-16 11:54:53 -07:00
Jaewoong Jung
4c83b8950a Merge "Turn off dex actions for sourceless modules." 2019-05-16 18:01:48 +00:00
Patrice Arruda
d1f45c8967 Soong: Add mk2bp conversion for prebuilt_font.
There are a couple of makefiles that have etc with $(TARGET_OUT)/fonts
and $(TARGET_OUT_PRODUCT)/fonts  as the local module path. Added the
conversion in androidmk for target.

bug: b/123403785
Test: Wrote and ran unit test cases, did a test conversion on
        * platform/external/google-fonts/dancing-script/Android.mk
        * internal/external/google-fonts/arbutus-fonts/Android.mk
Change-Id: Id67e10f80b32b27c5027cd274a7944801dad0880
2019-05-16 10:48:32 -07:00
Jaewoong Jung
b16dc74729 Merge "Fix override_android_app dependency issues." am: 105920a792
am: ac5ee3559f

Change-Id: Ie6447241cc069f507d053e10d78ba540d9cc84f9
2019-05-16 08:31:45 -07:00
Jaewoong Jung
ac5ee3559f Merge "Fix override_android_app dependency issues."
am: 105920a792

Change-Id: I288d99d717ff1b048e0677e3777e8061a1c4f063
2019-05-16 08:26:43 -07:00
Jaewoong Jung
105920a792 Merge "Fix override_android_app dependency issues." 2019-05-16 15:07:13 +00:00
Sundong Ahn
a4a385f1d5 Add No_dist property
For the sysprop apis, we don't need dist. So the No_dist property is
added for it.

Bug: 132448761
Test: m -j dist
Merged-In: I51c6a6b87ab9dc90b6825c0d4d414e958dd7b265
Change-Id: I51c6a6b87ab9dc90b6825c0d4d414e958dd7b265
(cherry picked from commit 80a87b3309)
2019-05-16 19:23:39 +09:00
Sundong Ahn
630a92b22a Merge "Add No_dist property" am: f50406eecc
am: 2c7bf1f4a3

Change-Id: I21e618250034b46996f4c0a2a127a41913e72c6d
2019-05-15 20:58:24 -07:00
Patrice Arruda
94dbdd3072 Merge "Soong: Add support on installing fonts in /fonts system image." am: e40da8cff6
am: b87703697d

Change-Id: Ib1c3018321812e7a6121f42a4276d7b11943d464
2019-05-15 20:49:11 -07:00
Sundong Ahn
2c7bf1f4a3 Merge "Add No_dist property"
am: f50406eecc

Change-Id: I9ae99c77e5aa35b052c4528f35734477f911f0d0
2019-05-15 18:31:45 -07:00
Treehugger Robot
f50406eecc Merge "Add No_dist property" 2019-05-16 01:25:53 +00:00
Patrice Arruda
b87703697d Merge "Soong: Add support on installing fonts in /fonts system image."
am: e40da8cff6

Change-Id: Ic7813c326fbff4418e1dbc4282879e11327dbc0b
2019-05-15 17:46:48 -07:00
Treehugger Robot
e40da8cff6 Merge "Soong: Add support on installing fonts in /fonts system image." 2019-05-15 23:53:28 +00:00
Jaewoong Jung
a24af3ba20 Turn off dex actions for sourceless modules.
Test: dexpreopt_test.go
Fixes: 129370564
Change-Id: Ic292f37c4f782b14fce625b85817b58c31d3f276
2019-05-15 15:46:26 -07:00
Inseob Kim
b3ea83a22f Merge "Generate VNDK snapshot with Soong except configs" am: 651f40bbe1
am: 62ca44a36b

Change-Id: I35f356f9590518406a2fd8d1d3c318cf529dad92
2019-05-15 15:38:29 -07:00
Inseob Kim
62ca44a36b Merge "Generate VNDK snapshot with Soong except configs"
am: 651f40bbe1

Change-Id: I2f0b74a3faef35e29640a1f67344654b8bb00187
2019-05-15 15:32:02 -07:00
Evgenii Stepanov
6c8b9a0296 Disable malloc fill in HWASan.
am: 2c6484e334

Change-Id: I84cd62a3cc76006c968136b69bf4d88137b2f934
2019-05-15 15:28:45 -07:00
Treehugger Robot
651f40bbe1 Merge "Generate VNDK snapshot with Soong except configs" 2019-05-15 22:13:35 +00:00
Evgenii Stepanov
2c6484e334 Disable malloc fill in HWASan.
HWASan has a feature to fill malloc() memory with non-zero pattern.
This has found a bug or two in the past, but it also keep causing hard
to debug issues. The main problem is lack of diagnostics - use of
pattern-initialized memory is not an immediate crash. More often than
not it manifests as a subtle change in system behavior.

Having MemorySanitizer on Android would be nice...

This change does not affect any shipping configuration, but improves
stability of testing-only SANITIZE_TARGET=hwaddress build.

Bug: 132803232
Bug: 132652537
Bug: 131438232
Bug: 132810685
Test: SANITIZE_TARGET=hwasan on crosshatch successfully boots in ~100%
      attempt (up from ~99% currently).

Change-Id: I7dcbcdf1b8a5b8556e32690327b32f04879e5db1
2019-05-15 13:53:37 -07:00
Ian Pedowitz
253b0b2d97 Merge "Revert "Revert "Android Q is API 29""" into qt-dev
am: c91fcb46ed

Change-Id: I34ffaffca59fa796d74c728992533cec61f804a6
2019-05-15 13:15:21 -07:00
Patrice Arruda
61583eb72a Soong: Add support on installing fonts in /fonts system image.
A new module named prebuilt_font allows a set of fonts to be
installed in the /fonts system image.

Bug: b/123403785
Test: Wrote and ran unit test cases.
Change-Id: Icd468abe3d70a528b28a8d8f216407484e9966a7
2019-05-15 12:35:29 -07:00
Jaewoong Jung
b639a6adb2 Fix override_android_app dependency issues.
This change fixes an issue where an android_test could not depened on an
override_android_app or an android_app overridden by one by moving all
override processing to post-deps and forwarding incoming dependencies on
override_android_apps to base android_app modules

Fixes: 132447700
Test: app_test.go
Change-Id: I4ac593be661f541f5ea9823ef97373bee4b186f9
2019-05-15 12:11:18 -07:00
Colin Cross
982c6ca76c Merge "Prevent hangs in OncePer when the callback panics" am: b7afaf0802
am: bf200f61ac

Change-Id: Iefa4ae2c21c81c486f603ba9d2601e97d5ffd0ac
2019-05-15 10:52:21 -07:00
Colin Cross
bf200f61ac Merge "Prevent hangs in OncePer when the callback panics"
am: b7afaf0802

Change-Id: I57d4803a024abd4d189fb2c6245eb49b2b2ac815
2019-05-15 10:47:18 -07:00