Commit graph

2043 commits

Author SHA1 Message Date
Jiyong Park
709cb01dd8 Merge "Change ld.config.txt to a module" into oc-dev
am: 9fdd426c91

Change-Id: I73a88e93ac2982ccc51ec81ecc8fbe4d66665dc7
2017-04-15 02:04:23 +00:00
TreeHugger Robot
9fdd426c91 Merge "Change ld.config.txt to a module" into oc-dev 2017-04-15 01:47:40 +00:00
Yifan Hong
9c20c473ef Merge changes from topic 'assemble_vintf' into oc-dev
am: ffd66c35bf

Change-Id: I73f8430739e3d129716c3569c000433786099bf1
2017-04-15 01:31:39 +00:00
TreeHugger Robot
ffd66c35bf Merge changes from topic 'assemble_vintf' into oc-dev
* changes:
  Use assemble_vintf to verify framework manifests.
  Use assemble_vintf to verify device manifests.
2017-04-15 01:21:23 +00:00
Yifan Hong
aa21221f80 Use assemble_vintf to verify framework manifests.
Test: builds, and verify that system/manifest.xml is there.

Bug: 36681384 Runtime-Collectible information must be statically
collectible
Bug: 36983271 VINTF checked at build time

Change-Id: Ic3bb50211311fa423a2ad56bd2891cb57d7dc1a5
2017-04-14 16:29:55 -07:00
Justin Klaassen
16c24c350b Merge "Add "android.software.preview_sdk" feature" into oc-dev
am: 89f74db432

Change-Id: I6dc6a8361400d36e52b47b12f4267739575bca37
2017-04-14 22:44:00 +00:00
Justin Klaassen
89f74db432 Merge "Add "android.software.preview_sdk" feature" into oc-dev 2017-04-14 22:39:59 +00:00
Martijn Coenen
f9c5581621 Merge "Add HIDL base/manager packages to PRODUCT_BOOT_JARS." into oc-dev
am: d75be23640

Change-Id: Id696903b1dab45c9373bcf77c4f6f5e708c33225
2017-04-14 05:53:15 +00:00
Martijn Coenen
d75be23640 Merge "Add HIDL base/manager packages to PRODUCT_BOOT_JARS." into oc-dev 2017-04-14 05:43:49 +00:00
Michael Schwartz
b4baff4961 Merge "Rule to copy device manifest to device" into oc-dev
am: ceeaa7be20

Change-Id: Ibd3b2ffbc591e22682539e2cdb49b0b622549f54
2017-04-14 03:41:01 +00:00
Martijn Coenen
cc50370515 Merge "Add NfcNci to default builds." into oc-dev
am: 53b345dd22

Change-Id: I009dce5613b66b5bf8bcc63a6945a47c3ada9252
2017-04-14 03:40:48 +00:00
Michael Schwartz
ceeaa7be20 Merge "Rule to copy device manifest to device" into oc-dev 2017-04-14 03:25:55 +00:00
Martijn Coenen
53b345dd22 Merge "Add NfcNci to default builds." into oc-dev 2017-04-14 03:18:40 +00:00
Steven Moreland
dfabcc5566 Add HIDL base/manager packages to PRODUCT_BOOT_JARS.
Bug: 36603742
Bug: 36565056
Test: marlin boots, dynamically linking against these works
Change-Id: I1bfb73f2bce858823ad6ba8d826e42bd38cc2317
2017-04-13 19:30:48 -07:00
Justin Klaassen
2bfe0943c8 Add "android.software.preview_sdk" feature
Conditionally add the "android.software.preview_sdk" feature to any
targets that have a Build.VERSION.CODENAME != "REL". This allows clients
to filter out platforms that are not running official Android releases.

Bug: 31064561
Test: verified using PackageManager#getSystemAvailableFeatures()
Change-Id: I539e9537f5f9a572db0a15489b14710e2e8eb0c0
2017-04-13 20:57:50 +00:00
Martijn Coenen
96d62d7fb7 Add NfcNci to default builds.
The package won't be started if the feature is not
present on the device, but we need it for generic
builds.

Bug: 36873979
Test: marlin builds
Change-Id: Ib8110e5af00f8365f45f50b147fe5fb42f1a14e1
2017-04-13 11:13:46 -07:00
Michael Schwartz
4d9cb56866 Rule to copy device manifest to device
The device manifest defines the collection of HAL interfaces exposed by
the vendor. Create a common rule so each target need not define their own.

Bug: 36810913
Test: Ran marlin build and inspected file was copied
Change-Id: I9f53796fdd85e706f91664d275aff6dbd785213f
2017-04-13 08:42:42 -07:00
Martijn Coenen
d997015f4b Merge "Add hwservice_contexts to default builds." into oc-dev
am: 14d363fa42

Change-Id: Ibe4ad09dfa98fa438eeb840845cf32216ecd103b
2017-04-13 03:43:42 +00:00
Martijn Coenen
14d363fa42 Merge "Add hwservice_contexts to default builds." into oc-dev 2017-04-13 03:34:49 +00:00
Jiyong Park
93cae68532 Change ld.config.txt to a module
ld.config.txt is changed to a module. So, installing it via
PRODUCT_PACKAGES intead of PRODUCT_COPY_FILES.

Bug: 37138083
Test: sailfish boots
Change-Id: I8689b7c090901d4f157c5da8a67326c97373ed29
2017-04-13 11:29:24 +09:00
Jaekyun Seok
b1be172535 Merge "Remove resource overlay" into oc-dev
am: 86d479d33e

