Commit Graph

45259 Commits

Author SHA1 Message Date
David Brazdil
d9a9e981ce Merge "Adjust arguments of hiddenapi tool"
am: dadcb9ced2

Change-Id: I952877c22a547aacbe248e2411f5b2628a164133
2018-06-29 01:46:18 -07:00
David Brazdil
dadcb9ced2 Merge "Adjust arguments of hiddenapi tool" 2018-06-29 08:40:55 +00:00
Anton Hansson
267e989bad Merge "Move some recovery packages out of base_system."
am: 59497d050c

Change-Id: I66d93959982eeb656f6ffffc34be6c30c262b323
2018-06-29 00:14:48 -07:00
Anton Hansson
59497d050c Merge "Move some recovery packages out of base_system." 2018-06-29 07:06:22 +00:00
Sundong Ahn
04d7ae2ff5 Merge "Support java sdk libraries"
am: 3dbb886cda

Change-Id: I7e61484fd12db60a7a18a4559b8ae38cb463eeef
2018-06-28 20:31:17 -07:00
Treehugger Robot
3dbb886cda Merge "Support java sdk libraries" 2018-06-29 02:51:43 +00:00
Mathieu Chartier
7d80efd2b9 Merge "Add showmap and procrank to PRODUCT_PACKAGES_DEBUG"
am: 3e4a376912

Change-Id: Id601c264691c97e18acda6cb3e079913afbe2f69
2018-06-28 13:49:17 -07:00
Mathieu Chartier
3e4a376912 Merge "Add showmap and procrank to PRODUCT_PACKAGES_DEBUG" 2018-06-28 20:35:53 +00:00
Ari Hausman-Cohen
eb5fccc98c Merge "Add PRODUCT_IOT support to soong."
am: 0d2436e372

Change-Id: I86fc1b9d5b92c713f93bb0efbfd0a6f556d8e9e4
2018-06-28 13:25:09 -07:00
Ari Hausman-Cohen
0d2436e372 Merge "Add PRODUCT_IOT support to soong." 2018-06-28 20:13:54 +00:00
David Brazdil
57b1e546a0 Adjust arguments of hiddenapi tool
The `hiddenapi` build tool now expects the first argument to be
a command name. Change its build rule accordingly.

Bug: 79409988
Test: make
Change-Id: I7e34331c487f490d1de6a10c4139768e9774f03e
2018-06-28 18:14:30 +01:00
Mathieu Chartier
1a4037ea7b Add showmap and procrank to PRODUCT_PACKAGES_DEBUG
So that they are available on device by default.

Test: make

(cherry picked from commit 161db06003)

Merged-In: If3c1513d1c086f965a8adc157a96b35c119962c3
Change-Id: Ifd87294d08a8a7bb074b39b5bd620124e29540ed
2018-06-28 09:42:37 -07:00
Anton Hansson
30417d971e Move some recovery packages out of base_system.
Put the in base_vendor for now. That file should probably be renamed
to base_nonsystem.mk or something of that sort.

There is a remaining artifacts in recovery, but I think its target
needs to be split up, so move these for now.

Bug: 80410283
Test: make
Change-Id: I98c2b96b413fff4c8b0377e69bc9c2693ccca7cd
2018-06-28 17:22:14 +01:00
Ari Hausman-Cohen
271d861ab5 Add PRODUCT_IOT support to soong.
Some code needs to behave differently for Android Things
systems. PRODUCT_IOT tracks Android Things products.
This change exposes this variable into the soong system.

Bug: 110494430
Test: aosp_angler builds
Change-Id: Id9c27e4fe70957f217cfbdc019e8a37532bafac2
2018-06-27 16:52:51 -07:00
Pirama Arumuga Nainar
783c0bd833 Merge "Do not set entry-point for Windows"
am: 645b8db09a

Change-Id: Ia4982902151b800b58a3cfa488ccfddecb6aa662
2018-06-27 13:26:34 -07:00
Treehugger Robot
645b8db09a Merge "Do not set entry-point for Windows" 2018-06-27 20:22:23 +00:00
Pirama Arumuga Nainar
897b03f9ee Merge "Use $(my_prefix)OS instead of HOST_CROSS_OS"
am: 69af20f184

Change-Id: I9006ed1815f52f31a05ec9eb190672fc0d0b3da9
2018-06-27 13:14:30 -07:00
Treehugger Robot
69af20f184 Merge "Use $(my_prefix)OS instead of HOST_CROSS_OS" 2018-06-27 20:08:04 +00:00
Pirama Arumuga Nainar
71b8769e5c Merge "Use $(my_prefix)OS instead of HOST_CROSS_OS"
am: 1caedd6bdc

Change-Id: Ic7d6fc7d44167e22c196de8275dc27c88e2f714a
2018-06-27 11:41:12 -07:00
Treehugger Robot
1caedd6bdc Merge "Use $(my_prefix)OS instead of HOST_CROSS_OS" 2018-06-27 18:28:34 +00:00
Pirama Arumuga Nainar
b448834e96 Do not set entry-point for Windows
Bug: http://b/62424007

This breaks 64-bit Windows executables.  Probably due to the Clang
migration, the entry-point need not be set even for 32-bit executables.

Test: 32-bit and 64-bit aapt2_tests.exe and ziparchive-tests.exe can
start.  (There are some failed tests, though).

