Commit Graph

3936 Commits

Author SHA1 Message Date
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 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
Anton Hansson 52a23cfbb3 Move packages from base_system to base_vendor.
These install on the vendor partition. Clean up the whitelist.

Bug: 80410283
Test: lunch mainline_arm64; m nothing

Change-Id: I45df64e1fa060ea98534351140678589afe2e340
Merged-In: I45df64e1fa060ea98534351140678589afe2e340
2018-07-03 12:42:21 +01:00
Anton Hansson 8999411ab1 Move packages from base_system to base_vendor.
These install on the vendor partition. Clean up the whitelist.

Bug: 80410283
Test: lunch mainline_arm64; m nothing

Change-Id: I45df64e1fa060ea98534351140678589afe2e340
2018-07-03 12:37:53 +01: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 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
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 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 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
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
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 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
Anton Hansson 8bb6f0d5db Merge "Sort lists in AndroidProducts.mk."
am: 14add31780

Change-Id: Ia6192fa02cf70f97cb1ef2f1ed64e2746a74b2c2
2018-06-27 08:43:56 -07: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 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 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 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 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
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
Jiyong Park b50ab74ea2 Merge "Don't check the vndk lib list for 64-bit only product"
am: e2bc1154bf

Change-Id: Icf3457d7321d18ebb8f194895cae1a2443409ece
2018-06-22 00:57:45 -07:00
Treehugger Robot e2bc1154bf Merge "Don't check the vndk lib list for 64-bit only product" 2018-06-22 07:51:04 +00:00
Jiyong Park b930d1d397 Don't check the vndk lib list for 64-bit only product
vndk-check-list check can't be done for 64-bit only product. Some
VNDK libraries (libstagefright_codec_*) are 32-bit only and thus
not built for 64-bit only product. As a result vndk-check-list always
fails on such device. Suppressing the error until the codec libraries
are built with 64-bit.

Bug: 110429754
Test: m -j on hikey64_only
Change-Id: I240ceee3fd0a778e47904ed44a1964084f354141
2018-06-22 12:58:31 +09:00
Jiyong Park 91e6f590f0 Merge "check-vndk-list is run even when VNDK is not enabled"
am: 931c5a5d33

Change-Id: I00230be053b4e01591f2beaa8905481a1718c98a
2018-06-21 18:21:50 -07:00
Treehugger Robot 931c5a5d33 Merge "check-vndk-list is run even when VNDK is not enabled" 2018-06-22 01:09:04 +00:00
Jiyong Park c0f738c974 check-vndk-list is run even when VNDK is not enabled
check-vndk-list has not been run when VNDK is not enabled (i.e.
BOARD_VNDK_VERSION is unset). This was problematic because there is a
chance that a CL which passed pre-submit tests can fail the post-submit
tests when the targets selected for the pre-submit tests are all without
VNDK enforcement.

In order to prevent the case, check-vndk-list is executed regardless of
whether BOARD_VNDK_VERSION is set or not.

Bug: 110424280
Test: m -j on sailfish
Test: m -j on sailfish fails after adding an arbitrary library to VNDK
Change-Id: Ia7427be2a297940a9e9c9f46cb058245596171c9
2018-06-21 14:18:54 +09:00
Yifan Hong 2b6939e7e9 emulator sdk_phone_x86/_64: Add EmulatorSmokeTests
Fixes the build.

Test: make -j110 PRODUCT-sdk_x86-sdk showcommands dist \
   DIST_DIR=out/dist/git_master-without-vendor-linux-sdk_x86-sdk sdk_repo

Test: make -j110 PRODUCT-sdk_x86_64-sdk showcommands dist \
    DIST_DIR=out/dist/git_master-without-vendor-linux-sdk_x86_64-sdk sdk_repo

Change-Id: I67da40fc88b67cde0f8f959c13aa68dc0271da2a
Merged-In: I63bc56ba69d313515ec3a1c73206f9a125a697ab
2018-06-20 13:33:00 -07:00
Anton Hansson 9c96dcaa87 Merge "Remove core.mk." into stage-aosp-master 2018-06-20 17:40:44 +00:00
Anton Hansson e9d34eccf3 Merge "Remove sdk_base.mk." into stage-aosp-master 2018-06-20 17:27:29 +00:00
Anton Hansson 8bc96c162c Merge "Delete core_tiny.mk" 2018-06-20 17:15:53 +00:00
Anton Hansson ef2972781c Merge changes Ie56e22be,I1353aa24,I7b0b4d0e,I63bc56ba
* changes:
  Remove core.mk.
  Remove sdk_base.mk.
  emulator: add host tools to sdk_phone_x86/64
  emulator: base sdk_phone_x86/64 images on aosp
2018-06-20 17:12:04 +00:00
Dan Willemsen 93e1a187c7 Merge "aosp_x86_arm builds have overriding commands"
am: 6ae08c1416