Change-Id: Ic5241b44ea208c4301c592a7420fe2f4590e6022
2017-04-13 01:46:58 +00:00
Martijn Coenen
bcd029c587 Add hwservice_contexts to default builds.
Bug: 34454312
Test: marlin boots
Change-Id: Ifff8c2842b4131dba6a480c87c6db1e65497e6ef
2017-04-12 12:43:26 -07:00
Jaekyun Seok
0d16dd1942 Remove resource overlay
Test: building succeeded and tested with sailfish vendor image.
Bug: 36231603

Change-Id: I5d2d6d882ef3fc8a807a8b0ecd2f59f8a4a03e1f
2017-04-12 18:35:19 +09:00
Martijn Coenen
01371056bb Add 'vndservice' to default builds.
am: 1fe4f23a04

Change-Id: Ib6015b8ce6abb634963e251aea825d660bf59968
2017-04-07 20:07:14 +00:00
Martijn Coenen
1fe4f23a04 Add 'vndservice' to default builds.
To query vndservicemanager and its services.

Bug: 36987120
Test: vndservice present and works
Change-Id: Ic65acbde17a1be5b728eeeac0f799a86c1d8c1fa
2017-04-07 10:49:22 -07:00
doheon1.lee
8250dc4837 Added make files for variable Nougat MR1
Nougat MR1 has different API LEVEL from previous releases,
PRODUCT_SHIPPING_API_LEVEL should be set to 25.

Change-Id: Ib3679bba4105dc99b96224c5f5554c1f0e4ab127
2017-04-05 19:45:50 +00:00
Martijn Coenen
31ee76a1e0 Merge "Add vndservicemanager to default builds." into oc-dev
am: a4f90284c7

Change-Id: I13148e6efb9f7ecb57c95000b69392d6ec69b65f
2017-04-05 15:59:06 +00:00
Martijn Coenen
ca1fd78190 Add vndservicemanager to default builds.
vndservicemanager will be used for AIDL/binder
communication between processes running from
the /vendor partition. While technically only
required on full-treble devices, it is useful
to have on Android devices by default, since it
allows vendors to distribute a single binary talking
to vndservicemanager, instead of having to maintain
two versions that talk to different servicemanagers.

On devices that don't have a new kernel prebuilt with
/dev/vndbinder yet, vndservicemanager will simply
block indefinitely.

Also add new vndservice_contexts target, that
defines the service contexts for vendor services.

Bug: 36052864
Test: Marlin boots with and without /dev/vndbinder
Change-Id: I7334b5cb357dc6d4c5de8632e835dd892cd2f174
2017-04-04 14:06:04 -07:00
Elliott Hughes
d36d82a117 resolve merge conflicts of 7206a3b38c to oc-dev-plus-aosp
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ib00dfc08b1ca7223d49b18fceab780c5dbec0d7e
2017-04-03 10:48:05 -07:00
Elliott Hughes
b7b29357ae Merge "Switch to a shell_and_utilities phony module."
am: cdcc4c52aa

Change-Id: Idb8a4ce418a64ac8691df9d1890d60f32102c1cc
2017-04-03 17:19:35 +00:00
Elliott Hughes
c86ea11fe9 Switch to a shell_and_utilities phony module.
(cherrypick of cb7d59687483c9532beecde60fe96053eda76948.)

Bug: N/A
Test: builds
Change-Id: I6416d9dded4cc225f57f0a521cf6114f39203ece
2017-04-03 17:13:58 +00:00
TreeHugger Robot
4afcb8c6b6 Merge "Add vr binary to commands" into oc-dev 2017-03-31 23:48:25 +00:00
Karthik Ravi Shankar
35aed3da10 Add vr binary to commands
Bug: 36071574

Change-Id: I8a953950a4eb96d9ffa2ee5789e3c8cd98b4dd0e
Signed-off-by: Karthik Ravi Shankar <karthikrs@google.com>
2017-03-31 11:17:59 -07:00
Nicolas Geoffray
7d32b8bb4f Introduce a whitelist for core apps used by system server.
And by default 'speed' compile those apps at build time.

bug:33799337
Test: m -j32
Change-Id: I7be3bbfef59c020a34b9a82ef038bd27210bc9d7
(cherry picked from commit 9af483488a)
2017-03-30 11:47:13 +00:00
Sunny Goyal
4f49a94fe7 Including WallpaperPicker in SDK build
Bug: 35724630
Test: None
Change-Id: I5b066171b70899d4d980d3cdedd32ad58ade9b90
2017-03-29 01:32:47 +00:00
Esteban Talavera
deb26ad395 Revert "Remove resource overlays"
This reverts commit 1dcf689c3b.

The CL broke git_master/sailfish-userdebug_P and oc-release/marlin_svelte

Bug: 36231603
Test: "make" works again for oc-release/marlin_svelte after reverting both CLs from this topic

Change-Id: I861b8b11c29293fb4a0c746768c03bc4eb986807
2017-03-28 17:02:20 +01:00
TreeHugger Robot
0b1e95f08b Merge "Remove resource overlays" 2017-03-28 01:02:54 +00:00
Jeff Vander Stoep
b8093c0e87 Merge "embedded.mk: Make phony selinux_policy" am: b30c12df3e am: 6d418a86b7
am: 856b00b8db

Change-Id: Ib3fc261851e1a19eea91513f0ea2fbe3dde5ba1c
2017-03-27 20:12:11 +00:00
Jeff Vander Stoep
6d418a86b7 Merge "embedded.mk: Make phony selinux_policy"
am: b30c12df3e