Change-Id: I1dea9137c79c5f26b493640cfae0856c1a7ea301
2018-06-27 11:28:33 -07:00
Pirama Arumuga Nainar
060741e77d Use $(my_prefix)OS instead of HOST_CROSS_OS
The latter is not module-specific and affects all host modules.  Also
remove the check for LOCAL_IS_HOST_MODULE and use  $(my_prefix)OS.

This should be future-proof, where may use different configurations of
cross-compilations across Linux, Darwin, Windows.

Test: m native
Change-Id: I0a6255a8b83960ffb543b593d4a50d963be1de88
2018-06-27 10:37:54 -07:00
Pirama Arumuga Nainar
407b6aca28 Use $(my_prefix)OS instead of HOST_CROSS_OS
The latter is not module-specific and prevents santizer configuration
for all host modules.

Test: mma HOST_SANITIZE=address hardware/google/apf
Change-Id: I62a448973c1d6526e4b475f3288996e44c88fbc9
2018-06-27 09:42:33 -07:00
Anton Hansson
8bb6f0d5db Merge "Sort lists in AndroidProducts.mk."
am: 14add31780

Change-Id: Ia6192fa02cf70f97cb1ef2f1ed64e2746a74b2c2
2018-06-27 08:43:56 -07:00
Treehugger Robot
14add31780 Merge "Sort lists in AndroidProducts.mk." 2018-06-27 15:33:52 +00:00
Anton Hansson
1555709499 Sort lists in AndroidProducts.mk.
Test: No
Change-Id: I4147103eee03ef9af500e73fd4481f11c19580ec
2018-06-27 14:43:21 +01:00
Anton Hansson
04750bc03a Merge "Split up fs_config_* modules per partition."
am: 4e0ccc4c8a

Change-Id: I82751b7f53a22bdcccb6667dfb17089d296dd43c
2018-06-27 06:07:11 -07:00
Anton Hansson
4e0ccc4c8a Merge "Split up fs_config_* modules per partition." 2018-06-27 12:59:22 +00:00
Anton Hansson
5b39368282 Merge "Remove core_base.mk"
am: cc496f9b61

Change-Id: I55e203de13b9ed6bdc18b73a9a77f898f34bb1b8
2018-06-27 04:41:20 -07:00
Anton Hansson
cc496f9b61 Merge "Remove core_base.mk" 2018-06-27 11:36:31 +00:00
Anton Hansson
e85ec84eef Split up fs_config_* modules per partition.
This was already done for partitions other than the system partition.
Add new, separate "_system" targets, and add new phony modules which
collects _system and _nonsystem targets for now.

Update the base_system.mk file to only depend on the system module, and
put the other ones in base_vendor.mk for now.

Bug: 80410283
Test: make fs_config_dirs[_*] fs_config_files[_*] and verify output
Change-Id: I7843578dbb9f27edf4c1e5b4a795a530f79e0be1
2018-06-27 11:15:59 +01:00
Anton Hansson
c23ef03838 Remove core_base.mk
It's small, and doesn't really have a theme so it doesn't really warrant
its own build file. Inline its contents in all its children.

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: I7db95f9134df36ebd0271e21dba1fa13b28afc72
2018-06-27 09:56:56 +01:00
Anton Hansson
9f4917bc9f Merge "Move 6 packages up from core_base.mk"
am: a314fc0166

Change-Id: I8c9bc72e2f1b2bb7c2ce5bfb53dbd29b5005307b
2018-06-27 01:35:12 -07:00
Anton Hansson
3a9fa70d5a [automerger skipped] Merge "Split base.mk into system and vendor parts."
am: 351a147cd7  -s ours

Change-Id: I08fd19e18ded0b99946fbb9f7a77e7e76ca6cedd
2018-06-27 01:34:36 -07:00
Anton Hansson
a314fc0166 Merge "Move 6 packages up from core_base.mk" 2018-06-27 08:30:08 +00:00
Anton Hansson
351a147cd7 Merge "Split base.mk into system and vendor parts." 2018-06-27 08:29:40 +00:00
Mathieu Chartier
1be0b776a2 [automerger skipped] Merge "Move go default system properties into prop files"
am: 47ad7d0f60  -s ours

Change-Id: If1ce48b6d8f47baacca0db93b57fb70e04c3b978
2018-06-26 17:24:30 -07:00
Mathieu Chartier
47ad7d0f60 Merge "Move go default system properties into prop files" 2018-06-27 00:09:27 +00:00
Pirama Arumuga Nainar
a743e206ef Merge "Do not enable sanitizers on Windows"
am: 0d53f4b12b

Change-Id: I96fde141a4d27c231947f65f3917da30a311b420
2018-06-26 17:05:24 -07:00
Treehugger Robot
0d53f4b12b Merge "Do not enable sanitizers on Windows" 2018-06-26 23:28:29 +00:00
Mathieu Chartier
f39c2c7495 Move go default system properties into prop files
Test: manual
Bug: 110517986

(cherry-picked from commit 732a4cc62f)

Merged-In: I28f5c18bb9e70c755ece50c49c02434f825878dc
Change-Id: I28f5c18bb9e70c755ece50c49c02434f825878dc
2018-06-26 15:12:46 -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
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
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
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
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
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