Commit graph

2348 commits

Author SHA1 Message Date
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
557ce055e7 Merge "Revert "Replace hardware features conf file to be emulator specific"" 2017-02-21 23:25:07 +00: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
Treehugger Robot
0aef0b59af Merge "embedded.mk: allocator service" 2017-02-18 01:49:07 +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
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
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
Calin Juravle
eddf3adec7 Merge "Add dexoptanalyzer to art PRODUCT_PACKAGES" 2017-01-24 22:14:11 +00:00
Josh Gao
6651199eeb Merge "Add crash_dump and tombstoned products." 2017-01-18 23:04:09 +00:00
Jorim Jaggi
8cbd925748 Revert "SELinux: split property_contexts into platform and non-platform components."
This reverts commit c5ffdd4bb4.

Change-Id: I4c5fa6c68cbf0124117153660a2fd363f72388b6
2017-01-18 15:37:30 +00:00
Sandeep Patil
c5ffdd4bb4 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: I1f218ca842407d30650b8987ded6679672171091
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-01-18 00:41:15 +00:00
Josh Gao
e6b2ddaf69 Add crash_dump and tombstoned products.
Bug: http://b/30705528
Change-Id: I3f6c98f6f907f93e082db085a122557fc8488c83
2017-01-17 13:55:18 -08:00
Calin Juravle
b6fe87137c Add dexoptanalyzer to art PRODUCT_PACKAGES
Test: build & boot
Bug: 32871170
Change-Id: Iae89984ef3df253c75f400e68f00b24fcc2b82d5
2017-01-17 12:46:34 -08:00
Sandeep Patil
e4ade08f63 SELinux: split service_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: I6fec8d9b3023de09d69198c9e72311a1f03fe844
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-01-17 04:39:00 +00:00
fionaxu
94e974dece Include CarrierDefaultApp to the img
Bug: 30958215
Test: Manual test
Change-Id: I67e235028b73513954b7d5f4fe2623700d176e87
2017-01-13 11:49:58 -08:00
Treehugger Robot
2ec742a956 Merge "embedded.mk: add android.hidl.memory@1.0-impl" 2017-01-09 20:51:16 +00:00
Treehugger Robot
082e8e07ac Merge "Split seapp_contexts into plat and nonplat components." 2017-01-09 20:30:22 +00:00
Steven Moreland
94946d0eb8 embedded.mk: add android.hidl.memory@1.0-impl
Bug: 34134179
Test: both 32 and 64 bit versions of this file are on the device after a
clean build.

Change-Id: I75ab12246c2c44e39b5e863dfec98dc72a36fbbe
2017-01-08 10:00:20 -08:00
Lingfeng Yang
de0eaf2b7b Allow goldfish-setup to take wake locks
Change-Id: I6a5db8586168e47e974a82afd2e75fd858aa5750
2017-01-06 10:12:08 -08:00
Dan Cashman
6f1ea7101f Split seapp_contexts into plat and nonplat components.
Bug: 33746381
Test: Device boots with no extra denials.
Change-Id: Ib403be429562f5e22ed4dd042fb04b0795b558db
2017-01-05 12:56:24 -08:00
dcashman
b52f040bec Build split file_contexts.
Bug: 31363362
Test: Device uses new file_contexts files for labeling decisions.
Change-Id: I33c3297a2ec806f4b9f5dd25f3dd20c4b1001641
Signed-off-by: Sandeep Patil <sspatil@google.com>
2017-01-05 11:25:13 -08:00
Elliott Hughes
5f60b74297 Merge "Revert "Revert "Merge changes from topic 'fsconfig-2'""" 2016-12-27 20:51:07 +00:00
Steven Moreland
7676451252 embedded.mk: +android.hidl.memory@1.0-service
This is the service that provides shared memory for hidl/treble
processes.

Bug: 32185232
Test: builds
Change-Id: I79162a781daad7aa704f4ee071fef0bbdea59a18
2016-12-22 11:39:11 -08:00
Mark Salyzyn
239ef9d502 logpersist: introduce split to logcat and logpersist domains
logcat_exec transition to logpersist from init with perms