Change-Id: Iba9b4c92d1772f50f77a112747b32d4c4290e363
2017-03-27 20:06:41 +00:00
Treehugger Robot
b30c12df3e Merge "embedded.mk: Make phony selinux_policy" 2017-03-27 20:03:04 +00:00
Jiyong Park
d68246c8e4 Remove mailin/sailfish fstab from the generic system image
fstab files are now in /vendor/etc. No need to have it in system.

Bug: 36229492
Test: aosp_arm64_ab should boot in sailfish/marlin
Change-Id: I9ced5361ce3e3a98722d45124ee58d4411f06273
2017-03-27 15:46:34 +09:00
Jaekyun Seok
1dcf689c3b Remove resource overlays
Test: building succeeded and tested on sailfish and marlin with
http://ag/2009238.
Bug: 36231603

Change-Id: I82d672cbdca3b8597de71c821df8fb92f27318f3
2017-03-27 14:52:57 +09:00
Jeff Vander Stoep
2064364765 embedded.mk: Make phony selinux_policy
Moves selinux policy build decisions to system/sepolicy/Android.mk.
This is done because the PRODUCT_FULL_TREBLE variable isn't available
in embedded.mk and TARGET_SANITIZE isn't available to dependencies of
init.

Test: Build/boot Bullhead PRODUCT_FULL_TREBLE=false
Test: Build/boot Marlin PRODUCT_FULL_TREBLE=true
Test: Build Marlin TARGET_SANITIZE=address. Verify asan rules are
      included in policy output.

Bug: 36138508
Change-Id: I792786cd867bae3e1baeb824167a848948a719df
2017-03-26 14:51:38 -07:00
Dimitry Ivanov
b5bbf1ad0f Merge "Add ld.config.txt to rootdir/etc" am: 86559441a1 am: 3fd5bf0f82
am: 4926df7b5f

Change-Id: Ie5ba33fe45bfaa069f3454e50b5eaf3ca5df1deb
2017-03-25 05:26:21 +00:00
Dimitry Ivanov
3fd5bf0f82 Merge "Add ld.config.txt to rootdir/etc"
am: 86559441a1

Change-Id: I35da84dceb546c04494e16106745b63cc80234b0
2017-03-25 05:21:15 +00:00
Treehugger Robot
86559441a1 Merge "Add ld.config.txt to rootdir/etc" 2017-03-25 05:17:32 +00:00
TreeHugger Robot
d4bcd158a5 Merge "Use HWC2 for all emulator images." 2017-03-24 21:03:37 +00:00
Jiyong Park
06241051e8 Make telephony work on generic system image
Bug: 36070427
Test: modem is up and emergency call can be made
Change-Id: Ic09200943a7ae7c51e420c6485f3b1b95c702265
2017-03-24 08:47:47 +00:00
TreeHugger Robot
e496c6a76f Merge "Add libion to the generic sytem image for camera" 2017-03-24 07:56:57 +00:00
TreeHugger Robot
75187d0d8e Merge "Add wifi support to the generic system image" 2017-03-24 07:51:34 +00:00
Jiyong Park
a14bf425f7 Add libion to the generic sytem image for camera
Camera HAL is using libion. I believe libion is generic library, so put
it in this generic system image.

Bug: 36043196
Test: make, flash and check that libion.so is in /system/lib.
Change-Id: I2e6b68e5899e27c603476ad7c5cd64f3cd5a8c53
2017-03-24 06:29:02 +00:00
TreeHugger Robot
74922e8dfb Merge "Remove dependency on marlin sepolicy" 2017-03-23 22:30:19 +00:00
TreeHugger Robot
c003af00a1 Merge "Remove media config file copy rule" 2017-03-23 20:14:37 +00:00
Lingfeng Yang
450cd0ba62 Use HWC2 for all emulator images.
bug: 36375335

Change-Id: I1a220d7ea0174a87713e3009ceba22a5e3f66f25
2017-03-23 19:33:33 +00:00
Diego Wilson
f4efd73e96 Remove dependency on marlin sepolicy
Now that the selinux policy has been split between the system and
vendor partitions the aosp_arm64_ab build variant no longer
depends on the marlin selinux policy to work on marlin and sailfish.

Test: build and flash aosp_arm64_ab system.img on marlin and sailfish
Change-Id: I7681207284d783ffca1acccf44dbb159ea3b521c
2017-03-23 13:30:04 -04:00
Diego Wilson
70251beb44 Add libaudioroute.so to aosp_arm64_ab
libaudioroute.so is required in the system.img
in order for audio to be functional.

Test: hear tones on dialer in marlin and sailfish
Change-Id: I477aff9d041a8c60c88e7c74aab3b6802d43724f
2017-03-22 11:12:21 -07:00
Michael Wright
32c89d462f Merge "Remove inputflinger from the builds." 2017-03-22 15:16:53 +00:00
TreeHugger Robot
76c194e2a3 Merge "Change mediacodec to android.hardware.media.omx@1.0-service" 2017-03-22 06:15:40 +00:00
Jiyong Park
3e213c849b Add wifi support to the generic system image
Added wifi-related packages (except those not generic such as
wpa_supplicant) to the generic system image.

Bug: 36015569
Test: Wifi works with this generic image on sailfish.

Change-Id: Ib4d07facd4eb1ca0f375d9135a75b892d0ef80a4
2017-03-22 02:20:34 +00:00
Jaesoo Lee
58f8dfa5a6 Merge "removed "android.hardware.configstore@1.0-impl" from PRODUCT_PACKAGES" am: 946af3fa5d am: 3973c2af63
am: 9c41aa58eb