Change-Id: Ie3cf105dfa9fca4c2e26e2a5e96b992a1be343b6
2018-06-20 10:03:54 -07:00
Anton Hansson a7b36449eb Delete core_tiny.mk
There are no descendants of this mk in AOSP. Move the content that was
shared with core_minimal.mk to base.mk (ContactsProvider and
DefaultContainerService)

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: I95431b3db789e9c347bb37109a3ac7f627025f96
Merged-In: I95431b3db789e9c347bb37109a3ac7f627025f96
2018-06-20 15:09:41 +01:00
Anton Hansson b40cd42eeb Merge "Delete core_tiny.mk" into stage-aosp-master 2018-06-20 14:07:14 +00:00
Anton Hansson 19fc0e3c2b Remove core.mk.
It only has one mk inheriting it now, so it's redundant. Push its
packages into the single child (generic_no_telephony.mk).

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: Ie56e22be7f43558fdd259c808e5a6a937bd12ea6
Merged-In: Ie56e22be7f43558fdd259c808e5a6a937bd12ea6
(cherry picked from commit 57000e3c79)
2018-06-20 14:42:30 +01:00
Anton Hansson 52b38791b7 Remove sdk_base.mk.
Not used anymore, and it's in pretty bad shape, so delete it.

Bug: 80410283
Test: N/A.
Change-Id: I1353aa24024ece38857be6b489d36b0a612355cb
Merged-In: I1353aa24024ece38857be6b489d36b0a612355cb
(cherry picked from commit f65e806618)
2018-06-20 14:42:02 +01:00
bohu 68606832c0 emulator: add host tools to sdk_phone_x86/64
Fix sdk_x86-sdk build breakage that requires host tools.

BUG: 109716817
Test: make -j110 PRODUCT-sdk_x86-sdk showcommands dist DIST_DIR=git_master-without-vendor-linux-sdk_x86-sdk/4821124 sdk_repo
Change-Id: I7b0b4d0e3b2c79bad305bc11a5c1d04eb1f2bdd1
Merged-In: I7b0b4d0e3b2c79bad305bc11a5c1d04eb1f2bdd1
(cherry picked from commit 62d494b3fd)
2018-06-20 14:34:50 +01:00
Anton Hansson 57000e3c79 Remove core.mk.
It only has one mk inheriting it now, so it's redundant. Push its
packages into the single child (generic_no_telephony.mk).

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: Ie56e22be7f43558fdd259c808e5a6a937bd12ea6
Merged-In: Ie56e22be7f43558fdd259c808e5a6a937bd12ea6
(cherry picked from commit d0d862d794)
2018-06-20 13:18:00 +00:00
Anton Hansson f65def6aa9 Remove sdk_base.mk.
Not used anymore, and it's in pretty bad shape, so delete it.

Bug: 80410283
Test: N/A.
Change-Id: I1353aa24024ece38857be6b489d36b0a612355cb
Merged-In: I1353aa24024ece38857be6b489d36b0a612355cb
(cherry picked from commit f65e806618)
2018-06-20 13:14:48 +00:00
bohu 1829eb172e emulator: base sdk_phone_x86/64 images on aosp
BUG: 79941736

this cl only impacts emulator images

Test: lunch sdk_phone_x86; m; emulator boots
Change-Id: I63bc56ba69d313515ec3a1c73206f9a125a697ab
Merged-In: I63bc56ba69d313515ec3a1c73206f9a125a697ab
(cherry picked from commit c5e25e9b84)
2018-06-20 14:11:32 +01:00
Bo Hu c2c164504d Merge "Revert "Revert "emulator: base sdk_phone_armv7/64 on aosp"""
am: 9379de6756

Change-Id: Ibe57c92bbccbc8f8b9bdf87f87cca32880a3073c
2018-06-20 01:14:00 -07:00
Dan Willemsen 5250840358 aosp_x86_arm builds have overriding commands
This product has warnings about overriding build commands, which means
that there are multiple instructions on how to build a file, and we've
just picked one of them. Which one we pick is usually stable, but it can
change.

Bug: 77611511
Test: turn default to false, aosp_x86_arm still uses a warning
Change-Id: Id821c04e3dd6a1f69ea748827c3570a751b4e1dd
2018-06-19 23:25:16 -07:00
bohu 19481ce902 Revert "Revert "emulator: base sdk_phone_armv7/64 on aosp""
This reverts commit c82af2f6a9.

Change-Id: I62ce24e5b58b15b0c9026ebfea23860ec2f9bfae
2018-06-19 21:32:05 -07:00
Bo Hu 31e612afb3 Merge "Revert "emulator: base sdk_phone_armv7/64 on aosp""
am: 6291a4a258

Change-Id: I9f78612d267d8663489d17524aebedffc0ec7c71
2018-06-19 15:41:39 -07:00
Bo Hu c82af2f6a9 Revert "emulator: base sdk_phone_armv7/64 on aosp"
This reverts commit b12abf0310.

Reason for revert: broke sdk build

Change-Id: Ib04df196806488245259f797eb9f52e61f337715
2018-06-19 22:19:47 +00:00
Bo Hu 2ed87d0137 Merge "emulator: base sdk_phone_armv7/64 on aosp"
am: 5ce1e519ea

Change-Id: I9284449872882da56972e8b740bd6043746f1984
2018-06-19 13:45:04 -07:00
bohu b12abf0310 emulator: base sdk_phone_armv7/64 on aosp
Switch to GSI images for arm/arm64 sdk images.

BUG: 79941736

This cl does not impact real device images

Test: make -j110 PRODUCT-sdk_phone_armv7-sdk showcommands dist \
DIST_DIR=git_master-without-vendor-linux-sdk_x86-sdk sdk_repo