Test: compile
Bug: 30566487
Change-Id: I0cea55f71be011e921841ef9d3e1283f11606f36
2016-12-20 20:32:01 +00:00
Elliott Hughes
2d7c86dfea Revert "Revert "Merge changes from topic 'fsconfig-2'""
This reverts commit fad4b4b715.

Incorporating the following fixes:

1.

fsconfig: fix fs_config_* build for discovered headers

When android_file system_config.h is picked up from the device
directory, neither TARGET_FS_CONFIG_GEN or TARGET_ANDROID_FILESYSTEM_CONFIG_H
are specified. Thus, the build is not generating the required fs_config_files
and fs_config_dirs.

Test: Ensure that make fs_config_files works, and produces the same output as before
      Build the system image and mount it as a loop back and dump the file system
      capabilities with getcap. Verify that output to the supplied
      android_file system_config.h

From the loopback of the system.img mount, from CWD system/bin:
$ getcap *
cnss-daemon = cap_net_bind_service+ep
hostapd = cap_net_admin,cap_net_raw+ep
imsdatadaemon = cap_net_bind_service+ep
ims_rtp_daemon = cap_net_bind_service+ep
logd = cap_setgid,cap_audit_control,cap_syslog+ep
mm-qcamera-daemon = cap_sys_nice+ep
pm-service = cap_net_bind_service+ep
run-as = cap_setgid,cap_setuid+ep
surfaceflinger = cap_sys_nice+ep
webview_zygote32 = cap_setgid,cap_setuid,cap_setpcap+ep
webview_zygote64 = cap_setgid,cap_setuid,cap_setpcap+ep

Compared to the android_filesystem_config.h:
    { 00700, AID_CAMERA,    AID_SHELL,     (1ULL << CAP_SYS_NICE), "system/bin/mm-qcamera-daemon" },
    { 00755, AID_SYSTEM,    AID_SYSTEM,    (1ULL << CAP_NET_BIND_SERVICE), "system/bin/pm-service" },
    { 00755, AID_SYSTEM,    AID_SYSTEM,    (1ULL << CAP_NET_BIND_SERVICE), "system/bin/imsdatadaemon" },
    { 00755, AID_SYSTEM,    AID_RADIO,     (1ULL << CAP_NET_BIND_SERVICE), "system/bin/ims_rtp_daemon" },
    { 00755, AID_SYSTEM,    AID_SYSTEM,    (1ULL << CAP_NET_BIND_SERVICE), "system/bin/cnss-daemon"},

2.

fsconfig: fix error message for duplicate AID

