Commit graph

45293 commits

Author SHA1 Message Date
Dario Freni
37333682da Merge "Install /system/product apps odex in system-other."
am: 12e0e51116

Change-Id: I557c83122eb3d0bc894e479d645d353630075bb8
2018-07-05 05:30:18 -07:00
Dario Freni
12e0e51116 Merge "Install /system/product apps odex in system-other." 2018-07-05 12:11:50 +00:00
Anton Hansson
7789352e0b Merge "Remove libdownmix from core_minimal." into stage-aosp-master 2018-07-05 08:18:13 +00:00
TreeHugger Robot
c9ff0edb20 Merge "Refactor BoardConfig.mk for emulator products" into stage-aosp-master 2018-07-04 17:34:28 +00:00
Dario Freni
aa45068cc7 Install /system/product apps odex in system-other.
This will cause odex/vdex files for apps installed under
/system/product/{priv-,}app to be installed in system-other image, under
/system/product/{priv-,}app as well.

Test: m on marlin-userdebug target, analyzed
installed-files{,-system-other}.txt
Bug: 110072687

Change-Id: I63406f91acc3de4b4f142767e28d45308706c7da
2018-07-04 16:28:18 +01:00
Anton Hansson
27854eadc7 Remove libdownmix from core_minimal.
It's in base_vendor.mk already, so it's redundant.

Test: make
Bug: 80410283
Change-Id: I7986eebc5071a7680f466fc5e61290d06f7f7647
2018-07-04 14:30:51 +01:00
Anton Hansson
ffba8f91a7 [automerger skipped] Merge "Include partition-split selinux_policy modules."
am: 8c01b71e2d  -s ours

Change-Id: Ic8de1c980b0889475925cb028509e58c1197e58d
2018-07-03 09:09:30 -07:00
Anton Hansson
8c01b71e2d Merge "Include partition-split selinux_policy modules." 2018-07-03 15:59:21 +00:00
Anton Hansson
099b21e815 Merge "Include partition-split selinux_policy modules." into stage-aosp-master 2018-07-03 14:56:49 +00:00
Isaac Chen
510b76d8ff Refactor BoardConfig.mk for emulator products
The majority of the contents in BoardConfig.mk of emulator products
are the same. The common part is factored out as EmuConfig.mk so it's
easier to maintain these closely related products going forward.

Bug: 80117040
Test: Following products have been built and booted to homescreen:
  $ lunch aosp_x86-userdebug; m -j; emulator
  $ lunch aosp_x86_64-userdebug; m -j; emulator

Change-Id: I5392e0e88865d4908906a67c29939c23af84baf0
2018-07-03 09:58:59 +00:00
Anton Hansson
b657bb29a5 Merge "Include root in mainline_system artifact claim."
am: a9966c7c60

Change-Id: I3fb41d46c5a33776ae0e6ae469e68da5c115e750
2018-07-02 09:35:18 -07:00
Anton Hansson
a9966c7c60 Merge "Include root in mainline_system artifact claim." 2018-07-02 16:20:15 +00:00
Anton Hansson
56ce36f1b2 Include partition-split selinux_policy modules.
The selinux_policy module has been split in two, so that the system
artifacts can be included separately. Also remove associated whitelist
entries.

Bug: 80410283
Test: for t in eng userdebug user; do lunch mainline_arm64-${t}; m nothing; done
Change-Id: Id704c907b1ed31ae49697d33f075c013bc3dfc8c
2018-07-02 17:05:09 +01:00
Anton Hansson
173b5e75db Include root in mainline_system artifact claim.
With PRODUCT_SHIPPING_API_LEVEL >= 28, system-as-root is implied.
Remove redundant whitelist entries.

Bug: 80410283
Test: lunch mainline_arm64; m nothing
Change-Id: Ia18ef42525a3abb33842e939c389530ed299aafe
2018-07-02 15:01:35 +01:00
Anton Hansson
ce5eb452be Include partition-split selinux_policy modules.
The selinux_policy module has been split in two, so that the system
artifacts can be included separately. Also remove associated whitelist
entries.

Bug: 80410283
Test: for t in eng userdebug user; do lunch mainline_arm64-${t}; m nothing; done
Change-Id: Id704c907b1ed31ae49697d33f075c013bc3dfc8c
Merged-In: Id704c907b1ed31ae49697d33f075c013bc3dfc8c
2018-07-02 14:36:28 +01:00
David Brazdil
afb4d4cf8c Merge "Fix unzip on sdk_mac build"
am: 2986542f65

Change-Id: I422250d37866c56fed294a288bb1b7a8084372e8
2018-07-02 06:20:16 -07:00
David Brazdil
2986542f65 Merge "Fix unzip on sdk_mac build" 2018-07-02 13:10:07 +00:00
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
David Brazdil
c06f48a21d Fix unzip on sdk_mac build
Recent CL added a flag to an unzip command which does not restore
the timestamps of extracted files. This is necessary because the
extracted files are the output of the rule and thus the timestamp
must be newer than the timestamp of the inputs.

Unfortunately, the sdk_mac build has an old version of UnZip (5.52
vs 6.0) which does not support the flag. Replace it with find|touch.

Test: m
Change-Id: Ib1f218af4547a1d604b46e68b6ef50d45cb91ee9
2018-07-02 11:19:53 +01: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