Change-Id: Ia50be068cc5e5307cdf7ee3a8e11014ed8019992
Merged-In: Ia50be068cc5e5307cdf7ee3a8e11014ed8019992
2018-06-19 11:51:31 -07:00
Makoto Onuki cd20160644 atest: switch from a shell function to binary
Test: m -j, do envsetup.sh in a clean shell, run atest
Change-Id: I868d24176538397a592d20a4d5082170b91c9ae4
Merged-In: I868d24176538397a592d20a4d5082170b91c9ae4
2018-06-19 11:38:15 -07:00
Anton Hansson dbe194f472 Delete core_tiny.mk
Only inherited by a single mk, so inline its contents there, with a few
exceptions:
- pppd was redundant (already in base)
- ContactsProvider and DefaultContainerService were duped in base.mk's
  only two children (core_tiny and core_minimal)

Bug: 80410283
Test: diff product variables with multiproduct_kati
Change-Id: I95431b3db789e9c347bb37109a3ac7f627025f96
Merged-In: I95431b3db789e9c347bb37109a3ac7f627025f96
2018-06-19 14:01:10 +00:00
Anton Hansson 32e70da517 Remove embedded.mk
The common mk files form a long chain of generic sounding names that
don't make much sense. For instance, embedded, base, core_minimal, core
and core_base all inherit each other, but there's no logical ordering
of these names.

The common mks will be split based on destination partition, which will
create many new files. Merging some of the common ones before this split
keeps the total number of mks under control.

There are only 2 products inheriting this mk excluding base.mk (which
has over 300 descendants). The other levels in the hierarchy all have
multiple device categories rooted at them (e.g. wearables from base.mk,
tvs and cars from core_minimal.mk), but embedded.mk has not which
makes it a compelling target to remove.

Bug: 80410283
Test: diff products variables with multiproduct_kati
Change-Id: I35c05973dfefefb7a31686476215386b8b89a557
Merged-In: I35c05973dfefefb7a31686476215386b8b89a557
Merged-In: I2e25032645c87f084f911e14fade16bc802ff457
2018-06-19 10:40:01 +00:00
Anton Hansson d88565085c Remove embedded.mk
The common mk files form a long chain of generic sounding names that
don't make much sense. For instance, embedded, base, core_minimal, core
and core_base all inherit each other, but there's no logical ordering
of these names.

The common mks will be split based on destination partition, which will
create many new files. Merging some of the common ones before this split
keeps the total number of mks under control.

There are only 2 products inheriting this mk excluding base.mk (which
has over 300 descendants). The other levels in the hierarchy all have
multiple device categories rooted at them (e.g. wearables from base.mk,
tvs and cars from core_minimal.mk), but embedded.mk has not which
makes it a compelling target to remove.

Bug: 80410283
Test: diff products variables with multiproduct_kati
Change-Id: I35c05973dfefefb7a31686476215386b8b89a557
Merged-In: I35c05973dfefefb7a31686476215386b8b89a557
2018-06-18 11:54:25 +00:00
Treehugger Robot 7f0ac95d21 Merge "Set proper CPU variant for aosp_arm" 2018-06-15 20:19:10 +00:00
Isaac Chen e44b0d96b9 Set proper CPU variant for aosp_arm
System image of aosp_arm products is the new GSI in Pi.
Its arch variants need to be the same as the legacy GSI built
with aosp_arm_ab so it can pass related CTS/VTS tests.

Bug: 80401108
Test: $ lunch aosp_arm-userdebug; m -j; emulator # booted OK
      $ lunch aosp_arm-userdebug; m -j cts

Change-Id: I29fffca3e02a2251913a327b54640fc622e77a8d
Merged-Id: I29fffca3e02a2251913a327b54640fc622e77a8d
(cherry picked from commit b2e58893c3)
2018-06-15 18:40:42 +00:00
Anton Hansson 984e93a450 Merge "Move a few packages from core_minimal.mk to base.mk." 2018-06-15 09:08:33 +00:00
Anton Hansson 667d543f87 Merge "Move a few packages from core_minimal.mk to base.mk." into stage-aosp-master 2018-06-15 09:07:30 +00:00
Sundong Ahn b4cb1b542a Merge "Remove com.android.location.provider.xml"
am: 1ce8617482

Change-Id: I56c7f2d883b00812b92b43e318548bbba4855eb2
2018-06-14 21:52:54 -07:00
Treehugger Robot 1ce8617482 Merge "Remove com.android.location.provider.xml" 2018-06-15 03:41:18 +00:00
Anton Hansson 446d9a8cad Move a few packages from core_minimal.mk to base.mk.
All the products that inherit from base.mk add these packages, so moving
them up the hierarchy eliminates some duplication.

    DownloadProvider
    idmap
    libneuralnetworks
    mdnsd
    MediaProvider

Bug: 80410283
Test: diff all product variables with multiproduct_kati
Change-Id: I133a385b3bc64261d73f616c416f7a905675c09d
Merged-In: I133a385b3bc64261d73f616c416f7a905675c09d
2018-06-14 15:43:42 +00:00
Anton Hansson be371e1656 Move a few packages from core_minimal.mk to base.mk.
All the products that inherit from base.mk add these packages, so moving
them up the hierarchy eliminates some duplication.

    DownloadProvider
    idmap
    libneuralnetworks
    mdnsd
    MediaProvider

