Commit Graph

46067 Commits

Author SHA1 Message Date
Anton Hansson
02d53cd7c0 [automerger skipped] Merge "Split base.mk into system and vendor parts." into stage-aosp-master
am: 8500a01e0c  -s ours

Change-Id: I99bbf7569cdbb15d6c4f9c6e31e58c1321f28445
2018-06-26 15:08:30 -07:00
Anton Hansson
8500a01e0c Merge "Split base.mk into system and vendor parts." into stage-aosp-master 2018-06-26 21:58:29 +00:00
Anton Hansson
74164e2664 [automerger skipped] Merge "Split base.mk into system and vendor parts." into pi-dev-plus-aosp
am: e16aa9f0d9  -s ours

Change-Id: I8ea02b5193521156bd293c7c3ae95671436d6bd1
2018-06-26 14:34:51 -07:00
Pirama Arumuga Nainar
c6a3ddf834 Do not enable sanitizers on Windows
Bug: http://b/69933068

Test: m native-host-cross SANITIZE_HOST=address
Change-Id: I0b99797d218dc34d302906d704d991e59698c351
2018-06-26 14:18:14 -07:00
Anton Hansson
e16aa9f0d9 Merge "Split base.mk into system and vendor parts." into pi-dev-plus-aosp 2018-06-26 21:11:48 +00:00
Anton Hansson
3dc115a5ea Merge "Add a base.mk that includes all base.mk files." 2018-06-26 21:11:08 +00:00
Anton Hansson
c0dd046586 Move 6 packages up from core_base.mk
Also remove two nonexistant packages (libnfc_ndef & libvariablespeed).

The moved packages are already being pulled in by being required by
other included packages in one of its parents (base or core_minimal).

These are the moved packages and their pre-existing deps:
- libmdnssd: by netd in base.mk
- libandroidfw: by 7 packages, many in base.mk
- libaudioutils: by 3 packages, e.g libmedia in base.mk
- libpowermanager: by 3 packages, e.g. libaudioflinger in base.mk
- libspeexresampler: by libaudioutils
- libwebrtc_audio_preprocessing: by libaudiopreprocessing in core_minimal.mk

This change makes core_base.mk very small. It will be deleted in a
followup-CL and its contents inlined in its direct children.

Bug: 80410283
Bug: 7456955
Test: make
Change-Id: I1240ec6adc5b9208effd6fc70892dfbd453a1fba
2018-06-26 21:57:13 +01:00
Pirama Arumuga Nainar
d43a37d424 Merge "Disable lld for windows host modules" am: 060c99c33e am: e1b1ea3d23
am: 06fd7f52d1

Change-Id: I6b318a1ae308c0fb86b0655607b089d23f5707a7
2018-06-26 13:12:08 -07:00
Pirama Arumuga Nainar
06fd7f52d1 Merge "Disable lld for windows host modules" am: 060c99c33e
am: e1b1ea3d23

Change-Id: I1b9b2c34cafb83c1fca09a166911c8179e0e79bd
2018-06-26 13:05:03 -07:00
Pirama Arumuga Nainar
e1b1ea3d23 Merge "Disable lld for windows host modules"
am: 060c99c33e

Change-Id: I8f8ec58270d1f3e5eea596e379062c7fada802d7
2018-06-26 12:53:41 -07:00
Treehugger Robot
060c99c33e Merge "Disable lld for windows host modules" 2018-06-26 19:47:53 +00:00
Colin Cross
89631ffaa1 Merge "Use pretty-error in prebuilt_internal.mk" am: 7ef5d75009 am: ce394e47fc
am: 5388fc8546

Change-Id: I286dae3807b0878ed2611c2d3d9f4d6b6f4322d1
2018-06-26 12:45:50 -07:00
Colin Cross
5388fc8546 Merge "Use pretty-error in prebuilt_internal.mk" am: 7ef5d75009
am: ce394e47fc

Change-Id: I63416395677803e2c637894a0d13778256d4ddd0
2018-06-26 12:41:39 -07:00
Colin Cross
ce394e47fc Merge "Use pretty-error in prebuilt_internal.mk"
am: 7ef5d75009

Change-Id: I419950e64cee3baa24aba06a00affccd3d3b0567
2018-06-26 12:38:29 -07:00
Treehugger Robot
7ef5d75009 Merge "Use pretty-error in prebuilt_internal.mk" 2018-06-26 19:28:24 +00:00
Mathieu Chartier
732a4cc62f Move go default system properties into prop files
Test: manual
Bug: 110517986

Change-Id: I28f5c18bb9e70c755ece50c49c02434f825878dc
2018-06-26 18:26:21 +00:00
Colin Cross
565615f377 Merge "Disable standalone relocation packer" am: effbc370dc am: bbbcf1c01e
am: 48fdc133a3

Change-Id: I17c77416ce9befac85e221d8364f6f37bbcd944a
2018-06-26 10:59:36 -07:00
Colin Cross
48fdc133a3 Merge "Disable standalone relocation packer" am: effbc370dc
am: bbbcf1c01e

