Commit Graph

1763 Commits

Author SHA1 Message Date
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 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
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
Josh Gao 6651199eeb Merge "Add crash_dump and tombstoned products." 2017-01-18 23:04:09 +00:00
Nimrod Gileadi a5b069e38b Copy IDC for goldfish_rotary to /system/usr/idc
am: 8570bcea52

Change-Id: If6276de7e9eb16b4b627bc3c76599937a5100198
2017-01-18 16:53:23 +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
Nimrod Gileadi 8570bcea52 Copy IDC for goldfish_rotary to /system/usr/idc
This IDC file won't be used by the emulator, unless there's an input
device called goldfish_rotary. That device is being added to the kernel
in http://r.android.com/321420.

Once that device is present, EventHub will look for a file named
goldfish_rotary.idc in the system/usr/idc directory to get the device
configuration.

Bug: 33292948
Change-Id: I384f29980d802280e626915844bddc49bc46110d
2017-01-18 11:02:02 +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
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
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
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
William Roberts 2127b35526 fs_config: add group to build
Setup PRODUCT_PACKAGES for the group file.

The group file is always included in the product
build but may be empty.

Test: That the group file is in the build.
Change-Id: I2ed1759fbe42a7e6833bb754b00cadaf949f128d
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-11-29 16:21:17 -08:00
William Roberts 6d5e0c5df2 fs_config: add passwd to build
Setup PRODUCT_PACKAGES for the passwd file.

The passwd file is always included in the product
build but may be empty.

Test: That the passwd file is in the build image.
Change-Id: Iedbb81b15d3b281ff4ad36d28adc2ba4523785f2
Signed-off-by: William Roberts <william.c.roberts@intel.com>
2016-11-29 16:21:17 -08:00
Andreas Gampe 5d9c6165d0 Revert "Build: Bring back SDK dependencies"
This reverts commit ff00c5d78f.

Test: m
2016-11-17 19:42:51 -08:00
Andreas Gampe 2a2442c6f2 Merge "Build: Bring back SDK dependencies"
am: eb06c77b80

Change-Id: I0c15adcd387980b94c5544427d4f4fdad3f7ff31
2016-11-18 02:57:28 +00:00
Andreas Gampe ff00c5d78f Build: Bring back SDK dependencies
Temporarily re-add SDK dependencies to runtime_libart.mk.

Test: m sdk_repo
Change-Id: I5c2054d7be6ea1c5e6eadbcb3453cabfc64728d6
2016-11-17 18:21:36 -08:00
Andreas Gampe bd7d5aea2a Merge "Build: Refactor and clean up runtime_libart"
am: 020f5275d5

Change-Id: Ifff0829fe3b7e306527e3654ee3833a1935c1ac3
2016-11-18 01:32:20 +00:00
Andreas Gampe 349b67c6ba Merge "Build: Add agent library to default packages"
am: 709aaa5aea

Change-Id: I61e55b948838d8845d04802e87d435ac8b9f9b3c
2016-11-17 23:42:38 +00:00
Andreas Gampe 9a3e5ac355 Build: Refactor and clean up runtime_libart
Split out dependencies and removes some transitives. In preparation
for moving the modules.

Test: m
Test: Device boots
Change-Id: I7cdccd178eef9a625607a74ba8496651591e4cb4
2016-11-17 14:37:11 -08:00
Andreas Gampe cd82dceb3c Build: Add agent library to default packages
Add libopenjdkjvmti to ART dependencies.

Bug: 31455788
Test: m && ls $OUT/system/lib/libopenjdkjvmti.so
Change-Id: Iccf35f04548d74df87ec05f2cb555c1db9d137c6
2016-11-17 13:05:13 -08:00
Robert Sesek cda21868aa Merge "Add webview_zygote target to core_minimal.mk PRODUCT_PACKAGES."
am: 07b4a59843

Change-Id: Ie5dc3d3d617203ea467ace4440ef0119cb75ad75
2016-11-15 19:30:51 +00:00
Robert Sesek dcb603f115 Add webview_zygote target to core_minimal.mk PRODUCT_PACKAGES.
Test: lunch aosp_angler-eng && m checkbuild

Bug: 21643067
Change-Id: I1e0b81055fb74d7238f245e11bf2409c776f2efd
2016-11-11 12:38:13 -05:00
Colin Cross f22e056df6 Merge "Move perfprofd installation to PRODUCT_PACKAGES_DEBUG"
am: 47bfd3422f

Change-Id: I427c8ae7893b0a927e410318738450c8358b1219
2016-10-28 20:10:07 +00:00
Colin Cross 1e28014c78 Move perfprofd installation to PRODUCT_PACKAGES_DEBUG
LOCAL_MODULE_TAGS is deprecated, use PRODUCT_PACKAGES_DEBUG instead.