Bug: 80410283
Test: diff all product variables with multiproduct_kati
Change-Id: I133a385b3bc64261d73f616c416f7a905675c09d
Merged-In: I133a385b3bc64261d73f616c416f7a905675c09d
2018-06-14 16:39:17 +01:00
Anton Hansson f93d674ac3 Merge "Dedupe packages in mk's that inherit core_minimal.mk" 2018-06-14 07:57:52 +00:00
Sundong Ahn 8970f61d99 Remove com.android.location.provider.xml
The com.android.location.provider.xml is removed from the
PRODUCT_PACKAGES, because xml files will be generated and installed by
soong.

Bug:77577799
Test: make -j
Change-Id: Idfbc6b09ca4337795277df8b98c73f6fd5865aff
2018-06-14 11:15:20 +09:00
Jiyong Park 1d46a3395f Merge "Support shared library in recovery mode"
am: 2371a7d60e

Change-Id: I1e4520c8a2663476bd3924aeca1cf5183240dbf7
2018-06-13 16:38:49 -07:00
Treehugger Robot 2371a7d60e Merge "Support shared library in recovery mode" 2018-06-13 23:14:29 +00:00
Bo Hu 82de42067e Merge "emulator: move sepolicy to goldfish project" 2018-06-13 22:14:32 +00:00
bohu 4abeb75f32 emulator: move sepolicy to goldfish project
The sepolicies are emulator specific and are installed
under vendor partition, move them to the right location.

BUG: 110030159
Change-Id: I6acc27a3b787a3fafd9373c84492537185b184c5
Merged-In: I6acc27a3b787a3fafd9373c84492537185b184c5
2018-06-13 12:45:47 -07:00
bohu 4001858313 emulator: move sepolicy to goldfish project
The sepolicies are emulator specific and are installed
under vendor partition, move them to the right location.

BUG: 110030159
Change-Id: I6acc27a3b787a3fafd9373c84492537185b184c5
Merged-In: I6acc27a3b787a3fafd9373c84492537185b184c5
2018-06-13 18:37:16 +00:00
Treehugger Robot 59c5127bea Merge "Create system.prop for GSI Pi" 2018-06-13 17:48:06 +00:00
Jiyong Park 53acaeab0a Support shared library in recovery mode
The dyanmic linker and the linker config script for the recovery mode
(*.recovery variants) are added to PRODUCT_PACKAGES.

Also this removes the mountpoint /system_root from the recovery image as the
recovery image is self-contained and the real system image is mounted at
/mnt/system which is created automatically at runtime.

Bug: 63673171
Test: `adb reboot recovery; adb devices` shows the device ID
Test: Select 'mount /system' in the recovery mode, then `adb shell`.
$ lsof -p `pidof adbd` shows that libm.so, libc.so, etc. are loaded from
the /lib directory.

Change-Id: Ice6c75b0b81bb9be696aaff3e095d87f19278995
2018-06-14 02:03:57 +09:00
Anton Hansson abf60f5526 Dedupe packages in mk's that inherit core_minimal.mk
The following packages are moved up one level, into core_minimal.mk
as all its descendants in master share them:
    ContactsProvider
    DefaultContainerService
    libaudiopreprocessing
    libfilterpack_imageproc
    libgabi++
    libstagefright_soft_aacdec
    libstagefright_soft_aacenc
    libstagefright_soft_amrdec
    libstagefright_soft_amrnbenc
    libstagefright_soft_amrwbenc
    libstagefright_soft_avcdec
    libstagefright_soft_avcenc
    libstagefright_soft_flacdec
    libstagefright_soft_flacenc
    libstagefright_soft_g711dec
    libstagefright_soft_gsmdec
    libstagefright_soft_hevcdec
    libstagefright_soft_mp3dec
    libstagefright_soft_mpeg2dec
    libstagefright_soft_mpeg4dec
    libstagefright_soft_mpeg4enc
    libstagefright_soft_opusdec
    libstagefright_soft_rawdec
    libstagefright_soft_vorbisdec
    libstagefright_soft_vpxdec
    libstagefright_soft_vpxenc
    mdnsd
    requestsync

Bug: 80410283
Test: diffed output of multiproduct_kati with aosp/703385 patched
Change-Id: Ic38f7aea3e865dbd9f170925214e3dea5233e61e
2018-06-13 07:44:00 +00:00
Bjoern Johansson 2bfb5627ea Merge "Support new hostapd build target without HIDL"
am: acbfc3fb94