Change-Id: Ic2a10e7fe09eec97680619779b65fb36ede00758
2017-03-22 01:07:50 +00:00
Jaesoo Lee
3973c2af63 Merge "removed "android.hardware.configstore@1.0-impl" from PRODUCT_PACKAGES"
am: 946af3fa5d

Change-Id: I59d10ade7c801359365d847d6c433d719a4128c2
2017-03-22 01:04:26 +00:00
Jaesoo Lee
a1d99c1351 removed "android.hardware.configstore@1.0-impl" from PRODUCT_PACKAGES
This change removes the passthough mode implemention of Configstore.

Bug: 35325577
Test: android.hardware.configstore@1.0-impl.so not exist in outputs and
    Configstore works in binderized mode

Change-Id: Ie9ec24c33701356b7fa8c4f6cfc372c09051f62c
Merged-In: Ic16d5ebe30fabfd62ba4e444fe2775ddfbe2a18a
2017-03-21 11:01:53 +09:00
TreeHugger Robot
616966821c Merge "Add clear key CAS plugin (libclearkeycasplugin.so) to build." 2017-03-20 22:25:47 +00:00
Diego Wilson
bc372ec3ec Add libdynamic_sensor_ext to aosp_arm64_ab
This library was added as a dependency of the
sensors HAL.

Test: build and load aosp_arm64_ab on sailfish and marlin.
Change-Id: Iaa413d3572ec12e1f022539a5ade1f3c2d793999
2017-03-20 13:02:53 -07:00
Pawin Vongmasa
022cf53b82 Change mediacodec to android.hardware.media.omx@1.0-service
Test: Manual use of Camera and YouTube apps.
Bug: 35328855
Change-Id: I505fc96384fdeb3fa4ad2ba69d93cc64cd8e6b9e
2017-03-17 17:46:36 -07:00
Michael Wright
7d4944da37 Remove inputflinger from the builds.
Some day... some day...

Test: builds
Change-Id: I1a0390c7bfa15f7590a869ba5e12e112ec510602
2017-03-16 14:38:36 -07:00
Chong Zhang
ad3bb1b0f2 Add clear key CAS plugin (libclearkeycasplugin.so) to build.
bug: 22804304
Change-Id: Ie1bbe563740d7002f0fc082b4e10ca04d80c1277
2017-03-16 12:38:01 -07:00
Lingfeng Yang
ad1a1ac03f Add hwcomposer to emulator image build
Change-Id: Ifa366f54ab5a380f71171b953168c597b2c5603f
2017-03-16 12:26:56 -07:00
Jaekyun Seok
a7e65dbf90 Remove media config file copy rule
ag/1923309 and ag/1918350 have already moved them into vendor
partition.

Test: building succeeded.
Bug: 35653062
Change-Id: Idcf1b481fb043867bb64ff7c63800c44a151f32d
2017-03-16 17:48:41 +09:00
Dimitry Ivanov
d994a73989 Add ld.config.txt to rootdir/etc
This file is used by linker to create custom namespace
configuration for binaries.

Bug: http://b/30706810
Test: m
Change-Id: Ifc4e43ed51c6906c75a7f0d9f00a816b5e16c4d8
2017-03-15 14:47:35 -07:00
Alex Klyubin
71d223b8c3 Merge "Remove unused /selinux_version" am: f32107fbb2 am: ac5ac23bb3
am: 561e101ec9

Change-Id: I25fed6576441cbd329bb0228ff47c625172c8444
2017-03-15 20:15:42 +00:00
Alex Klyubin
ac5ac23bb3 Merge "Remove unused /selinux_version"
am: f32107fbb2

Change-Id: Iba4f3d7eca37bbf20d9527245baf44f32b67c07f
2017-03-15 20:05:15 +00:00
Alex Klyubin
4fe461d2a0 Remove unused /selinux_version
This file is no longer needed because it was needed for supporting
reloadable/dynamic SELinux policy which is no longer supported.

Test: Clean build, flash, device boots without additional denials.
      Reboot to recovery works, no additional denials.
Bug: 33642277
Change-Id: Ie65e74b8c8437694bc1ea019ab844f60f9e89ade
2017-03-15 09:47:36 -07:00
TreeHugger Robot
54ac816381 Merge "Add aosp_arm64_ab for generic system image for A/B-ready devices" 2017-03-14 23:47:31 +00:00
Jaesoo Lee
371f5d502c Merge "configstore: add default implementation of configstore@1.0 HAL"
am: 2b61f19254

Change-Id: Ie122892697d2073575fcbb7dae4ba9838778517e
2017-03-14 06:50:30 +00:00
Jaesoo Lee
2b61f19254 Merge "configstore: add default implementation of configstore@1.0 HAL" 2017-03-14 06:44:13 +00:00
Jeff Vander Stoep
4d9e183836 Merge "Include file_contexts conditionally elsewhere" am: e65af5ce72 am: 10539b3253
am: 96377665f2

Change-Id: Ib46554b2ebccd930a4b2a827c7fdd8a9ff0f15db
2017-03-11 00:06:42 +00:00
Jeff Vander Stoep
10539b3253 Merge "Include file_contexts conditionally elsewhere"
am: e65af5ce72

Change-Id: Ib781e0237f2bd68431d50890b9d9beaeff86bf74
2017-03-10 23:59:39 +00:00
Jiyong Park
4ed780c454 configstore: add default implementation of configstore@1.0 HAL
This change adds default implementation of configstore@1.0 HAL to all
embedded devices.

Bug: 34314793
Test: build. make sure /system/bin/hw has file
android.hardware.configstore@1.0-service