Test: none
Change-Id: I670147f4fe38b02ccafe01b96d8078502404113c
2016-10-27 15:41:57 -07:00
Jeff Sharkey 3f391240d5 Merge "PRODUCT_PACKAGES: add to tune2fs." am: 4337794acd am: a35fba1954
am: 7f5ac24eec

Change-Id: Ia038eb10af41c7403a04e9e5411700cd86079640
2016-10-12 01:35:52 +00:00
Jeff Sharkey 4337794acd Merge "PRODUCT_PACKAGES: add to tune2fs." 2016-10-12 01:16:33 +00:00
Iliyan Malchev 8293fb67b3 Merge "build: add hwservicemanager to the core packages" am: 69bd0bf22a am: 3f044f007f
am: a65c0d3481

Change-Id: If5968ce47c39b5fd55f30893550d581d4c04e414
2016-09-27 00:16:42 +00:00
Iliyan Malchev bd710ed45a build: add hwservicemanager to the core packages
b/31458381
b/31240290

Test: passing build and runtime tests

Change-Id: I294c70d93d23ada94ff1175f2d3babd5b836eeee
Signed-off-by: Iliyan Malchev <malchev@google.com>
2016-09-26 14:21:10 -07:00
liminghao a4b899da0c PRODUCT_PACKAGES: add to tune2fs.
N/A

Change-Id: Ie3cb9953046adb3dd6320a84e7572c84d7e07565
Signed-off-by: liminghao <liminghao@xiaomi.com>
2016-08-17 11:06:16 +08:00
Ian Pedowitz c3e2c808de Merge \\"The easter egg is now its own APK.\\" into nyc-dev am: 18ecea3986
am: 377d5bdb3f

Change-Id: I11f7501dcf768397acc4cfc74eee58d27013b6a4
2016-06-26 23:03:00 +00:00
Dan Sandler 377d5bdb3f Merge \"The easter egg is now its own APK.\" into nyc-dev
am: 18ecea3986

Change-Id: I4712931d6e73ecb08dae76b77ad12585a914882b
2016-06-26 22:56:05 +00:00
Dan Sandler e4224c46cb Merge \"The easter egg is now its own APK.\" into nyc-dev
am: 18ecea3986

Change-Id: Ica7456ab7bf01dba0f294fce3720b0e19db02f38
2016-06-26 22:56:03 +00:00
Dan Sandler 26c4ef4c65 The easter egg is now its own APK.
It should be included wherever SystemUI is.

Bug: 27376882
Change-Id: Ibe2688c86e58bdfb8a5278c9c4939d7cdb524078
2016-06-26 18:07:59 +00:00
Roozbeh Pournader a51b0b6012 Merge \"Revert \"Add Serbian in Latin script to the full locale list\" [DO NOT MERGE]\" into nyc-mr1-dev
am: 9b6ce7bf0d

Change-Id: Ia696c61ce6e24e29627356cfe66819ac98dfafc2
2016-06-24 02:51:25 +00:00
Roozbeh Pournader 9b6ce7bf0d Merge "Revert "Add Serbian in Latin script to the full locale list" [DO NOT MERGE]" into nyc-mr1-dev 2016-06-23 21:52:35 +00:00
Roozbeh Pournader 34247cfda3 Revert "Add Serbian in Latin script to the full locale list" [DO NOT MERGE]
This reverts commit 4c6e1b62e0, since sr-Latn is no longer planned for MR1.

Bug: 29455508
Bug: 29601930
Change-Id: I47c240fa7456940ecb272f05e94f563b221c92c3
2016-06-23 20:03:44 +00:00
Daniel Nishi 3893beb80f Merge \"Add the StorageManager APK to the core build.\" into nyc-mr1-dev
am: 36ae59228c

Change-Id: I09c099f3cbeee26b91a8de56b794c5e6cc581d9f
2016-06-22 23:56:23 +00:00
Daniel Nishi 36ae59228c Merge "Add the StorageManager APK to the core build." into nyc-mr1-dev 2016-06-22 23:50:07 +00:00
Roozbeh Pournader c5a4be50d8 Add Serbian in Latin script to the full locale list
am: 4c6e1b62e0