Change-Id: I97e31a2145b7965e27708c30bc532ba81cab31f0
2018-06-26 10:53:51 -07:00
Colin Cross
bbbcf1c01e Merge "Disable standalone relocation packer"
am: effbc370dc

Change-Id: Ie72c24415f13f0960413f61d515b793ab780125a
2018-06-26 10:50:11 -07:00
Colin Cross
effbc370dc Merge "Disable standalone relocation packer" 2018-06-26 17:40:57 +00:00
Anton Hansson
9b48c52247 Split base.mk into system and vendor parts.
Put all packages that end up on the vendor partition in a separate mk,
to allow creating products with artifact path requirements.

Bug: 80410283
Test: diff product vars with multiproduct_kati
Change-Id: Ia35adaed2c8f9989c180bfdbbeeb2a5ecf634aa5
Merged-In: Ia35adaed2c8f9989c180bfdbbeeb2a5ecf634aa5
2018-06-26 18:19:46 +01:00
Anton Hansson
3a49ed8cbd Split base.mk into system and vendor parts.
Put all packages that end up on the vendor partition in a separate mk,
to allow creating products with artifact path requirements.

Bug: 80410283
Test: diff product vars with multiproduct_kati
Change-Id: Ia35adaed2c8f9989c180bfdbbeeb2a5ecf634aa5
Merged-In: Ia35adaed2c8f9989c180bfdbbeeb2a5ecf634aa5
2018-06-26 18:18:59 +01:00
Anton Hansson
5e72788937 Split base.mk into system and vendor parts.
Put all packages that end up on the vendor partition in a separate mk,
to allow creating products with artifact path requirements.

Bug: 80410283
Test: diff product vars with multiproduct_kati
Change-Id: Ia35adaed2c8f9989c180bfdbbeeb2a5ecf634aa5
Merged-In: Ia35adaed2c8f9989c180bfdbbeeb2a5ecf634aa5
2018-06-26 18:17:23 +01:00
Chih-hung Hsieh
7ded196774 Merge "Filter out clang-tidy unknown arguments." am: 875691cf89 am: fb21c07d84
am: 7e1d58ba4b

Change-Id: I042c073fa845e7f330626bd35b6203e3cc26ffde
2018-06-26 10:16:16 -07:00
Chih-hung Hsieh
7e1d58ba4b Merge "Filter out clang-tidy unknown arguments." am: 875691cf89
am: fb21c07d84

Change-Id: Id5412315b97ab2b0bebbab30b3be6f4e30fd8714
2018-06-26 10:08:32 -07:00
Anton Hansson
3b5ec11625 Add a base.mk that includes all base.mk files.
Suitable for products that don't care about being split by partition.

Bug: 80410283
Test: make
Change-Id: I973e66823484c6871817bb85e8880e36a0ac2887
2018-06-26 18:08:31 +01:00
Chih-hung Hsieh
fb21c07d84 Merge "Filter out clang-tidy unknown arguments."
am: 875691cf89

Change-Id: I213cba2633df3d5de2ecc072ca4569f894c64ee8
2018-06-26 10:03:15 -07:00
Chih-hung Hsieh
875691cf89 Merge "Filter out clang-tidy unknown arguments." 2018-06-26 16:51:40 +00:00
Anton Hansson
6a7add0a8a Merge "Split base.mk into system and vendor parts." 2018-06-26 10:08:20 +00:00
Anton Hansson
18f6e3e456 Merge "Include PRODUCT_COPY_FILES in artifact check." am: 31cd1263d4 am: a85fbdb83d
am: 7547fea8f9

Change-Id: I51febd1e6fc12c9f779ceaf36d73c9d36063a522
2018-06-26 03:03:31 -07:00
Anton Hansson
7547fea8f9 Merge "Include PRODUCT_COPY_FILES in artifact check." am: 31cd1263d4
am: a85fbdb83d

Change-Id: Ia521300d11b8bbd58a962705eeab530c476b32e6
2018-06-26 02:58:50 -07:00
Anton Hansson
a85fbdb83d Merge "Include PRODUCT_COPY_FILES in artifact check."
am: 31cd1263d4

Change-Id: I51e0d60a634ddbf9597b9797e7d8208930908bfb
2018-06-26 02:55:12 -07:00
Anton Hansson
31cd1263d4 Merge "Include PRODUCT_COPY_FILES in artifact check." 2018-06-26 09:29:54 +00:00
Doheon Lee
5355484405 Merge "Declare install path for product partition binaries" am: 39deff9e50 am: deb5a29934
am: ed9747c5c8

Change-Id: I1bf5f800392f2577fb4888673a5a5afcdc877c00
2018-06-25 18:52:17 -07:00
Doheon Lee
ed9747c5c8 Merge "Declare install path for product partition binaries" am: 39deff9e50
am: deb5a29934

Change-Id: Id458aa30335fa9fd33f9f632c73852a663d81799
2018-06-25 18:49:09 -07:00
Doheon Lee
deb5a29934 Merge "Declare install path for product partition binaries"
am: 39deff9e50