cherry-picked
1d6ab958c configstore: add default implementation of configstore@1.0 HAL

Merged-in: I65f416560de9d65c57e6cfcb9a6fe26b0140d4a6
Change-Id: Ib68fa325a0f0ce60db0701e16a5a9056411fb398
2017-03-10 10:13:17 +09:00
Jiyong Park
38f8aacf3b Add aosp_arm64_ab for generic system image for A/B-ready devices
aosp_arm64_ab is added as a product to build a generic system image for
all devices with ARM64 and A/B ready partitions. For now, it only
supports sailfish/marlin devices because following items are not yet
split.

- fstab
- overlays
- sepolicy

Bug: 35653062
Test: build and flash it to sailfish (or marlin)

$ source build/envsetup.sh; choosecombo 1 sailfish userdebug
$ ENABLE_EARLY_MOUNT=true ENABLE_TREBLE=true m -j 80
$ fastboot flashall
(For now, the two ENABLE_* are required to install  *.rc and *.prop
files into vendor partition. This restriction will be removed in the
future.)

$ source build/envsetup.sh; choosecombo 1 aosp_arm64_ab userdebug
$ m -j 80 systemimage
$ fastboot flash system out/target/product/generic_arm64_ab/system.img
$ fastboot -w reboot

Change-Id: Ia91163f2d51e90a488c9451cba23242887ea82ba
2017-03-09 17:14:37 +09:00
Jeff Vander Stoep
f57a154f2e Include file_contexts conditionally elsewhere
Test: Marlin and Bullhead build and boot with no new denials.
Test: Marlin and Bullhead recovery boots with no new denials.
Test: Bullhead boots with file_contexts.bin in /
Test: Marlin boot with /system/etc/selinux/plat_file_contexts and
      /vendor/etc/selinux/nonplat_file_contexts.
Bug: 36002414

Change-Id: I25af653e060c0c72ea6ad08db8869132885adff8
2017-03-08 21:12:47 -08:00
bohu
7154859047 Emulator: enable GPS hidl service and impl
BUG: 36052760
Change-Id: I3fa3b6bd11e5791f284676fa82b3106725aaaa17
2017-03-08 16:27:56 -08:00
bohu
318905fff4 Emulator: Enable sensors hal support for hidl passthrough mode.
BUG: 35990227
Change-Id: Ia534f87727d59e5497ce46ed413aff739e5cf701
2017-03-07 00:18:28 +00:00
Alex Klyubin
5a8d726ced Merge "Include secilc and sepolicy conditionally, elsewhere" am: 3e78704825 am: 8fe478de64
am: d485d2a10c

Change-Id: Ic2da20423482bb5d8aff2d61a29044a547c42753
2017-03-03 04:02:10 +00:00
Alex Klyubin
8fe478de64 Merge "Include secilc and sepolicy conditionally, elsewhere"
am: 3e78704825

Change-Id: I00b1084eca64b0c42ea4f814f75a9e1f53a87879
2017-03-03 03:55:46 +00:00
Treehugger Robot
3e78704825 Merge "Include secilc and sepolicy conditionally, elsewhere" 2017-03-03 03:50:48 +00:00
Calin Juravle
a5ab384e1c Merge "Enable secondary dex compilation in the background dexopt job"
am: 34200a1ad1

Change-Id: I6414d7e0a2a2bc783e85094f9cb11fe0290ac0e4
2017-03-02 23:58:24 +00:00
Calin Juravle
34200a1ad1 Merge "Enable secondary dex compilation in the background dexopt job" 2017-03-02 23:54:24 +00:00
Calin Juravle
148d23106b Enable secondary dex compilation in the background dexopt job
Test: adb shell cmd package bg-dexopt-job
Bug: 32871170

(cherry picked from commit dc308c1b1d)

Change-Id: I21664d5e11dada868dab502498b7c5e598852289

Merged-In: I473e291a26335bd766c8845d2ea28c4f1e45db53
2017-03-02 13:04:17 -08:00
Alex Klyubin
8e87853a04 Include secilc and sepolicy conditionally, elsewhere
This removes the unconditional inclusion of secilc and sepolicy.
These artefacts are now conditionally included by system/core/init.
The reason for declaring the conditional inclusion there is because
the desired conditional inclusion based on PRODUCT_FULL_TREBLE cannot
be declared here because PRODUCT_FULL_TREBLE is not yet available when
this file is interpreted.

Test: Device boots, no additional SELinux denials. This test is
      performed on a device with PRODUCT_FULL_TREBLE set to true, and
      on a device with PRODUCT_FULL_TREBLE set to false.
Test: Device with PRODUCT_FULL_TREBLE set to true contains secilc and
      the three *.cil files, but does not contain the sepolicy file.
      Device with PRODUCT_FULL_TREBLE set to false contains sepolicy
      file but does not contain the secilc file or any *.cil files.
Bug: 31363362

Change-Id: Ia3f38948b71a054918f5f63c594ba62a033e1066
2017-03-02 12:58:38 -08:00
Yifan Hong
8c86bc72b4 Merge "sintf.xml => manifest.xml" am: aeec3bfde7 am: 28070816fb
am: 1b510a9705

Change-Id: I6fb3f8c4f44d4f3fe68a915b1a6f85fc7db5c107
2017-03-02 03:55:56 +00:00
Yifan Hong
28070816fb Merge "sintf.xml => manifest.xml"
am: aeec3bfde7