Change-Id: Ib5c08536c454bafdbd31dc4eb50db3fe1d46def9
2016-06-20 23:25:24 +00:00
Roozbeh Pournader 4c6e1b62e0 Add Serbian in Latin script to the full locale list
Bug: 29455508
Change-Id: I3b6e889d42c41c653824cca15463466d5ccedb43
2016-06-17 21:28:41 -07:00
Daniel Nishi 936cc2a09c Add the StorageManager APK to the core build.
Bug: 28965462
Change-Id: Id2877a22f0b8e675cecc0430013a008993145d6e
2016-06-10 13:14:57 -07:00
Vikas Marwaha 98dce87fe1 resolve merge conflicts of 07886f1 to nyc-dev-plus-aosp
Change-Id: Iae0444b9e9e7b4db3bfd94f5712e22aa08a122b5
2016-06-09 05:46:40 +00:00
Vikas Marwaha 465fa9b38f Added make files for variable PRODUCT_SHIPPING_API_LEVEL.
Bug: 26381401

Change-Id: I8f2e630118cfa474564eb21911448bc813fcfec7
2016-06-07 15:08:27 -07:00
Narayan Kamath 8b62c008f6 Merge "Add default values for pm.dexopt.core-app." into nyc-dev
am: da147a7c20

* commit 'da147a7c20bf73f9b3736f6c479f3a8f3f56ab9e':
  Add default values for pm.dexopt.core-app.

Change-Id: I566fc87539166998340617bbcc7336b5fcc691bc
2016-06-06 15:15:01 +00:00
Vikas Marwaha 404ccc83c4 Add variable PRODUCT_SHIPPING_API_LEVEL and make files with the
new read only product property ro.product.first_api_level.

PRODUCT_SHIPPING_API_LEVEL declares which API level a device first
shipped with. We use this variable to set a read-only property that
can be used in CTS/GTS tests.

Change-Id: If54202075d3b92ed380655cde8b3fc50c5ba73b3
2016-06-03 23:02:27 +00:00
Narayan Kamath 41a3b1b413 Add default values for pm.dexopt.core-app.
bug: 28998083

Change-Id: Iec4415ad7e5122c1168024f6ccf39b5e342cc7fd
2016-06-02 16:35:03 +01:00
Bjoern Johansson a521a01345 Merge "Remove Dev Settings app from emulator images" into nyc-dev
am: 4f2f58791f

* commit '4f2f58791f31a66a61865e6c6095a2113609577a':
  Remove Dev Settings app from emulator images

Change-Id: Ib7f40046ec64ba08055fec219107b782ebbc1340
2016-05-27 17:24:36 +00:00
Bjoern Johansson d7db5d514a Remove Dev Settings app from emulator images
The Dev Settings app currently just launches an intent that is received
by the regular Settings app. However, since N the Settings app only
receives the intent when developer mode is enabled. If it is not enabled
the Dev Settings app will crash. Since the Dev Settings app doesn't
really add much benefit this change removes it from the emulator system
images to prevent this issue. The user will have to access the developer
settings from the regular Settings app just like on a physical device.

BUG: 27549126

Change-Id: I8191f9003bb452ef76c4b236b965368b48be3d25
2016-05-25 18:31:25 -07:00
Andreas Gampe 5d558c5f13 Merge "Build: Only use compiled-classes file when available" into nyc-dev
am: 57c3aea442

* commit '57c3aea442bff67e4452eee7ff8f13294fbad34b':
  Build: Only use compiled-classes file when available

Change-Id: I9a3ae7385483f9f5d934d8cd6660c17c57529989
2016-05-23 20:48:00 +00:00
Andreas Gampe bbb0b31cf2 Build: Only use compiled-classes file when available
Don't pull in things from frameworks/base when they're not there.

Bug: 28878540
Change-Id: Ida8a5e4e46dc5cd5bdedc4bb66640abb4969e1f3
2016-05-20 13:52:02 -07:00
Andreas Gampe 28efcb6d39 Build: Use phone compiled-classes in core_minimal
am: 695b28f67c

* commit '695b28f67c88b87486911f8881078e7857e989a8':
  Build: Use phone compiled-classes in core_minimal

Change-Id: I3b3a362c17c741994b34a2f70301806eadf9098d
2016-05-19 05:10:55 +00:00
Andreas Gampe 695b28f67c Build: Use phone compiled-classes in core_minimal
Use default phone compiled-classes list to cut down boot image
size on most devices.

Bug: 28026683
Change-Id: I73bb59b792923ebc7549f775085b1c9aed88cc1a
2016-05-18 20:10:43 -07:00
Alex Light 60c7fd15a8 Add fake libart
Bug: 27775991

Change-Id: I54cbdf2340dcfdd9b3973d9d10c8bd94492736fb
(cherry picked from commit 6da74d8f1f)
2016-05-18 07:58:05 -07:00
Amith Yamasani e536d704e5 Merge "Add CtsShimPrebuilt" into nyc-dev
am: 85c33f500a

* commit '85c33f500aa2ef7c70c1644617e7439b97f22a79':
  Add CtsShimPrebuilt