Change-Id: I13bc909b0ba2204703ccc166ae17624efe8ab3d5
2018-06-12 17:12:15 -07:00
Anton Hansson f42afaf2a2 resolve merge conflicts of 2ab7fe2fe5 to stage-aosp-master
BUG: None
Test: git diff origin/pi-dev-plus-aosp is empty
Change-Id: Ib99471ae197d753efeeb17be95edbd72326f1358
Merged-In: Iddffd6982df039f5daa8be345de338ba11c63c10
2018-06-12 16:09:49 +01:00
Anton Hansson 5c1dc143cd Dedupe packages in mk's that inherit core_minimal.mk
The following packages are moved up one level, into core_minimal.mk
as all its descendants in master share them:
    ContactsProvider
    DefaultContainerService
    libaudiopreprocessing
    libfilterpack_imageproc
    libgabi++
    libstagefright_soft_aacdec
    libstagefright_soft_aacenc
    libstagefright_soft_amrdec
    libstagefright_soft_amrnbenc
    libstagefright_soft_amrwbenc
    libstagefright_soft_avcdec
    libstagefright_soft_avcenc
    libstagefright_soft_flacdec
    libstagefright_soft_flacenc
    libstagefright_soft_g711dec
    libstagefright_soft_gsmdec
    libstagefright_soft_hevcdec
    libstagefright_soft_mp3dec
    libstagefright_soft_mpeg2dec
    libstagefright_soft_mpeg4dec
    libstagefright_soft_mpeg4enc
    libstagefright_soft_opusdec
    libstagefright_soft_rawdec
    libstagefright_soft_vorbisdec
    libstagefright_soft_vpxdec
    libstagefright_soft_vpxenc
    mdnsd
    requestsync

Bug: 80410283
Test: diffed output of multiproduct_kati with aosp/703385 patched
Change-Id: Ic38f7aea3e865dbd9f170925214e3dea5233e61e
Merged-In: Ic38f7aea3e865dbd9f170925214e3dea5233e61e
2018-06-12 15:25:06 +01:00
Treehugger Robot acbfc3fb94 Merge "Support new hostapd build target without HIDL" 2018-06-12 12:49:49 +00:00
Bo Hu 41e2fd3dd8 Merge "emulator: update aosp sepolicies" 2018-06-12 12:49:43 +00:00
SzuWei Lin 326ad779c1 Create system.prop for GSI Pi
Properties for GSI Pi are not exactly the same as those for legacy GSI.
Create a new gsi_system.prop for GSI Pi to avoid reusing legacy
treble_system.prop used by legacy GSI (aosp_$arch_a(b) products).

Bug: 78605339
Test: build and observe the system/build.prop
Change-Id: I435e33558e244009af9a91a97580fd56591ff6f3
Merged-In: I435e33558e244009af9a91a97580fd56591ff6f3
(cherry picked from commit 3fc49fede8)
2018-06-12 18:03:31 +08:00
Bjoern Johansson a53c522678 Support new hostapd build target without HIDL
The new build target for hostapd does not include the HIDL control
interface and it's a separate binary from the hostapd used for WiFi
hotspots. This new binary needs its own SELinux rules and it should be
included in emulator builds since it's used to provide virtual access
points.

BUG: 74401469
Test: run cts -m CtsNetTestCases
Change-Id: I6a654ac2dea20af048ac731876ac603773fcf3d8
2018-06-11 15:56:51 -07:00
bohu 3a83195522 emulator: update aosp sepolicies
There have been quite some changes that should go to aosp.
This CL squash all of them into a single one.

Change-Id: I1e8d172b99cc98c93f2925fef32da8b461c277ed
Merged-In: I93b8489f710d194917d4b482ebca960c39658fd9
Merged-In: Ifac85db4e13d0b946f91b7eeffb4288d40d0ebb8
2018-06-11 15:56:25 -07:00
Anton Hansson 9f7cc0d0ab Dedupe mk rules in core_minimal.mk and core_tiny.mk.
These two are the only ones inheriting base.mk, and were largely similar.
This CL moves all the shared stuff up one level into base.mk.

One thing not de-duped yet is the PRODUCT_SYSTEM_SERVER_JARS variable,
as the order of that is significant.

Also sort various lists that were ordered arbitrarily.

Bug: 80410283
Test: diffed output of multiproduct_kati with aosp/703385 patched
Change-Id: Iddffd6982df039f5daa8be345de338ba11c63c10
Merged-In: Iddffd6982df039f5daa8be345de338ba11c63c10
2018-06-11 15:18:01 +01:00
Justin Yun 5d8dd1656b Merge "Include VNDK snapshot for 32 bit binder"
am: e59bb32cb7

Change-Id: Ia0b6864fcf44930003f687d2849d970e67ea49df
2018-06-10 18:54:58 -07:00
Treehugger Robot e59bb32cb7 Merge "Include VNDK snapshot for 32 bit binder" 2018-06-11 01:49:02 +00:00
Xin Li c8e90b5da3 Merge pi-dev-plus-aosp-without-vendor into stage-aosp-master
Bug: 79597307
Change-Id: I06ede5004b16e1ac0bb5c1c6a225c3c307bd26d1
2018-06-08 11:06:45 -07:00
Anton Hansson e91269dc65 Merge "Remove redundant package includes from makefiles." 2018-06-08 14:20:50 +00:00
Justin Yun 6c52bb0d33 Include VNDK snapshot for 32 bit binder
Use the VNDK sanpshot that matches the version of the target binder.

Bug: 74362637
Bug: 80450527
Test: m -j vndk_snapshot_package
Change-Id: I7d540654c9554f9d8a1feaec5eb441389d3960cb
2018-06-08 06:19:44 +00:00
Bo Hu 23508266a8 Merge "emulator: allows vendor_init to set qemu_props" into pi-dev
am: 8e2f247ca1