Change-Id: Ice2fd7685dc57f05b3911d5b74a922d2731c8669
2017-03-02 03:46:30 +00:00
Yifan Hong
c3373a32e4 sintf.xml => manifest.xml
Bug: 35870239
Test: make -j64 and ensure manifest.xml is there.
Change-Id: I5eccc6dcdc04a3caadc3ccce1d8b58c12f5950ee
2017-03-01 18:09:28 -08:00
Philip P. Moltmann
46c821d577 Merge "Ship BuiltInPrintService in default repo" am: 779ba5e692 am: d73c40d73c
am: 7d91f81dfb

Change-Id: I7f88828e279abf0cdf154dbeefc4a48359646886
2017-03-01 19:35:53 +00:00
Philip P. Moltmann
d73c40d73c Merge "Ship BuiltInPrintService in default repo"
am: 779ba5e692

Change-Id: Iee8e4c9a0b7ebd555c94865e8781fbd1a996e56c
2017-03-01 19:30:52 +00:00
Philip P. Moltmann
779ba5e692 Merge "Ship BuiltInPrintService in default repo" 2017-03-01 19:21:48 +00:00
Yifan Hong
b5d70b3a77 Merge "Add system/manifest.xml on device" am: 569cb34dc0 am: 40517f3ea3
am: 65460a8fb9

Change-Id: I1943a06d7480363df5352d0fe88cdc6a69825153
2017-03-01 03:02:26 +00:00
Yifan Hong
40517f3ea3 Merge "Add system/manifest.xml on device"
am: 569cb34dc0

Change-Id: Id838f4f9f25694c6347c35ca6470ff781fa7db42
2017-03-01 02:57:58 +00:00
Treehugger Robot
569cb34dc0 Merge "Add system/manifest.xml on device" 2017-03-01 02:54:52 +00:00
Yifan Hong
7ebc342b86 Add system/manifest.xml on device
Similar to vendor/manifest.xml on device, this file lists
all HALs defined in the framework (and hence go
to the system image). IServiceManager / IMemory /
etc. getService should consult this file (via VINTF
object under /system/libvintf) to return the HAL in the correct
transport mode.

Bug: 34772739 Create system/manifest.xml
Bug: 35219444 Need interface + instance entry

Test: compiles and manually confirm that system/manifest.xml exist.
Change-Id: I5b3c79b068841e47062cbab6f72d70555801a21d
2017-02-28 16:13:42 -08:00
Alex Klyubin
c3a1650f6c Merge "Make secilc available" am: bbdd0e8745 am: 22bcc5db9d
am: b5846d8453

Change-Id: Ib805383037565df6a403a1725da1b34d10d432ef
2017-02-27 23:27:48 +00:00
Alex Klyubin
22bcc5db9d Merge "Make secilc available"
am: bbdd0e8745

Change-Id: I6ce67f392ab6523f2ac96e4f32e37a93e9272095
2017-02-27 23:23:57 +00:00
Philip P. Moltmann
fa064b30ef Ship BuiltInPrintService in default repo
Bug: 31992514
Test: Built
Change-Id: I074a14ea9141866dffe9dfa128f18927230314c7
2017-02-27 14:55:35 -08:00
Alex Klyubin
46dd574918 Make secilc available
The SELinux policy compiler needs to be available on-device to compile
SELinux policy at boot on some devices. For now, we're including this
unconditionally, but, going forward, we will include this binary only
on devices which need it.

Test: Device boots -- secilc is not yet used anyway
Bug: 31363362
Change-Id: I7712b70d7c5b4c57bec2cdb44519b42d26758d09
2017-02-27 13:28:42 -08:00
Colin Cross
9a02b183fd Merge "Revert "Replace hardware features conf file to be emulator specific""
am: 557ce055e7

Change-Id: I559d7aa1a6f6bf65da33327c9a900b08c78869e0
2017-02-21 23:31:31 +00:00
Colin Cross
557ce055e7 Merge "Revert "Replace hardware features conf file to be emulator specific"" 2017-02-21 23:25:07 +00:00
Colin Cross
0c59db87be Revert "Replace hardware features conf file to be emulator specific"
This reverts commit a118a21b00.

Change-Id: I2c4140667a2c00abad3c6337c680542070dd7caa
2017-02-18 13:36:18 -08:00
Colin Cross
efa6ae84ca Revert "Replace hardware features conf file to be emulator specific"
This reverts commit a118a21b00.

Change-Id: I2c4140667a2c00abad3c6337c680542070dd7caa
2017-02-18 20:05:24 +00:00
Pulkit Bhuwalka
23575449a8 Merge "Replace hardware features conf file to be emulator specific" am: afd7f4f453 am: 7be6f4c9fd
am: 7072f50067

Change-Id: I471cae79973e6a0cb13d6c2b2c6eb5de1c23fd74
2017-02-18 06:21:23 +00:00
Steven Moreland
dc7d29ed86 Merge "embedded.mk: allocator service"
am: 0aef0b59af

Change-Id: I1e76d88e7d79082006bc4671087987e7d0df2966
2017-02-18 01:52:57 +00:00
Treehugger Robot
0aef0b59af Merge "embedded.mk: allocator service" 2017-02-18 01:49:07 +00:00
Pulkit Bhuwalka
7be6f4c9fd Merge "Replace hardware features conf file to be emulator specific"
am: afd7f4f453

Change-Id: I52b0bc325e8fb8d72e40d947cd7e683ab415d10c
2017-02-17 23:28:19 +00:00
Pulkit Bhuwalka
a118a21b00 Replace hardware features conf file to be emulator specific
full_base_telephoney.mk file gets used only for emulators which should
have bluetooth disabled. Using the default handheld_core_hardware.xml
file has bluetooth enabled. We should use the generic
handheld_core_hardware.xml file for emulators which has bluetooth
disabled.