Change-Id: I604118ab69b52d8965f30ef3f8e0d841a4d7a288
2016-05-17 00:33:05 +00:00
Amith Yamasani 6f7873ca6f Add CtsShimPrebuilt
It was needed for a CTS test but was accidentally
left out?

Bug: 28398205
Change-Id: I7deea60e6b11bc11d3bd8e82170fc42df7cec3c7
2016-05-16 12:43:43 -07:00
Roozbeh Pournader 1d9cfc58f1 Merge "Remove Romansh from PRODUCT_LOCALES" into nyc-dev
am: 6e034af238

* commit '6e034af238a677db70bc0b10f7f9e08bc8b8aef9':
  Remove Romansh from PRODUCT_LOCALES

Change-Id: I2c6572c55699d43cc687f7acc6c51b6f66c97a54
2016-05-07 00:07:16 +00:00
Roozbeh Pournader 6e034af238 Merge "Remove Romansh from PRODUCT_LOCALES" into nyc-dev 2016-05-06 23:51:48 +00:00
Roozbeh Pournader 1a6a5626f7 Remove Romansh from PRODUCT_LOCALES
The inclusion of Romansh (rm_CH), while it did not have localized
strings, was causing the incorrect assumption that the system
supports Romansh, causing the language fallback to work incorrectly
when Romansh was in the list of user's locales.

Hindi (hi_IN) was also included twice, and this removes the duplicate
too.

Bug: 27325465
Change-Id: I87ec06dc459137f71bb8e5e2f431f629bd51928e
2016-05-06 15:10:51 -07:00
Bjoern Johansson 7b3407f801 Merge "Indicate that all emulator images support USB" into nyc-dev
am: 513e69ec69

* commit '513e69ec69a7e5c61888668a4b16ccab6073419c':
  Indicate that all emulator images support USB

Change-Id: Ie6ee7dbd4fd5cde1ecf828440047cbf81f51aa66
2016-05-05 15:45:00 +00:00
Bjoern Johansson 6b04d94ff7 Indicate that all emulator images support USB
The Android framework assumes that if an app uses UsbManager then there
must be USB support on the device. In order to deal with this the
emulator has to indicate USB support. Previously this was true for
Google SDK phone images because USB support is part of the common API
packages that gets installed. For AOSP and some other build targets USB
support was not included. This change indicates support for USB for all
emulator system images.

BUG: 28088069

Change-Id: I880210e89e6ad3412bdc069d6c20ed54a52cff83
2016-05-04 22:40:56 +00:00
Todd Kennedy d43b93e7e2 Revert "Revert "Add shim app for CTS testing""
am: 98ffa937bf

* commit '98ffa937bf6d7acc6a1964c7157c906e1a86203c':
  Revert "Revert "Add shim app for CTS testing""

Change-Id: I2eb7d0357861fb9144a9937b6bb60c14af3d6151
2016-05-03 19:42:38 +00:00
Todd Kennedy 98ffa937bf Revert "Revert "Add shim app for CTS testing""
This reverts commit 31003c48c1.

Bug: 28398205
Change-Id: Ia884957e224f46157af31814c32c5e0e1a33b7b8
2016-05-03 11:16:35 -07:00
Todd Kennedy 0451b2f946 Merge "Revert "Add shim app for CTS testing"" into nyc-dev
am: 878775fd75

* commit '878775fd750d7164bd0920b4b94b59e0edab8ed3':
  Revert "Add shim app for CTS testing"

Change-Id: Ie5df8c8ea8785b8562866522f6d13e54b5ce52d5
2016-05-03 00:08:55 +00:00
Todd Kennedy 878775fd75 Merge "Revert "Add shim app for CTS testing"" into nyc-dev 2016-05-02 23:56:37 +00:00
Todd Kennedy 31003c48c1 Revert "Add shim app for CTS testing"
Build errors when trying to dex2oat the CtsShim prebuilt even though it's marked with "hasCode=false".

This reverts commit d987a11126.

Change-Id: If47b3bcd4c727da7acd9068c02f8fb671ed0ae84
2016-05-02 23:54:08 +00:00
Todd Kennedy 46785aea64 Merge "Add shim app for CTS testing" into nyc-dev
am: 6d0c367a64

* commit '6d0c367a64b91cdf8dc6bc25605bff7b13f35a35':
  Add shim app for CTS testing

Change-Id: Ic6342cd60478364533514b576ccc86b6db7ab695
2016-05-02 22:59:21 +00:00
Todd Kennedy 6d0c367a64 Merge "Add shim app for CTS testing" into nyc-dev 2016-05-02 22:49:55 +00:00