Change-Id: Iec7178f6ece015d33afbf28fa19ca92adbc5d2b8
2018-06-25 18:45:59 -07:00
Treehugger Robot
39deff9e50 Merge "Declare install path for product partition binaries" 2018-06-26 01:37:59 +00:00
Colin Cross
84667699f0 Use pretty-error in prebuilt_internal.mk
Test: none
Change-Id: I191515d90b8f0f1fe2ac382b857d47ebe98db0d3
2018-06-26 00:38:17 +00:00
Nelson Li
ca88f62d93 Merge "Revert "Revert "Build System: Validate AndroidTest.xml Configs""" am: d3ef2822cc am: f6cfd5e360
am: 1e2f882fd1

Change-Id: Ifa2e86497a1043b7829108f0c63c5dff5c0f3571
2018-06-25 17:37:17 -07:00
Colin Cross
979f9f9b18 Disable standalone relocation packer
We only support relocation packing inside lld now, remove calls to
the standalone relocation packer.  Any shared library built with
LOCAL_USE_CLANG_LLD := false will no longer have relocation packing.

This will also prevent relocation packing on prebuilt shared
libraries.

Also enables relocation packing on Darwin since lld will work on
Darwin.

Bug: 110715614
Test: m checkbuild
Change-Id: Ib4d4bc86f164d05dd78455c8e7605d4b4f5a2a77
2018-06-26 00:35:46 +00:00
Nelson Li
1e2f882fd1 Merge "Revert "Revert "Build System: Validate AndroidTest.xml Configs""" am: d3ef2822cc
am: f6cfd5e360

Change-Id: Ic9aec1007ca6aa3e34605a2d1841c690546bd8a5
2018-06-25 17:34:12 -07:00
Nelson Li
f6cfd5e360 Merge "Revert "Revert "Build System: Validate AndroidTest.xml Configs"""
am: d3ef2822cc

Change-Id: Id57e37bd69958c9e6cfc178414ef9a5a84842d25
2018-06-25 17:30:59 -07:00
Treehugger Robot
d3ef2822cc Merge "Revert "Revert "Build System: Validate AndroidTest.xml Configs""" 2018-06-26 00:24:50 +00:00
Pirama Arumuga Nainar
b66f9e6f91 Disable lld for windows host modules
Bug: http://b/69933068
Bug: http://b/110800681

lld cannot link Android's Windows modules yet

Test: m native-host-cross
Change-Id: I4945e5f84637443195294e575be8ebbe871d32b5
2018-06-25 16:02:08 -07:00
Chih-Hung Hsieh
b02e447775 Filter out clang-tidy unknown arguments.
Bug: 110538415
Test: build with WITH_TIDY=1
Change-Id: I77cd5dec834215fa22742eae6d96aabecadd11ab
2018-06-25 13:49:36 -07:00
Weilun Du
65afe0f806 Copy dummy userdata.img to sdk_addon images. am: 2276fb95cf
am: fc9919cd3d

Change-Id: I0125827a4b83e0dd7951c1fc526ac9c00dd02894
2018-06-25 12:14:57 -07:00
Weilun Du
fc9919cd3d Copy dummy userdata.img to sdk_addon images.
am: 2276fb95cf

Change-Id: Ic9a6f997bf26593665d4f6572b48174622c8a90e
2018-06-25 12:11:46 -07:00
Anton Hansson
c0655eb042 Include PRODUCT_COPY_FILES in artifact check.
The product-installed-files macro is not really thorough - it only
includes packages, but not other files which are included as part of
the build. Extend it to also include PRODUCT_COPY_FILES.

Bug: 80410283
Test: downstream CL
Change-Id: I803c7a59e695c226fa413fa1602ec315ef9886a8
2018-06-25 19:17:42 +01:00
Anton Hansson
d172e0d51d Split base.mk into system and vendor parts.
Put all packages that end up on the vendor partition in a separate mk,
to allow creating products with artifact path requirements.

Bug: 80410283
Test: diff product vars with multiproduct_kati
Change-Id: Ia35adaed2c8f9989c180bfdbbeeb2a5ecf634aa5
2018-06-25 15:12:20 +01:00
Nelson Li
a2a8b9ba11 Revert "Revert "Build System: Validate AndroidTest.xml Configs""
This reverts commit 054f210fd5.

Reason for revert: Revert it again since BUG of 109736180 already be fixed.
                   Local verified for different build targets of
                   walleye_coverage-userdebug, marlin_coverage-userdebug
                   and make sure they can build pass.
BUG: 109736180
Test: lunch walleye_coverage-userdebug; make adbd_test

BUG: 73082610
Test: cd packages/apps/DocumentsUI/tests/; mma
      Modify AndroidTest.xml to a not well-formed xml; mma
      Then, it should build fail.
      atest -v DocumentsUITests

Change-Id: Iadfcb28a4e3f685a66697de21f57ca5bdb8b7c9e
2018-06-25 06:03:41 +00:00