Commit Graph

45275 Commits

Author SHA1 Message Date
Anton Hansson 7a3e686ff5 [automerger skipped] Merge "Enable /cache mount point"
am: 7117311323  -s ours

Change-Id: I4d00da29144f8be6c0ca12371668f11302fab02e
2018-07-02 03:29:05 -07:00
Anton Hansson 7117311323 Merge "Enable /cache mount point" 2018-07-02 10:16:36 +00:00
Bowgo Tsai 631900e6ce Enable /cache mount point
Non-A/B devices using AOSP OTA flow will mount /cache in the
fstab file. Without setting BOARD_CACHEIMAGE_FILE_SYSTEM_TYPE,
/cache will be a symlink to /data/cache which introduces the
failure of `mount_all /vendor/etc/fstab.{ro.hardware}`. This is
because all devices laucned in P need to switch to "system-as-root".

This CL sets board config to create /cache directory in rootfs
(system-as-root GSI image). Note that A/B devices doesn't mount
or use /cache so leaving an empty /cache in rootfs has no harm.

Bug: 78485405
Test: Boot GSI on walleye
Change-Id: Ic260d2917cc64c9497f5f60ea11303e953e80efd
Merged-In: Ic260d2917cc64c9497f5f60ea11303e953e80efd
2018-06-29 14:23:25 +01:00
Anton Hansson 305da98dcd [automerger skipped] Merge "Fix broken mainline_arm64."
am: 3613193b31  -s ours

Change-Id: I01cfd143440cd16599be67588a6aaac2a9a1e478
2018-06-29 05:12:04 -07:00
Anton Hansson 3613193b31 Merge "Fix broken mainline_arm64." 2018-06-29 12:04:26 +00:00
Anton Hansson b2aa1bcc5d Merge "Fix mainline_arm64." into stage-aosp-master 2018-06-29 12:03:32 +00:00
David Brazdil dfd096870d Merge "Refactor hiddenapi rules to share common code"
am: 9b53066762

Change-Id: I2fc45e8d861aff3a2e4ab5ca6ccf1ba44bb29c6c
2018-06-29 04:40:17 -07:00
David Brazdil 9b53066762 Merge "Refactor hiddenapi rules to share common code" 2018-06-29 11:33:09 +00:00
Anton Hansson 64e28c8a36 Fix broken mainline_arm64.
- Missed adding core_64_bit include in the aosp version of
  I9beaa6f5f9c683733ed76a6d4e5c70b9376a5bb2.
- new recovery targets appeared over night, whitelist them for now

Test: make
Change-Id: I2235dcc7a3e62e1b0091e43829c519b03c2455a4
Merged-In: I2235dcc7a3e62e1b0091e43829c519b03c2455a4
2018-06-29 12:11:53 +01:00
Anton Hansson 3f1ff094f4 Fix mainline_arm64.
This target was added over night, whitelist it for now.

Test: make
Change-Id: I2235dcc7a3e62e1b0091e43829c519b03c2455a4
2018-06-29 12:11:38 +01:00
Anton Hansson b61f3de229 [automerger skipped] Merge "Add some experimental mainline targets."
am: 4537a1a361  -s ours

Change-Id: If1b33802fbe49aa26322a3f828c8ce4a23d276fc
2018-06-29 03:13:50 -07:00
Anton Hansson 4537a1a361 Merge "Add some experimental mainline targets." 2018-06-29 10:06:25 +00:00
Anton Hansson c74d03ed18 Merge "Add some experimental mainline targets." into stage-aosp-master 2018-06-29 10:05:21 +00:00
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 6b60b2151e Refactor hiddenapi rules to share common code
Java modules built with make and Soong currently invoke `hiddenapi`
with their own rules. Refactor the definitions so that Soong uses
make's definition. This will be useful for a subsequent CL which
needs to invoke `hiddenapi` on all boot dex files simultaneously.

Bug: 79409988
Test: m
Change-Id: I85105e650605d37c3ee8200d7f0d40c297756fcb
2018-06-28 18:14:30 +01: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 c0c39cf270 Add some experimental mainline targets.
These are not really realistic at the moment, but it's nice to get some
targets checked in that can be iterated upon.

- mainline_system: base mk for mainline systemimage. It will evolve to
  inherit other mks than base, and probably get a bunch of things added.
- mainline_system_arm: variant of mainline_system, specifically for
  the 'generic' device.
- mainline_arm: experimental product that also includes the non-system
  parts of aosp. Useful to experiment with the mk split.

Bug: 80410283
Test: lunch mainline_arm64 && m nothing && lunch mainline_system_arm64 && m nothing
Change-Id: I9beaa6f5f9c683733ed76a6d4e5c70b9376a5bb2
Merged-In: I9beaa6f5f9c683733ed76a6d4e5c70b9376a5bb2
2018-06-28 17:28:24 +01:00
Anton Hansson cf27a3da33 Add some experimental mainline targets.
These are not really realistic at the moment, but it's nice to get some
targets checked in that can be iterated upon.

- mainline_system: base mk for mainline systemimage. It will evolve to
  inherit other mks than base, and probably get a bunch of things added.
- mainline_system_arm64: variant of mainline_system, specifically for
  the 'generic' device.
- mainline_arm64: experimental product that also includes the non-system
  parts of aosp. Useful to experiment with the mk split.

Bug: 80410283
Test: lunch mainline_arm && m nothing && lunch mainline_system_arm && m nothing
Change-Id: I9beaa6f5f9c683733ed76a6d4e5c70b9376a5bb2
2018-06-28 17:27:08 +01: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