Its presence causes problems upstream in SystemServer when
BluetoothService starts and requires an extra emulator config change
which should not be there.

Bug: 35361545
Test: Verified by launching Android Emulator. It works fine and does not
start bluetooth.

Change-Id: I484c3d5867f46853fb49f28422dd72ab362ed768
2017-02-17 13:46:01 -08:00
Steven Moreland
f086747106 embedded.mk: allocator service
We are splitting android.hidl.memory into android.hidl.allocator and
android.hidl.memory to reflect the fact that we have two separate
interfaces which are served over different transports.

Bug: 35327976
Test: hidl_test, device boots with allocator

Merged-In: I36b1554d20f89ecd60a836c04f788ac83e0a1f5c
Change-Id: I36b1554d20f89ecd60a836c04f788ac83e0a1f5c
2017-02-17 20:47:16 +00:00
Steven Moreland
69249f1f53 embedded.mk: allocator service
We are splitting android.hidl.memory into android.hidl.allocator and
android.hidl.memory to reflect the fact that we have two separate
interfaces which are served over different transports.

Bug: 35327976
Test: hidl_test, device boots with allocator
Change-Id: I36b1554d20f89ecd60a836c04f788ac83e0a1f5c
2017-02-17 12:36:54 -08:00
Phil Burk
80f830969c Merge "libaaudio: changed name from liboboe" 2017-02-10 21:41:14 +00:00
Eugene Susla
e7215aa2d2 Merge "Include CompanionDeviceManager in build/make/target/product/core.mk" 2017-02-10 20:29:28 +00:00
Phil Burk
85417bcd73 libaaudio: changed name from liboboe
Bug: 34749573
Test: CTS test_aaudio.cpp
Change-Id: Id4a817eaff1655aa0d213c4b678de166fa322ecd
Signed-off-by: Phil Burk <philburk@google.com>
2017-02-10 17:28:52 +00:00
Calin Juravle
dc308c1b1d Enable secondary dex compilation in the background dexopt job
Test: adb shell cmd package bg-dexopt-job
Bug: 32871170
Change-Id: I473e291a26335bd766c8845d2ea28c4f1e45db53
2017-02-07 10:25:21 -08:00
Eugene Susla
2e83763928 Include CompanionDeviceManager in build/make/target/product/core.mk
Test: ensure there's no build error
Change-Id: I731543b8ac1fffcb191a2fc8a706b719df3c5b07
2017-02-06 16:11:30 -08:00
Jim Kaye
7cf8429738 Merge "[Emulator] Include the "Cell Broadcast Receiver" app" 2017-02-06 19:31:37 +00:00
Jiyong Park
6a220471eb Merge "configstore: add default implementation of configstore@1.0 HAL" 2017-02-01 04:23:12 +00:00
Sandeep Patil
d79c65f085 SELinux: split property_contexts into platform and non-platform components. am: b0481560e4 am: e0ccdc0e42 am: ba742d7dde
am: fac4996610

Change-Id: I14d2d100c3b6e3970fd3852b5d9fd0a88895e151
2017-01-30 19:32:41 +00:00
Sandeep Patil
ba742d7dde SELinux: split property_contexts into platform and non-platform components. am: b0481560e4
am: e0ccdc0e42

Change-Id: I1abe5be8c7c0d6db35a9039954be8f89aa660669
2017-01-30 19:25:14 +00:00
Eino-Ville Talvala
3665e64109 Emulator builds: Disable camera service Treble mode for now
Until all backwards-compatibility support is in place, the emulator
targets need to not use the Treble path.

Bug: 32991422
Bug: 32989965
Test: Built aosp_x86_64-eng and verified build.prop has the new key
Change-Id: I72487126b0ec7c7794bb3f57f4b1a649a2ec140b
2017-01-26 16:21:38 -08:00
Sandeep Patil
b0481560e4 SELinux: split property_contexts into platform and non-platform components.
Bug: 33746484
Test: Successfully boot with original service and property contexts.
      Successfully boot with split serivce and property contexts.

Change-Id: I1932684f600dd34d5136e72ac053fae13f0c3eba
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-01-26 15:30:31 -08:00
Yifan Hong
74fb50800c Merge "Add lshal to embedded.mk." am: cbc8f16656 am: 1a375ded9a am: 1030be9543
am: 21a7e626f2

Change-Id: I930f8a5cccc341178e0d25c1c8599753bb7a4e47
2017-01-26 18:32:15 +00:00
Yifan Hong
1030be9543 Merge "Add lshal to embedded.mk." am: cbc8f16656
am: 1a375ded9a

Change-Id: Ie627b77505bfcd27ec2a08e847f58b5a13b2de7f
2017-01-26 18:25:44 +00:00
Yifan Hong
7dbae043ff Add lshal to embedded.mk.
Test: make -j64 and flash the device and
ensure that lshal is available on the device.

Bug: 34712252
Change-Id: If61047afb27f9da9f8825ce18e2dfc0b3dec10e2
2017-01-26 18:17:36 +00:00
Jim Kaye
680cee4af5 [Emulator] Include the "Cell Broadcast Receiver" app
The Cell Broadcast Receiver app deal with special notifications
such as AMBER Alerts.

Some CTS Verifier tests check the user's ability to configure this app.

BUG: 32504713
Test: Manual and CTS Verifier

(cherry picked from 194e96d944fd736a0db0d97426ca2686d7a59a35)