Fixes:
    raise ValueError('Duplicate aid value "%u" for %s' % value,
TypeError: %u format: a number is required, not str

and

    raise ValueError('Duplicate aid value "%s" for %s' % value,
TypeError: not enough arguments for format string

3.

fsconfig: add test for duplicate ranges

Add a test for duplicate range detection.

4.

fsconfig: skip AID_APP, AID_USER and all ranges

Do not output AID_APP, AID_USER and ranges. A range
is defined as ending with AID_ and ending in _START or
_END.

5.

fsconfig: test for skip AID_APP, AID_USER and all ranges

Test against AIDs that caused the bionic tests to fail.

Change-Id: I95569a9ccc83bd3231f8a6f395532cc2de316bd2
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-12-18 10:55:35 -08:00
Daniel Cashman
df1e2102c6 Revert "Add build dependencies for split sepolicy files."
This reverts commit 086189145c.

Change-Id: Idfd210d1f16eefcedda6154b0361611f53c5158f
2016-12-17 00:53:52 +00:00
dcashman
086189145c Add build dependencies for split sepolicy files.
Add build targets for split sepolicy files so they'll appear in the root dir for
on-device compilation.  nonplat_sepolicy will eventually be removed as it should
be provided by a different partition.  Also replace sepolicy.recovery with the
appropriate split components.

Bug: 31363362
Test: Policy builds on-device and boots.
Change-Id: I017dabe6940c3cd20de6c00bb5253274d5a9269b
2016-12-16 14:01:29 -08:00
Joe LaPenna
fa77432e6f Add default NetworkRecommendation to core.mk
This makes the apk avaiable on all devices and can be overridden on a
per-product basis using LOCAL_OVERRIDES_PACKAGES.

BUG: 33224286
Test: Verified with lunch aosp_bullhead-userdebug; make

Change-Id: Ib345193caa4431b6405294bd8759d93349335814
2016-12-16 10:48:47 -08:00
dcashman
15171f641e Split mac_permissions.xml into plat and non-plat components.
Bug: 31363362
Test: Bullhead and Sailfish both build and boot w/out new denials.
Change-Id: Id7e29ec09510741c4e925231401a6de81704fbf0
2016-12-15 10:04:25 -08:00
Elliott Hughes
fad4b4b715 Revert "Merge changes from topic 'fsconfig-2'"
This reverts commit 1b2de51881, reversing
changes made to 77ea32f378.
2016-12-12 17:28:44 -08:00
Elliott Hughes
1b2de51881 Merge changes from topic 'fsconfig-2'
* changes:
  fs_config: add unit tests
  fs_config: drop fs_config_files/dirs PRODUCT_PACKAGES requirement
  fs_config: add group to build
  fs_config: introduce group generator
  fs_config: add passwd to build
  fs_config: introduce passwd generator
  fs_config: generate friendly in AID class
  fs_config: limit characters for AID_<name> sections
  fs_config: generate oem AID header file
  fs_config: android_id header generator
  fs_config: support parsing android_filesystem_config.h
  fs_config: modularize fs_config_generator
2016-12-10 00:13:05 +00:00
dcashman
d1b032237a Merge "Sort SELinux package inclusion."
am: 15e1b5e239

Change-Id: I2411d85662baf7278d34955bd6eb7ae6938b1956
2016-12-02 22:36:28 +00:00
dcashman
c316783843 Sort SELinux package inclusion.
This section will be modified as part of splitting these packages into platform
and non-platform components.  Sort them all to avoid conflicts.

Bug: 31363362
Test: Builds
Change-Id: I91fb4d4d7c0a6971a19047ef2eb2981770a122ff
2016-12-02 09:34:23 -08:00
Pirama Arumuga Nainar
0cc559f7d8 Merge "Do not *directly* package libbcc.so"
am: ec0d7cbc49

Change-Id: I15871b1ca4cb5fa5488721a5f6a21bfa2a72feab
2016-12-01 18:11:13 +00:00
Pirama Arumuga Nainar
ec0d7cbc49 Merge "Do not *directly* package libbcc.so" 2016-12-01 17:58:47 +00:00
Paul Duffin
74f8ee05de Merge "Replace core-junit with legacy-test"
am: 32cc1f80e5

Change-Id: Id425eff2aaafdf8ad63bc66ef2d28f71d32d6e8b
2016-12-01 10:42:16 +00:00
Andreas Gampe
d77b29fdb3 Revert "Build: Add sanitized app_process"
am: 88d43677f5

Change-Id: I358a67f5e89bf72e7bba9d97a16d34d9a3e79afb
2016-12-01 02:47:34 +00:00
Andreas Gampe
92058120b2 Revert "Build: Add asanwrapper in SANITIZE_LITE"
am: 4938f3300a

Change-Id: Ic3745664db0b89baaea8b98b79ead63a77e95440
2016-12-01 02:47:29 +00:00
Andreas Gampe
88d43677f5 Revert "Build: Add sanitized app_process"
This reverts commit a35d92e431.

The app_process__asan module is merged into app_process.

Bug: 33224213
Test: m
Change-Id: I5e3e836c67b5bd17cf967f1b2429e39c4e18557b
2016-11-30 16:40:13 -08:00
Andreas Gampe
4938f3300a Revert "Build: Add asanwrapper in SANITIZE_LITE"
This reverts commit eee31511f7.

Rewriting of app_process adds an automatic dependency.

Bug: 33224213
Test: m
Change-Id: Idd9509d116692954224f4d2ffd6c81b69e9a85a3
2016-11-30 16:39:40 -08:00
Andreas Gampe
3c326183ca Build: Add asanwrapper in SANITIZE_LITE
am: eee31511f7

Change-Id: I2fda3c98543296418b7c4741e8425f1ab35f7fb1
2016-12-01 00:06:26 +00:00
Andreas Gampe
2ceff14391 Build: Add sanitized app_process
am: a35d92e431

Change-Id: Idc10fa334820dab5de1a697092e4c14fb6023425
2016-12-01 00:06:20 +00:00
Pirama Arumuga Nainar
f3121cd73f Do not *directly* package libbcc.so
Bug: http://b/28866258

Remove libbcc.so from the list of directly packaged modules.  64-bit
libbcc.so gets included as a dependency for the bcc executable (which is
a required package).  32-bit libbcc.so is no longer necessary on 64-bit
devices.

This change also removes 32-bit libLLVM.so from a 64-bit system image
(leading to a 13M reduction in Angler's system image on AOSP) and a
considerable reduction in build time.

Test: - Build all topics in this CL
      - RsTest (including the 32-bit ABI) and CTS tests pass on x86 and
        x86_64 emulators and Angler.

Change-Id: I10f07e322a615f37d6967b7c938635f544ddceff
2016-11-30 15:45:25 -08:00
Treehugger Robot
de24e6198e Merge changes from topic 'app_process_sanitized_binaries'
* changes:
  Build: Add asanwrapper in SANITIZE_LITE
  Build: Add sanitized app_process
2016-11-30 21:00:56 +00:00
Andreas Gampe
eee31511f7 Build: Add asanwrapper in SANITIZE_LITE
Add asanwrapper helper binary to PRODUCT_PACKAGES when building with
SANITIZE_LITE=true.

Bug: 33224213
Test: m SANITIZE_TARGET=address SANITIZE_LITE=true && ls $OUT/system/bin/asanwrapper
Change-Id: Ic4d8973b9e9ddfd9ef8663735bf5f70d8f9f70e1
2016-11-30 10:20:20 -08:00
Paul Duffin
6470f4fa99 Replace core-junit with legacy-test
m -j32 checkbuild cts droid
adb reboot bootloader
fastboot flashall -w
cts-tradefed run cts -m CtsLibcoreTestCases

Bug: 30188076
Test: As above
Change-Id: I2d49cb3c451cb265d026f9a700a61b3fc0d2ed82
2016-11-30 13:50:56 +00:00
Andreas Gampe
a35d92e431 Build: Add sanitized app_process
Add sanitized app_process module to PRODUCT_PACKAGES when building
with SANITIZE_LITE=true

Bug: 33224213
Test: m SANITIZE_TARGET=address SANITIZE_LITE=true && ls $OUT/system/bin/asan
Change-Id: Ic67976f1b897b638d569ec6f42d5a8d59f8a9285
2016-11-29 19:22:01 -08:00
Andreas Gampe
f606cc1677 Merge "Revert "Build: Bring back SDK dependencies""
am: 2bbeae7f8a

Change-Id: I9560d6a8f9971db89c87499b2e177bd0bb921cff
2016-11-30 00:48:39 +00:00
William Roberts
7fe8b6d817 fs_config: drop fs_config_files/dirs PRODUCT_PACKAGES requirement
When configuring fs_config_files or fs_config_dirs for file_system
capabilities, drop the requirement that OEMs must add the target
to PRODUCT_PACKAGES. This limits the configuration requirement
to only needing to set the new and preferred TARGET_FS_CONFIG_GEN
or the older TARGET_ANDROID_FILESYSTEM_CONFIG_H method.

Test: That only setting TARGET_FS_CONFIG_GEN results in passwd and
group in the build image.
Change-Id: I818854fa1b3e94edaff59a32bd7cf23cf9b504aa
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-11-29 16:21:17 -08:00