Change-Id: Ifac85db4e13d0b946f91b7eeffb4288d40d0ebb8
2018-06-07 21:05:49 -07:00
Bo Hu 8e2f247ca1 Merge "emulator: allows vendor_init to set qemu_props" into pi-dev 2018-06-08 02:48:22 +00:00
Yao Chen 59caa14c2d Merge "Add a system property to indicate if statsd should start" into pi-dev
am: 50e6c49020

Change-Id: Ia55a4541f3f7a24f88c41dc79479767719281127
2018-06-07 14:54:27 -07:00
Yao Chen 50e6c49020 Merge "Add a system property to indicate if statsd should start" into pi-dev 2018-06-07 21:10:15 +00:00
bohu 7cdfd674d5 emulator: allows vendor_init to set qemu_props
BUG: 109872686

this cl only impacts emulator images

Change-Id: I93b8489f710d194917d4b482ebca960c39658fd9
2018-06-07 09:19:19 -07:00
Treehugger Robot 7cf113d7dd Merge "Remove com.android.mediadrm.signer.xml" 2018-06-07 11:27:25 +00:00
SzuWei Lin 24279f7678 Merge "Remove AB update in GSI" into pi-dev
am: ff48801c0d

Change-Id: I1de8229fe80f8e753d191c18e6d3a51d9c573ade
2018-06-06 21:06:16 -07:00
TreeHugger Robot ff48801c0d Merge "Remove AB update in GSI" into pi-dev 2018-06-07 03:34:12 +00:00
TreeHugger Robot d40d7f271e Merge "Remove com.android.mediadrm.signer.xml" into pi-dev-plus-aosp 2018-06-07 01:20:04 +00:00
Yao Chen b76f355f4e Add a system property to indicate if statsd should start
Bug: 79324611
Test: manually tested on marlin_svelte
Change-Id: Id0becd80bd58806b674ac60903bad7fd39d7594b
2018-06-06 17:22:57 -07:00
Sunny Goyal 02af579574 Changing the default launcher and recents implementation for system build
am: 47acd31f57

Change-Id: I9a57cc92b8edfbe19ec8b5946ce43a5223ec8f59
2018-06-06 13:24:11 -07:00
SzuWei Lin 3905b85c0a Remove AB update in GSI
Bug: 80554868
Test: Boot a pixel device with GSI applied the patch
Change-Id: If37fa2e6c2909705492863788c222b954e784741
2018-06-06 18:02:27 +08:00
Treehugger Robot f1a5557164 Merge "Temporarily whitelisting system domains writing vendor props" 2018-06-06 03:54:11 +00:00
Sunny Goyal 47acd31f57 Changing the default launcher and recents implementation for system build
Bug: 77490347
Test: Build and flashed system image
Change-Id: I71dbd7eb731c70656bb816848027626b2c7430cc
2018-06-05 21:15:06 +00:00
Isaac Chen 6393783898 Merge "Set proper CPU variant for aosp_arm" into pi-dev
am: b2a5515585

Change-Id: I6f38dd1fbec1192d09cbe434650a8b4292c30315
2018-06-05 11:44:52 -07:00
TreeHugger Robot b2a5515585 Merge "Set proper CPU variant for aosp_arm" into pi-dev 2018-06-05 18:34:41 +00:00
Jeff Vander Stoep 72464c2c66 Merge "sepolicy: update OWNERS" am: 99a215f3db
am: d0be836bbb

Change-Id: I8dec02ad756ca70fbd059f796d4ffb98515c6cb2
2018-06-05 07:58:06 -07:00
bohu 3a036555e7 emulator: add host tools to sdk_phone_x86/64
am: 62d494b3fd

Change-Id: I530cbbe1cb59cc7397ac2dd14235fde0a25f1f04
2018-06-05 06:46:07 -07:00
Anton Hansson b2efa69c98 Remove redundant package includes from makefiles.
These packages are all included in other makefiles in the include
hierarchy:
- atrace, libdl, libtuils are in embedded.mk
- pppd is in base.mk

Bug: 80410283
Test: None
Change-Id: Id00e1af58f2db57090e89348a19c9b1ee7e3311a
2018-06-05 11:36:29 +01:00
bohu 62d494b3fd emulator: add host tools to sdk_phone_x86/64
Fix sdk_x86-sdk build breakage that requires host tools.

BUG: 109716817
Test: make -j110 PRODUCT-sdk_x86-sdk showcommands dist DIST_DIR=git_master-without-vendor-linux-sdk_x86-sdk/4821124 sdk_repo
Change-Id: I7b0b4d0e3b2c79bad305bc11a5c1d04eb1f2bdd1
2018-06-05 00:01:36 -07:00
Jeff Vander Stoep 8d235ecb49 sepolicy: update OWNERS
Test: n/a
Change-Id: I905b099c66e44468ca342bcbfe3dcb4dd44071a9
2018-06-04 22:10:54 -07:00
bohu 69e300dc79 emulator: base sdk_phone_x86/64 images on aosp
am: c5e25e9b84

Change-Id: I46e10d2d94aecaa07e49d76b1e808582bbeb6b43
2018-06-04 16:55:02 -07:00
huans c3710cbd95 Merge "Clean up deprecated properties. Set sepolicy for vendor process" into pi-dev
am: cd42897025