Change-Id: Ia18bd5c763330f7520c9f445e15d9c3b197d796f
2017-01-25 19:54:21 -08:00
TreeHugger Robot
4b9795bf38 Merge "Add keymaster hal implementation and service" 2017-01-26 00:39:25 +00:00
Joshua Lang
1e123c1ac0 Add keymaster hal implementation and service
Fixes emulator boot

Test: boot emulator
Change-Id: I28b2fb81a7f740406fc06512d5dee336bc64d1e0
2017-01-25 13:29:41 -08:00
Grigory Dzhavadyan
b9a8e208b1 Add screenrecord to master (emulator)
Change-Id: Idda25f9bd0195f608efb20a0b16e277ba09a18bd
(cherry picked from commit c3de1a6cca058a67924f06be21bce092d502a846)
2017-01-25 18:04:24 +00:00
Ray Essick
90c7ca19e2 Merge "change mediaanalytics to mediametrics" 2017-01-25 01:01:09 +00:00
Calin Juravle
c4af711004 Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES" am: eddf3adec7 am: 9be4363048 am: 79ff8975b6
am: e674f92620

Change-Id: I7a891430c883e7e6f4b79c7daacb8b9ce58929bb
2017-01-24 22:27:00 +00:00
Calin Juravle
79ff8975b6 Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES" am: eddf3adec7
am: 9be4363048

Change-Id: I09bb657dfa3a3d5ca5a2410313ee061235f56c74
2017-01-24 22:21:28 +00:00
Calin Juravle
eddf3adec7 Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES" 2017-01-24 22:14:11 +00:00
Jiyong Park
1d6ab958ca configstore: add default implementation of configstore@1.0 HAL
This change adds default implementation of configstore@1.0 HAL to all
embedded devices.

Bug: 34314793
Test: build. make sure /system/bin/hw has file
android.hardware.configstore@1.0-service

Change-Id: I65f416560de9d65c57e6cfcb9a6fe26b0140d4a6
2017-01-24 12:50:53 +09:00
Ray Essick
32e3c4bc40 change mediaanalytics to mediametrics
mediaanalytics has been renamed to mediametrics; set up
so that we build the new component name instead of the old one.

Bug: 34615027
Test: clean build, proper binary generated
2017-01-23 12:04:17 -08:00
Joshua Lang
7f729e0068 Merge changes from topic 'emu_audio_fixes'
* changes:
  Add audio HIDL *-impl and -service libraries to product packages
  Add default audio_submix module to sdk_base build
  Switch video codec config xml to goldfish version
  Adding goldfish_audio_legacy hal to emulator build
  Switch emulator sdk build audio_conf to goldfish
2017-01-20 21:34:00 +00:00
Joshua Lang
149363c026 Add audio HIDL *-impl and -service libraries to product packages
Test: check files on the device

BUG: 34470377
Change-Id: I397bb945b92caeff4255bfaca7deb2939a98ba59
2017-01-20 02:53:33 +00:00
Christopher Tate
ad71d65dc0 Add framework sysconfig content to the build
Bug 30953212

Change-Id: I2f9f301a38c9d2e7214222f00a44f8ef23f36e6f
2017-01-19 15:22:53 -08:00
Joshua Lang
39e586071b Add default audio_submix module to sdk_base build
Bug:32612452
Test: Build emu and check file copied
Change-Id: Iadfa4bbf56feabf1080b7b4bc1959d7152bfd1b2
2017-01-19 12:47:36 -08:00
Joshua Lang
c7fb1e1c18 Switch video codec config xml to goldfish version
Need to have custom configuration for goldfish video codecs.

Bug:31648354
Test: Build emu and check correct file copied
Change-Id: I30282bc3c4bdb0e88d98a76908bebb2939fd0d64
(cherry picked from commit 9d9cefd03e3f794d6a5aafb9ba2ec4c4d262c224)
2017-01-19 12:47:36 -08:00
Joshua Lang
207a88b183 Adding goldfish_audio_legacy hal to emulator build
Test: Build emu and check file copied
Change-Id: Ib089f58d067905dc21ec32bca341b1c67046152b
(cherry picked from commit 3d65ad3e1e13a8099a78b2814e5cc1ae8ef5ace6)
(cherry picked from commit a1675ce1ab1b58b0994a197ee2c6b81cc7bbf3dd)
2017-01-19 12:47:36 -08:00
Joshua Lang
56296dd5cf Switch emulator sdk build audio_conf to goldfish
Test: Build emu and check correct file copied
Change-Id: I553f8e5a024d51903e51c2ac9520d8d7b9f639af
(cherry picked from commit c1378c053cbc111f7ac20c6aa3c0881ef84b7cba)
2017-01-19 12:47:36 -08:00
Chris Tate
2b22ec459d Revert "Add framework sysconfig content to the build"
This reverts commit d68045446f.

Change-Id: I86b3c0fbe3eaec915f7dcf92623382d77d008734
2017-01-19 01:12:11 +00:00
TreeHugger Robot
4264d79e50 Merge "emulator: fingerprint: switch to using fingerprint HIDL interface" 2017-01-19 00:50:01 +00:00
Josh Gao
748cc8640a Merge "Add crash_dump and tombstoned products." am: 6651199eeb am: 7cf55a4581 am: 1df77bc0c7
am: 85d13bcb8e

Change-Id: Ifffa02acab8d00a6d400c78ef27e0583f36b80ea
2017-01-19 00:41:16 +00:00
Josh Gao
1df77bc0c7 Merge "Add crash_dump and tombstoned products." am: 6651199eeb
am: 7cf55a4581

Change-Id: Icf8f7ec6d0a9a74fdad5c7b49c88a5ef71dedd3c
2017-01-18 23:42:40 +00:00