Change-Id: Icfb2831128ea7777efc1216e30157f43631e16b6
2018-06-04 14:29:44 -07:00
bohu c5e25e9b84 emulator: base sdk_phone_x86/64 images on aosp
BUG: 79941736

this cl only impacts emulator images

Change-Id: I63bc56ba69d313515ec3a1c73206f9a125a697ab
2018-06-04 14:11:55 -07:00
huans 360eb865ed Clean up deprecated properties. Set sepolicy for vendor process
Bug: 79941736
Test: Manually
Change-Id: Ia7ec0d90be1dbce402b8b6b52762c7384c0d5e1e
2018-06-04 11:02:12 -07:00
Bo Hu deec5c304c Merge changes from topic "emulator-gsi-configs" into pi-dev
am: 63762bdf41

Change-Id: Ia25fa1eeebb37e43ddf360f56f0c77c87c1892f0
2018-06-04 10:23:04 -07:00
Yahan Zhou d681493d4d Merge "Add broadcast radio service for emulator" into pi-dev
am: 52f964deb6

Change-Id: I6d7f4cf73718db5faa25f0bcd40a2b7bd9244083
2018-06-04 10:03:49 -07:00
Bo Hu 63762bdf41 Merge changes from topic "emulator-gsi-configs" into pi-dev
* changes:
  Update the rild.libpath to vendor.rild.libpath for aosp_$arch
  emulator:  add missing apns config
2018-06-04 16:29:36 +00:00
TreeHugger Robot 52f964deb6 Merge "Add broadcast radio service for emulator" into pi-dev 2018-06-04 13:45:18 +00:00
Sundong Ahn b87bdedba5 Remove com.android.mediadrm.signer.xml
The com.android.mediadrm.signer.xml is removed from the
PRODUCT_PACKAGES, because xml files will be generated and installed by
soong.

Bug:77577799
Test: make -j
Merged-In: Icd19b896c92b347e0452c5bfb21a331e727a4f08
Change-Id: Icd19b896c92b347e0452c5bfb21a331e727a4f08
(cherry picked from commit b2d6b3bcf2)
2018-06-01 15:27:44 +09:00
Sundong Ahn 090fd0c165 Remove com.android.mediadrm.signer.xml
The com.android.mediadrm.signer.xml is removed from the
PRODUCT_PACKAGES, because xml files will be generated and installed by
soong.

Bug:77577799
Test: make -j
Merged-In: Icd19b896c92b347e0452c5bfb21a331e727a4f08
Change-Id: Icd19b896c92b347e0452c5bfb21a331e727a4f08
(cherry picked from commit b2d6b3bcf2)
2018-05-31 20:17:34 +09:00
Isaac Chen b2e58893c3 Set proper CPU variant for aosp_arm
System image of aosp_arm products is the new GSI in Pi.
Its arch variants need to be the same as the legacy GSI built
with aosp_arm_ab so it can pass related CTS/VTS tests.

Bug: 80401108
Test: $ lunch aosp_arm-userdebug; m -j; emulator # booted OK
      $ lunch aosp_arm-userdebug; m -j cts

Change-Id: I29fffca3e02a2251913a327b54640fc622e77a8d
2018-05-31 10:01:08 +08:00
huans ae665f0833 Update the rild.libpath to vendor.rild.libpath for aosp_$arch
bug: 80137441

Test: build and runaosp_x86-userdebug. adb logcat -b radio.
check the rild read the right property vendor.rild.libpath

Change-Id: I0529c32b79cf791821d71369bcd0fb244c13361c
2018-05-30 14:48:31 -07:00
huans 3d31afe594 emulator: add missing apns config
We add goldfish specific apns config files to /data/misc/apns/etc/
for aosp_* targets to have working telephony and wifi.

BUG: 79584197
Change-Id: I46591d923496420212cd279c0b90f0b4eb11cea4
2018-05-30 14:48:25 -07:00
SzuWei Lin 494d2fe97b Enable metadata in GSI
am: 5d356e2397

Change-Id: I2086d56e42b2318a8080d16f13d48c9ee4a23bf1
2018-05-30 11:05:42 -07:00
SzuWei Lin 5d356e2397 Enable metadata in GSI
Add BOARD_USES_METADATA_PARTITION to GSI to enable metadata folder
under the root folder.

Bug: 80407843
Bug: 79781913
Test: Boot on a Pixel device with GSI applied the patch
Change-Id: I5544b76b54300aa5a87aa4fa3c0ec6feff13a554
2018-05-30 17:01:49 +08:00
Vishwath Mohan 7bfd882a23 Apply CFI include paths to all product configs.
am: f8d4dc5787

Change-Id: I62739ecb272c088d7468b7bdf47bf923a42be079
2018-05-29 16:36:09 -07:00
Vishwath Mohan f8d4dc5787 Apply CFI include paths to all product configs.
The current VNDK ABI snapshot expects that CFI is disabled for
components that either in the include paths (from cfi-common.mk) OR
enabled directly in the makefile/blueprint. However, on non-arm64
architectures, the build system was only disabling CFI for vendor
components in the include paths.

This topic corrects it by (a) removing the include paths check to disable
CFI for vendor variants, and (b) inheriting the CFI include paths in
all product configs to ensure that when we update the ABI we're able
to move to relying exclusively on (PRODUCT_)CFI_INCLUDE_PATHS.

Bug: 66301104
Test: ABI matches for all architectures.
Change-Id: I4d845cd9925354d565e06020c479cc3f7ab28f61
2018-05-28 13:51:05 -07:00
Yahan Zhou 6d6d4702d5 Add broadcast radio service for emulator
This cl does not impact real devices.

BUG: 79750456

Test: atest VtsHalBroadcastradioV1_0Target
Change-Id: I6fac31902a8414e550b9053b6985f818674b3e9d
2018-05-25 22:16:26 +00:00
Vishwath Mohan 118025a161 Enable CFI for vendor components on aosp_arm64_ab product-configs
am: 014d1fc969

Change-Id: I3c9c6ece3cdb1abe3a06c7803dd0bbf5310d9acb
2018-05-25 10:44:33 -07:00
Vishwath Mohan 014d1fc969 Enable CFI for vendor components on aosp_arm64_ab product-configs
The aosp_arm64_ab product config needs to also enable CFI for some
vendor components (if they exist).

Bug: 66301104
Test: lunch aosp_arm64_ab-userdebug && m -j40
Change-Id: Iae670c2d44c00d3dfb0e312e1492b37bbb737d4f
2018-05-25 07:01:09 -07:00
Vishwath Mohan 088506c303 Merge "Enable CFI by default but restrict CFI_INCLUDE_PATHS" into pi-dev
am: d002e49501

Change-Id: I32d21f2dbbbaf4bb7f8a6be033d036ab626cba10
2018-05-25 00:24:49 -07:00
Jiyong Park fbaf8f7530 Merge "Don't copy system/sbin/adbd to recovery" am: 93ca8d3789
am: b771720b24

Change-Id: I29f78cccc259d6a6d1046578f5576ec12ca5be98
2018-05-24 23:15:31 -07:00
Vishwath Mohan 6106a4ead5 Enable CFI by default but restrict CFI_INCLUDE_PATHS
This CL enables CFI on security sensitive components for product
configs that inherit core_64_bit.mk (and core_64_bit_only.mk). Note
that this only requests the build system to do so. Internal build
logic will dictate if this is actually enabled on the build or
not (CFI is currently disabled for ARM32 and MIPS for example).

In addition, this also restricts CFI_INCLUDE_PATHS and
PRODUCT_CFI_INCLUDE_PATHS to Arm64 architectures only. This helps
narrow which targets enable CFI out of the box.

Bug: 66301104
Test: CFI is enabled on aosp_* targets
Change-Id: I52af499dc34cd4b42fbfb1175f6a37aaf17b65dd
2018-05-24 22:14:03 -07:00
Ruchi Kandoi 58cd1455fc Adds SecureElement apk to core_minimal.mk and core_tiny.mk
am: 2dcba6fed7

Change-Id: Ibc87a96a784b45f2f23dc1731c9b1016b05b8089
2018-05-24 17:31:16 -07:00
Ruchi Kandoi 2dcba6fed7 Adds SecureElement apk to core_minimal.mk and core_tiny.mk
Bug: 79999791
Bug: 80000595
Test: CtsOmapiTestCases; works on phones/tablets, needs to be
verified on wearables
Change-Id: I114b9d02097e880d8369b75790fae5b995db8e59
2018-05-24 21:57:03 +00:00
Jiyong Park 6b79c9b769 Temporarily whitelisting system domains writing vendor props
system properties must not be used as a communication channel in between
system and vendor processes. However, there has been no enforcement on
this: system process could write system properties that are owned and
read by vendor processes and vice versa. Such communication should be
done over hwbinder and should be formally specified in HIDL.

Until we finish migrating the existing use cases of sysprops to HIDL,
whitelisting them in system_writes_vendor_properties_violators so that
the violators are clearly tracked.

These violators are allowed only for P, but not for Q.

Bug: 78598545
Test: m -j selinux_policy when choosecombo'ed to aosp_arm64
Merged-In: I8f66aa20bb2d926cf517d40c93f4300c4d16b04b
Change-Id: I8f66aa20bb2d926cf517d40c93f4300c4d16b04b
(cherry picked from commit bb1432b61b)
2018-05-24 19:03:25 +09:00
Jiyong Park ce3e34f6ac Don't copy system/sbin/adbd to recovery
adbd for recovery partition is built separately. No need to copy.
Instead, the recovery version adbd.recovery is added to
PRODUCT_PACKAGES.

Bug: 79146551
Test: m -j
Test: adb reboot recovery; adb devices
Change-Id: I7f0ee8b21cbafc0ab5a4eb1f9c8ee70774617013
2018-05-24 18:19:49 +09:00
Hung-ying Tyan 38b5df5add Merge "configstore: uprevisioned to 1.1" into pi-dev
am: 76c6cf247e

Change-Id: Iad9d5a54f74782397bc369d466c2f0dabb092090
2018-05-23 18:19:15 -07:00
TreeHugger Robot 76c6cf247e Merge "configstore: uprevisioned to 1.1" into pi-dev 2018-05-24 00:50:19 +00:00
Vishwath Mohan 158a6d7d44 Enable CFI for the aosp_arm64_ab product config.
am: 0784f0eaf5

Change-Id: I0e1fed4a025c08a4d51cddcc9340f1b4f5a5d6a9
2018-05-23 14:11:19 -07:00